Merge branch 'devRs' into dev

2025-12-22 23:26:44 +08:00 · 2020-01-06 11:29:21 +08:00
parent d5897e0502 155c6f5f1f
commit dfab36f3a3
3 changed files with 48 additions and 28 deletions
--- a/src/views/ebiz/agentEenter/AgentEenterBasicHealth.vue
+++ b/src/views/ebiz/agentEenter/AgentEenterBasicHealth.vue
@@ -2,7 +2,7 @@
  <div class="notifyingMessage-container">
    <div class="pb50">
      <RsTop :active="['1', '2', '3', '4']" :tabType="false"></RsTop>
-      <div class="">
+      <div class>
        <p class="fs15 fwb pl10 pv12">健康告知信息</p>
        <div v-for="(item, index) in impartDTOS" :key="index">
          <!-- 大题目 -->
@@ -46,15 +46,29 @@
      <van-button plain @click="allFalse" type="primary" class="w325 m20" size="danger">一键全无</van-button>
    </div>
    <div class="flex justify-content-s bottom-btn bg-white">
-      <van-button class=" bottom0 left0" square plain type="danger" v-no-more-click="1000" @click="goBack" size="large">上一步</van-button>
-      <van-button class=" bottom0 left0" square type="danger" size="large" @click="nextStep" v-no-more-click="1000">提交信息</van-button>
+      <van-button
+        class="bottom0 left0"
+        square
+        plain
+        type="danger"
+        v-no-more-click="1000"
+        @click="goBack"
+        size="large"
+      >上一步</van-button>
+      <van-button
+        class="bottom0 left0"
+        square
+        type="danger"
+        size="large"
+        @click="nextStep"
+        v-no-more-click="1000"
+      >提交信息</van-button>
    </div>
  </div>
 </template>

 <script>
 import { Collapse, CollapseItem, RadioGroup, Radio, Field, CellGroup, Icon } from 'vant'
-//import DTO from './impartDTOS.js'
 import RsTop from '@/components/ebiz/agentEenter/RsTop'
 import { saveOrUpdateInfo, getImpart } from '@/api/ebiz/agentEenter/agentEenter'
 export default {
@@ -107,6 +121,7 @@ export default {
      })
      getImpart(data).then(res => {
        that.$toast.clear()
+        console.log(res)
        res.map((item, index) => {
          item.impartAnswer = ''
          item.impartRemark = ''
@@ -115,15 +130,17 @@ export default {
            item.itemDtoLst.map((it, index) => {
              it.impartAnswer = ''
              it.smallCode = item.bigCode + index //添加小题目标识
+            })
+          }
+        })
        if (localStorage.agentSex == 0) {
-                //姓别为男不显示该题
-                this.isDisabled = true
-              } else {
-                this.isDisabled = false
+          // //姓别为男不显示该题
+          // this.isDisabled = true
+          res.splice(7,1);
        } 
-            })
-          }
-        })
+        // else {
+        //   this.isDisabled = false
+        // }
        that.impartDTOS = res
      })
    },
@@ -218,7 +235,7 @@ export default {
          })
          let params = {
            entryType: 'CUSTOMER_ITEM',
-            ebizItemDtoLst: {},
+            ebizItemDtoLst: {}
            // userModel: {
            //   //线上去掉
            //   mobile: '13000000000'
--- a/src/views/ebiz/agentEenter/AgentEenterBasicInfor.vue
+++ b/src/views/ebiz/agentEenter/AgentEenterBasicInfor.vue
@@ -100,7 +100,7 @@
      />
      <van-field v-model="userInfo.school" maxlength="40" label="毕业院校" name="毕业院校" placeholder="请输入" required v-validate="'required'" clearable />
      <van-field v-model="userInfo.discipline" maxlength="40" label="所学专业" name="所学专业" placeholder="请输入" required v-validate="'required'" clearable />
-      <van-field v-model="userInfo.homePhone" label="宅电" name="宅电" placeholder="非必填" maxlength="16" @blur="HomeMobile(userInfo.homePhone)" clearable />
+      <!-- <van-field v-model="userInfo.homePhone" label="宅电" name="宅电" placeholder="非必填" maxlength="16" @blur="HomeMobile(userInfo.homePhone)" clearable /> -->
      <van-field v-model="userInfo.mobile" label="手机" name="手机" required readonly />
      <van-field :value="userInfo.idType | idToText('idType')" v-validate="'required'" label="证件类型" name="证件类型" required readonly />
      <!-- <van-field v-model="userInfo.idNo" v-validate="'required|idNo'" maxlength="18" label="证件号码" name="证件号码" placeholder="请输入" clearable> -->
@@ -333,7 +333,7 @@ export default {
        degree: '', //学历
        school: '', // 学校
        discipline: '', // 专业
-        homePhone: '', //家庭电话
+        // homePhone: '', //家庭电话
        idType: '1', //证件类型
        idNo: '', //证件号码
        dateStart: '', //证件起始日期
@@ -511,6 +511,7 @@ export default {
          saveOrUpdateInfo(data).then(res => {
            if (res.result == '0') {
              this.$toast.clear()
+              localStorage.agentSex = this.userInfo.sex
              this.$jump({
                flag: 'h5',
                extra: {
@@ -620,14 +621,14 @@ export default {
      })
      this.isScan = false
    },
-    //验证宅电
-    HomeMobile(value) {
-      let res = /^((0\d{2,3}-\d{7,8})|(1\d{10}))$/.test(value)
-      if (value != '' && !res) {
-        this.userInfo.homePhone = ''
-        return this.$toast('宅电输入有误')
-      }
-    }
+    // //验证宅电
+    // HomeMobile(value) {
+    //   let res = /^((0\d{2,3}-\d{7,8})|(1\d{10}))$/.test(value)
+    //   if (value != '' && !res) {
+    //     this.userInfo.homePhone = ''
+    //     return this.$toast('宅电输入有误')
+    //   }
+    // }
  },
  beforeDestroy() {
    //清理计时器
--- a/src/views/ebiz/agentEenter/Guarantee.vue
+++ b/src/views/ebiz/agentEenter/Guarantee.vue
@@ -47,6 +47,7 @@ export default {
      isDisabledComplite: true,
      // 是否签名 true 签名 false 未签名
      isSign: false,
+      isSignD: false,
      //推荐人信息
      agentInfo: {},
      // 推荐人签名信息
@@ -171,7 +172,7 @@ export default {
        if (JSON.parse(data).state == '1') {
          this.base64 = decodeURI(JSON.parse(data).sign)
          this.appntSign.signState = '1'
-          if (this.appntSign.signStateD == '1') {
+          if (this.appntSign.signState == '1') {
            this.isDisabledComplite = false
            this.isSign = true
          } else {
@@ -207,12 +208,12 @@ export default {
        if (JSON.parse(data).state == '1') {
          that.base64D = decodeURI(JSON.parse(data).sign)
          that.appntSign.signStateD = '1'
-          if (that.appntSign.signState == '1') {
+          if (that.appntSign.signStateD == '1') {
            this.isDisabledComplite = false
-            this.isSign = true
+            this.isSignD = true
          } else {
            this.isDisabledComplite = true
-            this.isSign = false
+            this.isSignD= false
          }
        }
      })
@@ -299,6 +300,7 @@ export default {

      if (val.appntSign.signState == '1' && val.appntSign.signStateD == '1') {
        that.isDisable = true
+        that.isDisableD = true
      }
    }
  },