Merge remote-tracking branch 'origin/dev' into dev

src/views/ebiz/agentEenter/AgentEenterBasicFamily.vue

@@ -61,6 +61,7 @@
             :required='!!item.requiredType'
             :disabled='!item.requiredType'
             maxlength='18'
+            @blur="getRelatedData(item, '1')"
           />
           <FieldDatePicter
             label='出生日期'
@@ -120,6 +121,7 @@ import RsTop from '@/components/ebiz/agentEenter/RsTop';
 import idNoCheck from '@/assets/js/utils/idNoCheck';
 import beforeDate from '@/assets/js/utils/getBeforeDate.js';
 import { saveOrUpdateInfo, agentAll } from '@/api/ebiz/agentEenter/agentEenter';
+import {idToData} from "../cardList/js/verification";
 // 是否存在亲属关系的枚举值
 const immediateFamilyEnum = {
   existence: 1, // 存在亲属关系
@@ -488,6 +490,19 @@ export default {
         mobile: '', // 联系电话
         requiredType: immediateFamilyEnum.existence // 是否必填
       });
+    },
+    getRelatedData(val, ind) {
+      if (ind == '1') {
+        if (val.idType != '1') {
+          return
+        }
+        //如果证件校验不通过,恢复默认值
+        if (idToData(val.idNo).text) {
+          //;[val.idNo, val.birthday] = ['', '']
+          return this.$toast(idToData(val.idNo).text)
+        }
+        val.birthday = idToData(val.idNo).birthday
+      }
     }
   }
 };

src/views/ebiz/agentEenter/AgentEenterBasicInfor.vue

@@ -209,11 +209,11 @@
         placeholder='请选择'
         @click="toSelect('15')"
       />
+      <!-- @click="toSelect('13')"-->
       <van-field
         :value="userInfo.applGrade | idToText('applGrade')"
         right-icon='arrow'
         placeholder='请选择'
-        @click="toSelect('13')"
         label='拟聘职级'
         name='拟聘职级'
         readonly

src/views/ebiz/agentEenter/approve/BasicInfo.vue

@@ -65,6 +65,7 @@
       </van-cell-group>
       <p style="border-bottom: 1px solid #ebedf0" class="fs15 fwb pl10 pv12">家属信息</p>
       <van-cell-group v-for="item in relationList" :key="item.id" class="fs15">
+        <van-cell  v-if="item.birthday!=''">
         <van-cell title="姓名" :value="item.name | blankFilter" />
         <van-cell title="性别" :value="item.sex | genderFilter" />
         <van-cell title="出生日期" :value="item.birthday | blankFilter" />
@@ -72,6 +73,7 @@
         <van-cell title="证件号码" :value="item.idNo | blankFilter" />
         <van-cell title="关系" :value="item.relationType | familyRelationFilter" />
         <van-cell title="联系电话" :value="item.mobile | blankFilter" />
+        </van-cell>
       </van-cell-group>
     </div>
     <div class="imgInfo bg-white" v-show="active === 1">

src/views/ebiz/agentEenter/approve/RecordDetail.vue

@@ -66,6 +66,7 @@
         </van-cell-group>
         <p style="border-bottom: 1px solid #ebedf0" class="fs15 fwb pl10 pv12">家属信息</p>
         <van-cell-group v-for="item in relationList" :key="item.id"  class="fs15">
+          <van-cell v-if="item.birthday!=''">
           <van-cell title="姓名" :value="item.name | blankFilter" />
           <van-cell title="性别" :value="item.sex | genderFilter" />
           <van-cell title="出生日期" :value="item.birthday | blankFilter" />
@@ -73,6 +74,7 @@
           <van-cell title="证件号码" :value="item.idNo | blankFilter" />
           <van-cell title="关系" :value="item.relationType | familyRelationFilter" />
           <van-cell title="联系电话" :value="item.mobile | blankFilter" />
+          </van-cell>
         </van-cell-group>
         <p style="border-bottom: 1px solid #ebedf0" class="fs15 fwb pl10 pv12">审批信息</p>
         <van-cell-group v-for="item in approvalInfo" :key="item.examineApproveName" class="fs15">

src/views/ebiz/claims/ClaimApprovalList.vue

@@ -170,7 +170,7 @@ export default {
       }else{
         that.activeNames = []
         this.claimApprovalList.forEach(function(item) {
-          that.activeNames = that.claimApprovalIds.concat(item.checkboxResult)
+          that.activeNames = that.activeNames.concat(item.checkboxResult)
         })
       }
     },
@@ -337,15 +337,15 @@ export default {
           this.claimApprovalList = res.content
           this.claimApprovalList.forEach(function(item) {
               //list中插入checkbox选中的数组
-              // item.checkboxResult = []
+              item.checkboxResult = []
-              // let arr = []
+              let arr = []
               item.claimApprovalSearchLst.forEach(function(item01) {
                 that.total++  //统计list中有多少条子数据
-                // arr.push(item01.id)
+                arr.push(item01.id)
                 that.claimApprovalIds.push(item01.id)
                 item01.isChecked = '0'
               })
-              // item.checkboxResult = arr
+              item.checkboxResult = arr
           })
           this.passNum = this.claimApprovalIds.length
           this.refuseNum = 0