From 6da8b142021ef4fb156217cc48da28e2c078c216 Mon Sep 17 00:00:00 2001
From: liyuetong <li.yuetong@ebiz-fooge.com>
Date: Wed, 11 Aug 2021 14:31:45 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=9C=AA=E5=AE=A1=E6=89=B9=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=20=E5=85=A8=E9=83=BD=E4=B8=8D=E9=80=89=E6=8B=A9=20=20?=
 =?UTF-8?q?=E7=82=B9=E5=87=BB=E5=85=A8=E9=83=A8=E5=B1=95=E5=BC=80=20?=
 =?UTF-8?q?=EF=BC=8C=E9=A1=B5=E9=9D=A2=E6=95=B0=E6=8D=AE=E9=83=BD=E4=B8=8D?=
 =?UTF-8?q?=E4=BC=9A=E5=B1=95=E5=BC=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/ebiz/claims/ClaimApprovalList.vue | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/views/ebiz/claims/ClaimApprovalList.vue b/src/views/ebiz/claims/ClaimApprovalList.vue
index b1608dd0a..b98d71ea5 100644
--- a/src/views/ebiz/claims/ClaimApprovalList.vue
+++ b/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 = []
-              // let arr = []
+              item.checkboxResult = []
+              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

From 9b2fcbe42a4d13c968780884a3e9008b773fa5af Mon Sep 17 00:00:00 2001
From: dwq <15731277156@163.com>
Date: Thu, 12 Aug 2021 10:10:21 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E3=80=90=E9=94=80=E7=AE=A1=E4=BA=8C?=
 =?UTF-8?q?=E6=AC=A1=E4=BC=98=E5=8C=96=E9=9C=80=E6=B1=82=E3=80=91=20?=
 =?UTF-8?q?=E6=B5=8B=E8=AF=95=E5=8F=8D=E9=A6=88=E4=B8=89=E6=9D=A1=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ebiz/agentEenter/AgentEenterBasicFamily.vue   | 15 +++++++++++++++
 .../ebiz/agentEenter/AgentEenterBasicInfor.vue    |  2 +-
 src/views/ebiz/agentEenter/approve/BasicInfo.vue  |  2 ++
 .../ebiz/agentEenter/approve/RecordDetail.vue     |  4 +++-
 4 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/src/views/ebiz/agentEenter/AgentEenterBasicFamily.vue b/src/views/ebiz/agentEenter/AgentEenterBasicFamily.vue
index ad7f20b9f..4d0ac324e 100644
--- a/src/views/ebiz/agentEenter/AgentEenterBasicFamily.vue
+++ b/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
+      }
     }
   }
 };
diff --git a/src/views/ebiz/agentEenter/AgentEenterBasicInfor.vue b/src/views/ebiz/agentEenter/AgentEenterBasicInfor.vue
index 59acde5d3..d93ece023 100644
--- a/src/views/ebiz/agentEenter/AgentEenterBasicInfor.vue
+++ b/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
diff --git a/src/views/ebiz/agentEenter/approve/BasicInfo.vue b/src/views/ebiz/agentEenter/approve/BasicInfo.vue
index 33570a6a6..3f0c42638 100644
--- a/src/views/ebiz/agentEenter/approve/BasicInfo.vue
+++ b/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">
diff --git a/src/views/ebiz/agentEenter/approve/RecordDetail.vue b/src/views/ebiz/agentEenter/approve/RecordDetail.vue
index e25d69d76..40196f8d0 100644
--- a/src/views/ebiz/agentEenter/approve/RecordDetail.vue
+++ b/src/views/ebiz/agentEenter/approve/RecordDetail.vue
@@ -65,7 +65,8 @@
           <van-cell title="担保人类别" :value="item.type | relationFilter" />
         </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-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">