修改投保人被保人证件有效期

# Conflicts:
#	src/assets/js/utils/data-dictionary.js

src/assets/js/utils/data-dictionary.js

@@ -3927,6 +3927,26 @@ export default {
     {
       code: "wuyouliangquanbkx",
       label: "元"
+    },
+    {
+      code: "currentPaidUpAdditions_L",
+      label: "元"
+    },
+    {
+      code: "currentPaidUpAdditions_M",
+      label: "元"
+    },
+    {
+      code: "totalPaidUpAdditions_L",
+      label: "元"
+    },
+    {
+      code: "totalPaidUpAdditions_M",
+      label: "元"
+    }, 
+    {
+      code: "GFRS_M0094__cashValue",
+      label: "元"
     }
   ],
   // 卡单与短期险重新投保选择职业类别时，两个模块职业类型数据的排序不同，创建这个数据字典，用于在选择职业类别时，作为一个参数传入组件，
@@ -3956,7 +3976,7 @@ export default {
     { id: 'M', text: '母亲' }
   ],
   // <!--------- 津贴申请专用  end --------->
-  imageInfoType:[
+  imageInfoType: [
     { id: '1', text: '居民身份证正面' },
     { id: '2', text: '居民身份证反面' },
     { id: '3', text: '银行卡正面' },

src/views/ebiz/product/HomeProduct.vue

@@ -44,10 +44,10 @@
           <div class="pcenter-list mr20 mb10 ml15">
             <template v-if="branchType != '6'">
               <div class="pcenter-item text-center">
-                <img src="../../../assets/images/home_cp_1.png" style="width: 100%;" @click="goDetail('GFRSPRO_M0073')" />
+                <img src="../../../assets/images/home_product_center_m0092.png" style="width: 100%;" @click="goDetail('GFRSPRO_M0092')" />
               </div>
               <div class="pcenter-item text-center">
-                <img src="../../../assets/images/home_cp_2.png" style="width: 100%;" @click="goDetail('GFRSPRO_M0072')" />
+                <img src="../../../assets/images/home_product_center_m0094.png" style="width: 100%;" @click="goDetail('GFRSPRO_M0094')" />
               </div>
             </template>
             <template v-else-if="branchType == '6'">
@@ -122,11 +122,11 @@
         <div class="home-product-pcenter">
           <div class="pcenter-list mr20 mb10 ml15">
             <div class="pcenter-item text-center">
-              <img src="../../../assets/images/home_cp_1.png" style="width: 100%;" @click="goDetail('GFRSPRO_M0073')" />
-            </div>
-            <div class="pcenter-item text-center">
-              <img src="../../../assets/images/home_cp_2.png" style="width: 100%;" @click="goDetail('GFRSPRO_M0072')" />
-            </div>
+                <img src="../../../assets/images/home_product_center_m0092.png" style="width: 100%;" @click="goDetail('GFRSPRO_M0092')" />
+              </div>
+              <div class="pcenter-item text-center">
+                <img src="../../../assets/images/home_product_center_m0094.png" style="width: 100%;" @click="goDetail('GFRSPRO_M0094')" />
+              </div>
           </div>
         </div>
       </div>

src/views/ebiz/sale/InsuredInfo.vue

@@ -993,6 +993,7 @@
       },
       //证件起始截止日期
       onDateConfirm(val, type) {
+        console.log(val,type,);
         switch (type) {
           case '0':
           {
@@ -1009,9 +1010,10 @@
               let age = utilsAge.getAge(this.userInfo.birthday, new Date())
               // 长期按钮是否禁用
               this.effectiveDateTypeAble = age <= 45
-              if(this.userInfo.birthday){
+              if(this.userInfo.birthday && !this.userInfo.certiexpiredate){
                 this.userInfo.certiexpiredate = countCredentialValidity.getEndDate(this.userInfo.birthday,val)
                 if(this.userInfo.certiexpiredate) {
+                  this.userInfo.certiexpiredate= this.userInfo.certiexpiredate
                   this.effectiveDateTypeAble = true
                   this.userInfo.effectiveDateType = false
                 }
@@ -1030,9 +1032,9 @@
             }
             //身份证证件类型的判断
             if (this.userInfo.idType == '1') {
-              if(this.userInfo.birthday){
-                this.userInfo.certificateValidate = countCredentialValidity.getStartDate(this.userInfo.birthday,val)
-              }
+              // if(this.userInfo.birthday){
+                // this.userInfo.certificateValidate = countCredentialValidity.getStartDate(this.userInfo.birthday,val)
+              // }
             }
           }
             break
@@ -1057,7 +1059,7 @@
             if (this.userInfo.certificateValidate && !this.userInfo.certiexpiredate) {
               this.userInfo.certiexpiredate = countCredentialValidity.getEndDate(this.userInfo.birthday,this.userInfo.certificateValidate)
             }
-            if (this.userInfo.certiexpiredate && !this.userInfo.certificateValidate) {
+            if (this.userInfo.certiexpiredate && !this.userInfo.certificateValidate) {                                                                                                                                                                                                                           
               this.userInfo.certificateValidate = countCredentialValidity.getEndDate(this.userInfo.birthday,this.userInfo.certiexpiredate)
             }
           }

src/views/ebiz/sale/InsuredPerson.vue

@@ -1109,9 +1109,10 @@
               let age = utilsAge.getAge(this.userInfo.birthday, new Date())
               // 长期按钮是否禁用
               this.effectiveDateTypeAble = age <= 45
-              if(this.userInfo.birthday){
+              if(this.userInfo.birthday && !this.userInfo.certiexpiredate){
                 this.userInfo.certiexpiredate = countCredentialValidity.getEndDate(this.userInfo.birthday,val)
                 if(this.userInfo.certiexpiredate) {
+                  this.userInfo.certiexpiredate= this.userInfo.certiexpiredate
                   this.effectiveDateTypeAble = true
                   this.userInfo.effectiveDateType = false
                 }
@@ -1142,9 +1143,9 @@
               //获取年龄
               let age = utilsAge.getAge(this.userInfo.birthday, new Date())
               console.log(age)
-              if(this.userInfo.birthday){
-                this.userInfo.certificateValidate = countCredentialValidity.getStartDate(this.userInfo.birthday,val)
-              }
+              // if(this.userInfo.birthday){
+              //   this.userInfo.certificateValidate = countCredentialValidity.getStartDate(this.userInfo.birthday,val)
+              // }
             }
           }
             break

src/views/ebiz/sale/SignatureConfirmation.vue

@@ -16,6 +16,12 @@
         <van-cell title="销售人员工号" :value="recmd.agentCode" />
         <van-cell title="销售人员姓名" :value="recmd.name" />
         <van-cell title="投保单号" :value="orderInfo.orderNo"></van-cell>
+        <!-- 电投签名确认新增交费期间  start at 20240910 -->
+         <div v-if="riskInfo"> 
+        <van-cell v-if="riskInfo.payEndYear == '1000'" title="交费期间"  value="一次性交清" />
+        <van-cell v-else title="交费期间" :value="riskInfo.payEndYearFlag == 'Y' ? `${riskInfo.payEndYear}年` : `至${riskInfo.payEndYear}岁`" />
+      </div>
+        <!-- 电投签名确认新增交费期间  end at 20240910 -->
         <van-cell title="投保日期" :value="date" />
         <van-cell title="保费合计(元)" :value="orderInfo.orderAmount == undefined ? '' : orderInfo.orderAmount | moneyFormat" />
         <van-cell v-if="cvalidateStr" title="指定保单生效日" :value="cvalidateStr" />
@@ -353,6 +359,8 @@ export default {
       riskName: '',
       // 员工信息
       recmd: {},
+      // 险种信息 获取交费期间
+      riskInfo: null,
       // 投保时间
       date: '',
       // 订单信息
@@ -1449,6 +1457,7 @@ export default {
             let documentCodeType = res.orderDTO.ebizSignDTOS.filter(item=>item.documentCode == '14').length>0
             localStorage.setItem('documentCodeType', documentCodeType)
             let riskDTOLst = res.orderDTO.insuredDTOs[0].riskDTOLst[0]
+            this.riskInfo = res.orderDTO.insuredDTOs[0].riskDTOLst[0]
             // 判断是否为长期险
             if ((riskDTOLst.insuYearFlag == 'Y' && riskDTOLst.insuYear > 1) || riskDTOLst.insuYearFlag == 'A') {
               this.$CacheUtils.setLocItem('isLongInsuranceFlag', "Y");