电子投保流程被保人以及受益人证件有效期校验规则修改

src/assets/js/business-common.js

@@ -559,7 +559,10 @@ export default {
     )
 
     if (insuredDTO) {
-      let insuredPersonAge = insuredDTO.birthday?utilsAge.getAge(insuredDTO.birthday, new Date()):insuredDTO.insuredAge
+      let insuredPersonAge = insuredDTO.insuredAge ? insuredDTO.insuredAge : insuredDTO.age
+      if(insuredDTO.birthday){
+        insuredPersonAge = utilsAge.getAge(insuredDTO.birthday, new Date())
+      }
       CacheUtils.setLocItem('saleInsuredPersonInfo',
           JSON.stringify({
             birthday: insuredDTO.birthday,

src/assets/js/utils/countCredentialValidity.js

@@ -0,0 +1,167 @@
+export default {
+  //计算身份证起始日期
+  getStartDate: function(age, endDate) {
+    let startDate = '' //证件起始日期
+    let thisDate = new Date() //当年日期
+    let thisyear = thisDate.getFullYear() //当前年份
+
+    if (age < 16) {
+      /**
+       * @Author: LiuXiaoFeng
+       * @Description: 16周岁以下的证件有效期为5年
+       * @Date: 2023/7/4
+       **/
+      startDate = String(Number(endDate.slice(0,4)) - 5) + endDate.slice(4,11)
+    } else if (age >= 16 && age <= 21) {
+      /**
+       * @Author: LiuXiaoFeng
+       * @Description: 16周岁~21周岁的证件有效期为10年或5年
+       * @Date: 2023/7/4
+       **/
+      if (age - (10 - (endDate.slice(0,4) - thisyear)) < 16 ) {
+        /**
+         * @Author: LiuXiaoFeng
+         * @Description: 如果证件有效期为10年 根据证件截止日期 判断10年前的年龄 如果小于16周岁 那么证件有效期就是5年
+         * @Date: 2023/7/5
+         **/
+        startDate = String(Number(endDate.slice(0,4)) - 5) + endDate.slice(4,11)
+      } else {
+        startDate = String(Number(endDate.slice(0,4)) - 10) + endDate.slice(4,11)
+      }
+    } else if(age >= 22 && age <= 25) {
+      /**
+       * @Author: LiuXiaoFeng
+       * @Description: 22周岁~25周岁的证件有效期为10年
+       * @Date: 2023/7/4
+       **/
+      startDate = String(Number(endDate.slice(0,4)) - 10) + endDate.slice(4,11)
+    } else if (age >= 26 && age <= 35) {
+      /**
+       * @Author: LiuXiaoFeng
+       * @Description: 26周岁~35周岁的证件有效期为20年或10年
+       * @Date: 2023/7/4
+       **/
+      if (age - (20 - (endDate.slice(0,4) - thisyear)) < 26 ) {
+        /**
+         * @Author: LiuXiaoFeng
+         * @Description: 如果证件有效期为20年 根据证件截止日期 判断20年前的年龄 如果小于26周岁 那么证件有效期就是10年
+         * @Date: 2023/7/5
+         **/
+        startDate = String(Number(endDate.slice(0,4)) - 10) + endDate.slice(4,11)
+      } else {
+        startDate = String(Number(endDate.slice(0,4)) - 20) + endDate.slice(4,11)
+      }
+    } else if (age >= 36 && age <= 45) {
+      /**
+       * @Author: LiuXiaoFeng
+       * @Description: 36周岁~45周岁的证件有效期为20年
+       * @Date: 2023/7/4
+       **/
+      startDate = String(Number(endDate.slice(0,4)) + 20) + endDate.slice(4,11)
+    } else if (age >= 46 && age <= 65) {
+      /**
+       * @Author: LiuXiaoFeng
+       * @Description: 46周岁~65周岁的证件有效期为20年或长期
+       * @Date: 2023/7/4
+       **/
+      if (age - (20 - (endDate.slice(0,4) - thisyear)) < 46 ) {
+        /**
+         * @Author: LiuXiaoFeng
+         * @Description: 如果证件有效期为20年 根据证件截止日期 判断20年前的年龄 如果小于46周岁 那么证件有效期就是20年
+         * @Date: 2023/7/5
+         **/
+        startDate = String(Number(endDate.slice(0,4)) - 20) + endDate.slice(4,11)
+      }
+    } else if (age > 65) {
+      /**
+       * @Author: LiuXiaoFeng
+       * @Description: 65周岁以上的证件有效期为长期
+       * @Date: 2023/7/4
+       **/
+    }
+    return startDate
+  },
+
+  //计算身份证截止日期
+  getEndDate: function(age, startDate) {
+    let endDate = '' //证件截止日期
+    let thisDate = new Date() //当年日期
+    let thisyear = thisDate.getFullYear() //当前年份
+
+    if (age < 16) {
+      /**
+       * @Author: LiuXiaoFeng
+       * @Description: 16周岁以下的证件有效期为5年
+       * @Date: 2023/7/4
+       **/
+      endDate = String(Number(startDate.slice(0,4)) + 5) + startDate.slice(4,11)
+    } else if (age >= 16 && age <= 21) {
+      /**
+       * @Author: LiuXiaoFeng
+       * @Description: 16周岁~21周岁的证件有效期为10年或5年
+       * @Date: 2023/7/4
+       **/
+      if (age - (thisyear - startDate.slice(0,4)) < 16 ) {
+        /**
+         * @Author: LiuXiaoFeng
+         * @Description: 根据证件起始日期计算办证时年龄 如果办证时年龄小于16周岁 那么证件有效期就是5年
+         * @Date: 2023/7/5
+         **/
+        endDate = String(Number(startDate.slice(0,4)) + 5) + startDate.slice(4,11)
+      } else {
+        endDate = String(Number(startDate.slice(0,4)) + 10) + startDate.slice(4,11)
+      }
+    } else if(age >= 22 && age <= 25) {
+      /**
+       * @Author: LiuXiaoFeng
+       * @Description: 22周岁~25周岁的证件有效期为10年
+       * @Date: 2023/7/4
+       **/
+      endDate = String(Number(startDate.slice(0,4)) + 10) + startDate.slice(4,11)
+    } else if (age >= 26 && age <= 35) {
+      /**
+       * @Author: LiuXiaoFeng
+       * @Description: 26周岁~35周岁的证件有效期为20年或10年
+       * @Date: 2023/7/4
+       **/
+      if (age - (thisyear - startDate.slice(0,4)) < 26 ) {
+        /**
+         * @Author: LiuXiaoFeng
+         * @Description: 根据证件起始日期计算办证时年龄 如果办证时年龄小于26周岁 那么证件有效期就是10年
+         * @Date: 2023/7/5
+         **/
+        endDate = String(Number(startDate.slice(0,4)) + 10) + startDate.slice(4,11)
+      } else {
+        endDate = String(Number(startDate.slice(0,4)) + 20) + startDate.slice(4,11)
+      }
+    } else if (age >= 36 && age <= 45) {
+      /**
+       * @Author: LiuXiaoFeng
+       * @Description: 36周岁~45周岁的证件有效期为20年
+       * @Date: 2023/7/4
+       **/
+      endDate = String(Number(startDate.slice(0,4)) + 20) + startDate.slice(4,11)
+    } else if (age >= 46 && age <= 65) {
+      /**
+       * @Author: LiuXiaoFeng
+       * @Description: 46周岁~65周岁的证件有效期为20年或长期
+       * @Date: 2023/7/4
+       **/
+      if (age - (thisyear - startDate.slice(0,4)) < 46 ) {
+        /**
+         * @Author: LiuXiaoFeng
+         * @Description: 根据证件起始日期计算办证时年龄 如果办证时年龄小于46周岁 那么证件有效期就是20年
+         * @Date: 2023/7/5
+         **/
+        endDate = String(Number(startDate.slice(0,4)) + 20) + startDate.slice(4,11)
+      }
+    } else if (age > 65) {
+      /**
+       * @Author: LiuXiaoFeng
+       * @Description: 65周岁以上的证件有效期为长期
+       * @Date: 2023/7/4
+       **/
+    }
+    return endDate
+  }
+}

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

@@ -3777,6 +3777,22 @@ export default {
     {
       code: "GFRS_M0073__cashValue",
       label: "元"
+    },
+    {
+      code: "currentBonus_L",
+      label: "元"
+    },
+    {
+      code: "currentBonus_M",
+      label: "元"
+    },
+    {
+      code: "riskAC_L",
+      label: "元"
+    },
+    {
+      code: "riskAC_M",
+      label: "元"
     }
   ],
   // 卡单与短期险重新投保选择职业类别时，两个模块职业类型数据的排序不同，创建这个数据字典，用于在选择职业类别时，作为一个参数传入组件，

src/components/ebiz/customer/formBlock.vue

@@ -653,12 +653,6 @@ export default {
             //   return
             // }
             this.userInfo.effectiveDateType = false
-            //如果录入日期早于当前日期
-            if (Date.parse(val) < Date.parse(new Date())) {
-              this.userInfo.certiexpiredate = ''
-              this.$refs.certiexpiredate.date = ''
-              return this.$toast('您的证件已过期')
-            }
           }
           break
         case '2':

src/config/index.js

@@ -27,29 +27,29 @@ function getSearchString (key) {
   }
   return obj[key]
 }
-let apiVersion = 'v1'
-// var ua = window.navigator.userAgent.toLowerCase()
-// //通过正则表达式匹配ua中是否含有MicroMessenger字符串, 在微信
-// if (localStorage.getItem('apiVersion')) {
-//   apiVersion = localStorage.getItem('apiVersion')
-// } else {
-//   if (ua.match(/MicroMessenger/i) == 'micromessenger') {
-//     //report/reportList数据报表页面在浏览器可以打开了，但在微信或企业微信中打开不了,接口请求不需要token
-//     if (window.location.href.indexOf('apiVersion') > 0) {
-//       apiVersion = getSearchString('apiVersion') == 'V3' ? 'v3' : 'v2';//url中apiVersion没有时，为v2
-//     } else {
-//       apiVersion = 'v3'
-//     }
-//   } else {
-//     // 在app
-//     if (navigator.userAgent.indexOf('JZG_') > 0) {
-//       apiVersion = navigator.userAgent.split('JZG_')[1].split('/')[0].split('_')[1] == 'V3' ? 'v3' : 'v2'
-//     }
-//   }
-//   window.localStorage.setItem('apiVersion', apiVersion)
-// }
-// // 可以多个接口域名，按需添加
-// console.log('环境：', process.env.VUE_APP_FLAG)
+let apiVersion = 'v2'
+var ua = window.navigator.userAgent.toLowerCase()
+//通过正则表达式匹配ua中是否含有MicroMessenger字符串, 在微信
+if (localStorage.getItem('apiVersion')) {
+  apiVersion = localStorage.getItem('apiVersion')
+} else {
+  if (ua.match(/MicroMessenger/i) == 'micromessenger') {
+    //report/reportList数据报表页面在浏览器可以打开了，但在微信或企业微信中打开不了,接口请求不需要token
+    if (window.location.href.indexOf('apiVersion') > 0) {
+      apiVersion = getSearchString('apiVersion') == 'V3' ? 'v3' : 'v2';//url中apiVersion没有时，为v2
+    } else {
+      apiVersion = 'v3'
+    }
+  } else {
+    // 在app
+    if (navigator.userAgent.indexOf('JZG_') > 0) {
+      apiVersion = navigator.userAgent.split('JZG_')[1].split('/')[0].split('_')[1] == 'V3' ? 'v3' : 'v2'
+    }
+  }
+  window.localStorage.setItem('apiVersion', apiVersion)
+}
+// 可以多个接口域名，按需添加
+console.log('环境：', process.env.VUE_APP_FLAG)
 switch (process.env.VUE_APP_FLAG) {
   case 'dev':
     apiDomain = 'https://iagentsales-test2.e-guofu.com:5200/api/' + apiVersion // 国富api ///api/v1

src/views/ebiz/cardList/GroupCheckInfo.vue

@@ -54,7 +54,7 @@
 </template>
 
 <script>
-import { Field, GoodsAction, GoodsActionIcon, GoodsActionButton, Icon ,Collapse, CollapseItem} from 'vant'
+  import {Field, GoodsAction, GoodsActionIcon, GoodsActionButton, Icon, Collapse, CollapseItem, Dialog} from 'vant'
 import {cardOrderDetail } from '@/api/ebiz/cardList/cardList.js'
 import getAreaName from '@/assets/js/utils/getAreaNameForSale'
 import afterDate from '@/assets/js/utils/getAfterDate.js'
@@ -79,7 +79,8 @@ export default {
       riskDTO: {},
       productDate: '',
       orderInfoDTO:{},
-      isGroupCard:''
+      isGroupCard:'',
+      mainRiskCode: ''
     //   isLessEighteen: true   // 被保人手机号和邮箱默认展示
     }
   },
@@ -101,6 +102,11 @@ export default {
         this.orderInfoDTO = res.orderDTO.orderInfoDTO
         this.insuredInfo = res.orderDTO.insuredDTOs
         this.insuredInfo.forEach(item => {
+          item.riskDTOLst.forEach(ii=>{
+            if(ii.isMainRisk == '0'){
+              this.mainRiskCode = ii.mainRiskCode
+            }
+          })
           item.homeName = getAreaName([{ code: item.homeProvince }, { code: item.homeCity }, { code: item.homeArea }])
         })
         // this.riskDTO = res.orderDTO.insuredDTOs[0].riskDTOLst[0]
@@ -132,15 +138,37 @@ export default {
   },
   methods: {
     nextStep() {
-      this.$jump({
-        flag: 'h5',
-        extra: {
-          url: location.origin + `/#/cardList/SignatureConfirmation?isGroupCard=`+this.isGroupCard
-        },
-        routerInfo: {
-          path: `/cardList/SignatureConfirmation?isGroupCard=`+this.isGroupCard
-        }
-      })
+      if(this.mainRiskCode == 'GFRS_M0058'){
+        Dialog.alert({
+          title: '特别提醒',
+          messageAlign: 'left',
+          confirmButtonText: '确认',
+          message: `2023年9月1日起生效的惠桂保保单，不能参保的5类既往症中增加了“神经性耳聋”，敬请注意！`,
+        })
+        .then(() => {
+          this.$jump({
+            flag: 'h5',
+            extra: {
+              url: location.origin + `/#/cardList/SignatureConfirmation?isGroupCard=`+this.isGroupCard
+            },
+            routerInfo: {
+              path: `/cardList/SignatureConfirmation?isGroupCard=`+this.isGroupCard
+            }
+          })
+        })
+        .catch(() => {
+        })
+      }else{
+        this.$jump({
+          flag: 'h5',
+          extra: {
+            url: location.origin + `/#/cardList/SignatureConfirmation?isGroupCard=`+this.isGroupCard
+          },
+          routerInfo: {
+            path: `/cardList/SignatureConfirmation?isGroupCard=`+this.isGroupCard
+          }
+        })
+      }
     }
   }
 }

src/views/ebiz/cardList/Pay.vue

@@ -290,6 +290,7 @@ export default {
       accBankProvince: '',
       accBankCity: '',
       areaStr: '',
+      mainRiskCode: '',
       isGroupCard:'' //1 团险标识
     }
   },
@@ -310,17 +311,13 @@ export default {
       this.bankListName = orderDetail.orderAccountDTO.bankName
       this.orderStatus = orderDetail.orderInfoDTO.orderStatus
       localStorage.orderNo = orderDetail.orderInfoDTO.orderNo
-      // this.radio = '3'
-      // this.isLoading = true
-      // this.$toast.loading({
-      //   duration: 0, // 持续展示 toast
-      //   forbidClick: true, // 禁用背景点击
-      //   loadingType: 'spinner',
-      //   message: '加载中……'
-      // })
-      // setTimeout(() => {
-      //   this.pay()
-      // }, 500)
+      orderDetail.insuredDTOs.forEach(item=>{
+        item.riskDTOLst.forEach(ii=>{
+          if(ii.isMainRisk == '0'){
+            this.mainRiskCode = ii.mainRiskCode
+          }
+        })
+      })
     } else {
       document.title = '支付分享'
       // 再次支付 调详情 获取信息
@@ -513,6 +510,13 @@ export default {
       getOrderDetail({ orderNo: window.localStorage.getItem('orderNo') }).then(res => {
         if (res.result == '0') {
           this.insuredDTOs = res.orderDTO.insuredDTOs
+          res.orderDTO.insuredDTOs.forEach(item=>{
+            item.riskDTOLst.forEach(ii=>{
+              if(ii.isMainRisk == '0'){
+                this.mainRiskCode = ii.mainRiskCode
+              }
+            })
+          })
           this.orderStatus = res.orderDTO.orderInfoDTO.orderStatus
           try {
             if (this.noEdit) {
@@ -742,58 +746,69 @@ export default {
           支付之前要先保存银行账户信息
         */
         let res = await saveOrUpdateAccount(data)
-        // .then(res => {
-        console.log('res', res)
         this.$toast.clear()
         if (res.result == '0') {
+          if(this.mainRiskCode == 'GFRS_M0058'){
+            Dialog.alert({
+              title: '特别提醒',
+              messageAlign: 'left',
+              confirmButtonText: '确认',
+              message: `2023年9月1日起生效的惠桂保保单，不能参保的5类既往症中增加了“神经性耳聋”，敬请注意！`,
+            })
+            .then(() => {
+              this.$toast.loading({
+                duration: 0, // 持续展示 toast
+                forbidClick: true, // 禁用背景点击
+                loadingType: 'spinner',
+                message: '加载中……'
+              })
+              this.acceptInsurance()
+            })
+            .catch(() => {
+            })
+          }else{
+            this.$toast.loading({
+              duration: 0, // 持续展示 toast
+              forbidClick: true, // 禁用背景点击
+              loadingType: 'spinner',
+              message: '加载中……'
+            })
+            this.acceptInsurance()
+          }
+
+        } else {
+          this.$toast(res.resultMessage)
+          this.isLoading = false
+        }
+      } else {
+        if(this.mainRiskCode == 'GFRS_M0058'){
+          Dialog.alert({
+            title: '特别提醒',
+            messageAlign: 'left',
+            confirmButtonText: '确认',
+            message: `2023年9月1日起生效的惠桂保保单，不能参保的5类既往症中增加了“神经性耳聋”，敬请注意！`,
+          })
+          .then(() => {
+            this.$toast.loading({
+              duration: 0, // 持续展示 toast
+              forbidClick: true, // 禁用背景点击
+              loadingType: 'spinner',
+              message: '加载中……'
+            })
+            this.acceptInsurance()
+          })
+          .catch(() => {
+          })
+        }else{
           this.$toast.loading({
             duration: 0, // 持续展示 toast
             forbidClick: true, // 禁用背景点击
             loadingType: 'spinner',
             message: '加载中……'
           })
-
-          // if (!flag) {
-          //   let rs = await this.underWrite()
-
-          //   if (rs.result != '0') {
-          //     this.$toast.clear()
-          //     return this.$toast(rs.resultMessage)
-          //   }
-
-          //   if (rs.uwResult != '02') {
-          //     return this.$toast(rs.message)
-          //   }
-          // }
-
           this.acceptInsurance()
-        } else {
-          this.$toast(res.resultMessage)
-          this.isLoading = false
         }
-        // })
-      } else {
-        this.$toast.loading({
-          duration: 0, // 持续展示 toast
-          forbidClick: true, // 禁用背景点击
-          loadingType: 'spinner',
-          message: '加载中……'
-        })
 
-        // if (!flag) {
-        //   let rs = await this.underWrite()
-
-        //   if (rs.result != '0') {
-        //     this.$toast.clear()
-        //     return this.$toast(rs.resultMessage)
-        //   }
-
-        //   if (rs.uwResult != '02') {
-        //     return this.$toast(rs.message)
-        //   }
-        // }
-
-        this.acceptInsurance()
       }
     },
     // 选择微信支付校验身份证类型

src/views/ebiz/cardList/cardDetail.vue

@@ -127,7 +127,8 @@ export default {
     productDate = new Date(parseInt(hoDate) * 1000)
     insuYearM = productDate.getMonth() + 1 < 10 ? '0' + (productDate.getMonth() + 1) : productDate.getMonth() + 1
     insuYearD = productDate.getDate() < 10 ? '0' + productDate.getDate() : productDate.getDate()
-    productDateTime = productDate.getFullYear() + '年' + insuYearM + '月' + insuYearD + '日'
+    // productDateTime = productDate.getFullYear() + '年' + insuYearM + '月' + insuYearD + '日'
+    productDateTime = afterDate.getAfterDateTime(insuYear.cvaliDate,1)
     this.productDate = currentData + '0时至' + productDateTime + '24时止'
     this.orderAmount = this.orderDTO.orderInfoDTO.orderAmount
   },

src/views/ebiz/common/CalculatePremium.vue

@@ -353,8 +353,17 @@
     <van-dialog v-model="trialResultsShow" title="核保试算结果" :show-cancel-button="false">
       <div class="pl40 pr40 mt10">
         <div class="flex justify-content-s fs12" v-for="(item, index) in verifyResultList" :key="index">
-           <div><img class="w20 h20 p10 v-middle" :src="require('@/assets/images/sale/ruleType0'+ item.ruleType +'.png')" alt=""><span class="v-middle">{{item.ruleType | ruleTypeFilter}}</span></div>
-           <div><span class="v-middle">{{item.status | approvedFilter}}</span><img class="w20 h20 p10 v-middle" :src="require('@/assets/images/sale/approved'+ item.status +'.png')" alt=""></div>
+           <div>
+             <img class="w20 h20 p10 v-middle" :src="require('@/assets/images/sale/ruleType0'+ item.ruleType +'.png')" alt="">
+             <span class="v-middle">{{item.ruleType | ruleTypeFilter}}</span>
+           </div>
+           <div>
+<!--             <span class="v-middle">{{item.status | approvedFilter}}</span>-->
+             <img class="w20 h20 p10 v-middle" :src="require('@/assets/images/sale/approved'+ item.status +'.png')" alt="">
+           </div>
+        </div>
+        <div style="padding:25px 0px 10px 10px;font-size: 10px;color: #999;">
+          <p style="line-height: 20px;"><span style="width: 40px;display: inline-block;">说明：</span>绿色✔表示 未触发规则、红色×表示 触发规则</p>
         </div>
       </div>
     </van-dialog>
@@ -367,6 +376,7 @@ import { saveOrUpdateOrderInfo, getOrderDetail,orderTrial } from '@/api/ebiz/sal
 import { saveProposal, getTrialRecordInfo, saveOrUpdateTrialRecordInfo } from '@/api/ebiz/proposal/proposal.js'
 import { getAgentInfo } from '@/api/ebiz/my/my.js'
 import occupationList from '@/components/ebiz/occipation/data/occupation'
+import utilsAge from '@/assets/js/utils/age'
 import riskRules from "./risk-rules";
 
   //险种GFRS_M0016的责任的验证规则
@@ -655,6 +665,9 @@ export default {
       if (this.$CacheUtils.getLocItem('saleInsuredPersonInfo')) {
         this.saleInsuredPersonInfo = JSON.parse(this.$CacheUtils.getLocItem('saleInsuredPersonInfo'))
         this.saleInsuredPersonInfo.insuredAge = this.saleInsuredPersonInfo.insuredAge ? this.saleInsuredPersonInfo.insuredAge : this.saleInsuredPersonInfo.age
+        if(this.saleInsuredPersonInfo.birthday){
+          this.saleInsuredPersonInfo.insuredAge = utilsAge.getAge(this.saleInsuredPersonInfo.birthday, new Date())
+        }
         if (this.isFrom == 'proposal' && !this.saleInsuredPersonInfo.name) {
           // 建议书投保人/被保人姓名不必填, 填写姓名时展示姓名(落库),不填写姓名时展示性别+年龄,如:男30岁(不落库)
           let sex = this.saleInsuredPersonInfo.sex == '0'?'男':'女'
@@ -2338,7 +2351,7 @@ export default {
             this.saleInsuredInfo.sex,
             this.saleInsuredInfo.occupationCode,
             this.saleInsuredInfo.occupationName,
-            this.saleInsuredInfo.insuredAge?this.saleInsuredInfo.insuredAge:this.saleInsuredInfo.age,
+            this.saleInsuredPersonInfo.insuredAge
           ]
         } else {
           ;[birthday, sex, occupationCode, occupationName, age] = [
@@ -2346,7 +2359,7 @@ export default {
             this.saleInsuredPersonInfo.sex,
             this.saleInsuredPersonInfo.occupationCode,
             this.saleInsuredPersonInfo.occupationName,
-            this.saleInsuredPersonInfo.insuredAge?this.saleInsuredPersonInfo.insuredAge:this.saleInsuredPersonInfo.age
+            this.saleInsuredPersonInfo.insuredAge
           ]
         }
         trialInfo = Object.assign(trialInfo, {
@@ -2404,25 +2417,161 @@ export default {
     },
     //保额份数变化
     stepperChange(defalutValue, productIndex, calFactorIndex, min, max, riskFactor) {
-        let currentEle =
-                localStorage.isTrial !== '1' && this.chooseProducts[productIndex].isMainRisk == '0'
-                        ? this.chooseProducts[productIndex].productTrialYearDTOS[calFactorIndex]
-                        : this.chooseProducts[productIndex].calFactorLst[calFactorIndex]
-        //改动原因：孝心保产品有对年龄的特殊要求
-        //添加判断，是否是孝心保产品
-        let showHint = this.chooseProducts[productIndex].hint
-        let productCode = localStorage.trialList == '' ? '' : JSON.parse(localStorage.trialList)[0].productCode
-        if (productCode == 'GFRS_M0014') {
-          //被保险人年龄如果在50-65区间
-          if (this.saleInsuredPersonInfo.insuredAge >= 50 && this.saleInsuredPersonInfo.insuredAge <= 65) {
-            //使用rules规则里的第二条控制保额份数
-            if (Number(defalutValue) < Number(riskFactor.rules[1].minPrem) || Number(defalutValue) > Number(riskFactor.rules[1].maxPrem)) {
+      let currentEle = ''
+      let params = this.getParams()
+      if(localStorage.isTrial !== '1' && this.chooseProducts[productIndex].isMainRisk == '0'){
+        // params[productIndex].payEndYear == '1000' 交费期间为一次性交清
+        this.chooseProducts[productIndex].productTrialYearDTOS.forEach(item=>{
+          if(params.trialInfos[productIndex].payEndYear == '1000') {
+            if(item.yearWay == '一次性交清'){
+              currentEle = item
+            }
+          } else {
+            if(item.yearWay == params.trialInfos[productIndex].payEndYear){
+              currentEle = item
+            }
+          }
+        })
+      } else {
+        currentEle = this.chooseProducts[productIndex].calFactorLst[calFactorIndex]
+      }
+      //改动原因：孝心保产品有对年龄的特殊要求
+      //添加判断，是否是孝心保产品
+      let showHint = this.chooseProducts[productIndex].hint
+      let productCode = localStorage.trialList == '' ? '' : JSON.parse(localStorage.trialList)[0].productCode
+      if (productCode == 'GFRS_M0014') {
+        //被保险人年龄如果在50-65区间
+        if (this.saleInsuredPersonInfo.insuredAge >= 50 && this.saleInsuredPersonInfo.insuredAge <= 65) {
+          //使用rules规则里的第二条控制保额份数
+          if (Number(defalutValue) < Number(riskFactor.rules[1].minPrem) || Number(defalutValue) > Number(riskFactor.rules[1].maxPrem)) {
+            this.$toast(showHint)
+            this.nextStepFlag = true
+          } else {
+            if ((Number(defalutValue) * 10000) % (Number(currentEle.limit) * 10000) != 0) {
+              // this.defalutAmt = currentEle.rules[productIndex].displayAmount
               this.$toast(showHint)
               this.nextStepFlag = true
+            } else {
+              this.mainRiskInfluenceAddRisk()
+              currentEle['amt'] = Number(defalutValue) * Number(currentEle.moneyUnit)
+              this.getTrial()
+            }
+          }
+          //被保险人年龄如果在66-75之间
+        } else if (this.saleInsuredPersonInfo.insuredAge >= 66 && this.saleInsuredPersonInfo.insuredAge <= 75) {
+          //使用rules规则里的第一条控制保额份数
+          if (Number(defalutValue) < Number(riskFactor.rules[0].minPrem) || Number(defalutValue) > Number(riskFactor.rules[0].maxPrem)) {
+            this.$toast(showHint)
+            this.nextStepFlag = true
+          } else {
+            if ((Number(defalutValue) * 10000) % (Number(currentEle.limit) * 10000) != 0) {
+              // this.defalutAmt = currentEle.rules[productIndex].displayAmount
+              this.$toast(showHint)
+              this.nextStepFlag = true
+            } else {
+              this.mainRiskInfluenceAddRisk()
+              currentEle['amt'] = Number(defalutValue) * Number(currentEle.moneyUnit)
+              this.getTrial()
+            }
+          }
+        }
+        //isTrial为0 ---暂时为富娃娃两全保险（万能型）专配 输入保费校验
+      }
+      else if (productCode == 'GFRS_M0035' || productCode == 'GFRS_M0044'
+              || productCode == 'GFRS_M0056' || productCode == 'GFRS_M0057' || productCode == 'GFRS_M0060') {
+        console.log('defalutValue==', defalutValue)
+        console.log("currentEle['amt']==", currentEle['amt'])
+        console.log('riskFactor.rules', riskFactor.rules)
+        console.log('this.saleInsuredPersonInfo.insuredAge ', this.saleInsuredPersonInfo.insuredAge)
+        //被保险人年龄如果在50-65区间
+        if (this.saleInsuredPersonInfo.insuredAge >= 56 && this.saleInsuredPersonInfo.insuredAge <= 60) {
+          //使用rules规则里的第二条控制保额份数
+          // 年龄在56周岁及以上被保险人，投保本险种时，最低基本保险金额为10000元。超过最低基本保险金额为10000元整数倍。
+          if (Number(defalutValue) < Number(riskFactor.rules[1].minPrem) || Number(defalutValue) > Number(riskFactor.rules[1].maxPrem)) {
+            this.$toast('56周岁-60周岁最低基本保险金额为'+ (Number(riskFactor.rules[1].minPrem) * 10000) +'元。超过最低基本保险金额为'+ (Number(riskFactor.rules[1].limit) * 10000) +'元整数倍。')
+            this.nextStepFlag = true
+          } else {
+            if ((Number(defalutValue) * 10000) % (Number(currentEle.limit) * 10000) != 0) {
+              // this.defalutAmt = currentEle.rules[productIndex].displayAmount
+              this.$toast('56周岁-60周岁最低基本保险金额为'+ (Number(riskFactor.rules[1].minPrem) * 10000) +'元。超过最低基本保险金额为'+ (Number(riskFactor.rules[1].limit) * 10000) +'元整数倍。')
+              this.nextStepFlag = true
+            } else {
+              this.mainRiskInfluenceAddRisk()
+              currentEle['amt'] = Number(defalutValue) * Number(currentEle.moneyUnit)
+              this.getTrial()
+            }
+          }
+          //年龄在0-55周岁被保险人，投保本险种时，最低基本保险金额为50000元，超过最低基本保险金额为10000元整数倍。
+        } else if (this.saleInsuredPersonInfo.insuredAge >= 0 && this.saleInsuredPersonInfo.insuredAge <= 55) {
+          //使用rules规则里的第一条控制保额份数
+          if (Number(defalutValue) < Number(riskFactor.rules[0].minPrem) || Number(defalutValue) > Number(riskFactor.rules[0].maxPrem)) {
+            this.$toast('0周岁-55周岁最低基本保险金额为'+ (Number(riskFactor.rules[0].minPrem) * 10000) +'元。超过最低基本保险金额为'+ (Number(riskFactor.rules[0].limit) * 10000) +'元整数倍。')
+            this.nextStepFlag = true
+          } else {
+            if ((Number(defalutValue) * 10000) % (Number(currentEle.limit) * 10000) != 0) {
+              // this.defalutAmt = currentEle.rules[productIndex].displayAmount
+              this.$toast('0周岁-55周岁最低基本保险金额为'+ (Number(riskFactor.rules[0].minPrem) * 10000) +'元。超过最低基本保险金额为'+ (Number(riskFactor.rules[0].limit) * 10000) +'元整数倍。')
+              this.nextStepFlag = true
+            } else {
+              this.mainRiskInfluenceAddRisk()
+              currentEle['amt'] = Number(defalutValue) * Number(currentEle.moneyUnit)
+              this.getTrial()
+            }
+          }
+        }
+        //isTrial为0 ---暂时为富娃娃两全保险（万能型）专配 输入保费校验
+      }
+      else if (productCode == 'GFRS_M0040') {
+        // 惠企保保额限制
+        //被保险人年龄如果在41-60区间
+        if (this.saleInsuredPersonInfo.insuredAge >= 41) {
+          //使用rules规则里的第二条控制保额份数
+          if (Number(defalutValue) < Number(riskFactor.rules[1].minPrem) || Number(defalutValue) > Number(riskFactor.rules[1].maxPrem)) {
+            this.$toast('年龄在41周岁至60周岁被保险人，投保本险种时，最低基本保险金额为50000元。超过最低基本保险金额为10000元整数倍。')
+            this.nextStepFlag = true
+          } else {
+            if ((Number(defalutValue) * 10000) % (Number(currentEle.limit) * 10000) != 0) {
+              // this.defalutAmt = currentEle.rules[productIndex].displayAmount
+              this.$toast('年龄在41周岁至60周岁被保险人，投保本险种时，最低基本保险金额为50000元。超过最低基本保险金额为10000元整数倍。')
+              this.nextStepFlag = true
+            } else {
+              this.mainRiskInfluenceAddRisk()
+              currentEle['amt'] = Number(defalutValue) * Number(currentEle.moneyUnit)
+              this.getTrial()
+            }
+          }
+        } else if (this.saleInsuredPersonInfo.insuredAge >= 0 && this.saleInsuredPersonInfo.insuredAge <= 40) {
+          //使用rules规则里的第一条控制保额份数
+          if (Number(defalutValue) < Number(riskFactor.rules[0].minPrem) || Number(defalutValue) > Number(riskFactor.rules[0].maxPrem)) {
+            this.$toast('年龄在0-40周岁被保险人，投保本险种时，最低基本保险金额为100000元，超过最低基本保险金额为10000元整数倍。')
+            this.nextStepFlag = true
+          } else {
+            if ((Number(defalutValue) * 10000) % (Number(currentEle.limit) * 10000) != 0) {
+              // this.defalutAmt = currentEle.rules[productIndex].displayAmount
+              this.$toast('年龄在0-40周岁被保险人，投保本险种时，最低基本保险金额为100000元，超过最低基本保险金额为10000元整数倍。')
+              this.nextStepFlag = true
+            } else {
+              this.mainRiskInfluenceAddRisk()
+              currentEle['amt'] = Number(defalutValue) * Number(currentEle.moneyUnit)
+              this.getTrial()
+            }
+          }
+        }
+        //isTrial为0 ---暂时为富娃娃两全保险（万能型）专配 输入保费校验
+      }
+      else if (productCode == 'GFRS_M0046') {
+        //被保险人年龄如果在50-65区间
+        if(this.branchTypeVal == 'Z'){  //中介渠道规则
+          if (this.saleInsuredPersonInfo.insuredAge >= 51 && this.saleInsuredPersonInfo.insuredAge <= 60) {
+            //使用rules规则里的第二条控制保额份数
+            // 年龄在51周岁及以上被保险人，投保本险种时，最低基本保险金额为10000元。超过最低基本保险金额为10000元整数倍。
+            if (Number(defalutValue) < Number(riskFactor.rules[1].minPrem) || Number(defalutValue) > Number(riskFactor.rules[1].maxPrem)) {
+              this.$toast('51周岁-60周岁最低基本保险金额为'+ (Number(riskFactor.rules[1].minPrem) * 10000) +'元。超过最低基本保险金额为'+ (Number(riskFactor.rules[1].limit) * 10000) +'元整数倍。')
+              this.nextStepFlag = true
             } else {
               if ((Number(defalutValue) * 10000) % (Number(currentEle.limit) * 10000) != 0) {
                 // this.defalutAmt = currentEle.rules[productIndex].displayAmount
-                this.$toast(showHint)
+                this.$toast('51周岁-60周岁最低基本保险金额为'+ (Number(riskFactor.rules[1].minPrem) * 10000) +'元。超过最低基本保险金额为'+ (Number(riskFactor.rules[1].limit) * 10000) +'元整数倍。')
                 this.nextStepFlag = true
               } else {
                 this.mainRiskInfluenceAddRisk()
@@ -2430,16 +2579,15 @@ export default {
                 this.getTrial()
               }
             }
-            //被保险人年龄如果在66-75之间
-          } else if (this.saleInsuredPersonInfo.insuredAge >= 66 && this.saleInsuredPersonInfo.insuredAge <= 75) {
+            //年龄在0-50周岁被保险人，投保本险种时，最低基本保险金额为50000元，超过最低基本保险金额为10000元整数倍。
+          } else if (this.saleInsuredPersonInfo.insuredAge >= 0 && this.saleInsuredPersonInfo.insuredAge <= 50) {
             //使用rules规则里的第一条控制保额份数
             if (Number(defalutValue) < Number(riskFactor.rules[0].minPrem) || Number(defalutValue) > Number(riskFactor.rules[0].maxPrem)) {
-              this.$toast(showHint)
+              this.$toast('0周岁-50周岁最低基本保险金额为'+ (Number(riskFactor.rules[0].minPrem) * 10000) +'元。超过最低基本保险金额为'+ (Number(riskFactor.rules[0].limit) * 10000) +'元整数倍。')
               this.nextStepFlag = true
             } else {
               if ((Number(defalutValue) * 10000) % (Number(currentEle.limit) * 10000) != 0) {
-                // this.defalutAmt = currentEle.rules[productIndex].displayAmount
-                this.$toast(showHint)
+                this.$toast('0周岁-50周岁最低基本保险金额为'+ (Number(riskFactor.rules[0].minPrem) * 10000) +'元。超过最低基本保险金额为'+ (Number(riskFactor.rules[0].limit) * 10000) +'元整数倍。')
                 this.nextStepFlag = true
               } else {
                 this.mainRiskInfluenceAddRisk()
@@ -2448,17 +2596,11 @@ export default {
               }
             }
           }
-          //isTrial为0 ---暂时为富娃娃两全保险（万能型）专配 输入保费校验
-        } else if (productCode == 'GFRS_M0035' || productCode == 'GFRS_M0044'
-                || productCode == 'GFRS_M0056' || productCode == 'GFRS_M0057' || productCode == 'GFRS_M0060') {
-          console.log('defalutValue==', defalutValue)
-          console.log("currentEle['amt']==", currentEle['amt'])
-          console.log('riskFactor.rules', riskFactor.rules)
-          console.log('this.saleInsuredPersonInfo.insuredAge ', this.saleInsuredPersonInfo.insuredAge)
+        }else if(this.branchTypeVal == 'G' || this.branchTypeVal == 'T'|| this.branchTypeVal == 'Y' ){ //世纪无忧中介渠道规则（银销个,健销个投保规则同个险规则）
           //被保险人年龄如果在50-65区间
           if (this.saleInsuredPersonInfo.insuredAge >= 56 && this.saleInsuredPersonInfo.insuredAge <= 60) {
             //使用rules规则里的第二条控制保额份数
-            // 年龄在56周岁及以上被保险人，投保本险种时，最低基本保险金额为10000元。超过最低基本保险金额为10000元整数倍。
+            // 年龄在51周岁及以上被保险人，投保本险种时，最低基本保险金额为10000元。超过最低基本保险金额为10000元整数倍。
             if (Number(defalutValue) < Number(riskFactor.rules[1].minPrem) || Number(defalutValue) > Number(riskFactor.rules[1].maxPrem)) {
               this.$toast('56周岁-60周岁最低基本保险金额为'+ (Number(riskFactor.rules[1].minPrem) * 10000) +'元。超过最低基本保险金额为'+ (Number(riskFactor.rules[1].limit) * 10000) +'元整数倍。')
               this.nextStepFlag = true
@@ -2473,7 +2615,7 @@ export default {
                 this.getTrial()
               }
             }
-            //年龄在0-55周岁被保险人，投保本险种时，最低基本保险金额为50000元，超过最低基本保险金额为10000元整数倍。
+            //年龄在0-50周岁被保险人，投保本险种时，最低基本保险金额为50000元，超过最低基本保险金额为10000元整数倍。
           } else if (this.saleInsuredPersonInfo.insuredAge >= 0 && this.saleInsuredPersonInfo.insuredAge <= 55) {
             //使用rules规则里的第一条控制保额份数
             if (Number(defalutValue) < Number(riskFactor.rules[0].minPrem) || Number(defalutValue) > Number(riskFactor.rules[0].maxPrem)) {
@@ -2481,7 +2623,6 @@ export default {
               this.nextStepFlag = true
             } else {
               if ((Number(defalutValue) * 10000) % (Number(currentEle.limit) * 10000) != 0) {
-                // this.defalutAmt = currentEle.rules[productIndex].displayAmount
                 this.$toast('0周岁-55周岁最低基本保险金额为'+ (Number(riskFactor.rules[0].minPrem) * 10000) +'元。超过最低基本保险金额为'+ (Number(riskFactor.rules[0].limit) * 10000) +'元整数倍。')
                 this.nextStepFlag = true
               } else {
@@ -2491,190 +2632,83 @@ export default {
               }
             }
           }
-          //isTrial为0 ---暂时为富娃娃两全保险（万能型）专配 输入保费校验
-        } else if (productCode == 'GFRS_M0040') {
-          // 惠企保保额限制
-          //被保险人年龄如果在41-60区间
-          if (this.saleInsuredPersonInfo.insuredAge >= 41) {
-            //使用rules规则里的第二条控制保额份数
-            if (Number(defalutValue) < Number(riskFactor.rules[1].minPrem) || Number(defalutValue) > Number(riskFactor.rules[1].maxPrem)) {
-              this.$toast('年龄在41周岁至60周岁被保险人，投保本险种时，最低基本保险金额为50000元。超过最低基本保险金额为10000元整数倍。')
-              this.nextStepFlag = true
-            } else {
-              if ((Number(defalutValue) * 10000) % (Number(currentEle.limit) * 10000) != 0) {
-                // this.defalutAmt = currentEle.rules[productIndex].displayAmount
-                this.$toast('年龄在41周岁至60周岁被保险人，投保本险种时，最低基本保险金额为50000元。超过最低基本保险金额为10000元整数倍。')
-                this.nextStepFlag = true
-              } else {
-                this.mainRiskInfluenceAddRisk()
-                currentEle['amt'] = Number(defalutValue) * Number(currentEle.moneyUnit)
-                this.getTrial()
-              }
-            }
-          } else if (this.saleInsuredPersonInfo.insuredAge >= 0 && this.saleInsuredPersonInfo.insuredAge <= 40) {
-            //使用rules规则里的第一条控制保额份数
-            if (Number(defalutValue) < Number(riskFactor.rules[0].minPrem) || Number(defalutValue) > Number(riskFactor.rules[0].maxPrem)) {
-              this.$toast('年龄在0-40周岁被保险人，投保本险种时，最低基本保险金额为100000元，超过最低基本保险金额为10000元整数倍。')
-              this.nextStepFlag = true
-            } else {
-              if ((Number(defalutValue) * 10000) % (Number(currentEle.limit) * 10000) != 0) {
-                // this.defalutAmt = currentEle.rules[productIndex].displayAmount
-                this.$toast('年龄在0-40周岁被保险人，投保本险种时，最低基本保险金额为100000元，超过最低基本保险金额为10000元整数倍。')
-                this.nextStepFlag = true
-              } else {
-                this.mainRiskInfluenceAddRisk()
-                currentEle['amt'] = Number(defalutValue) * Number(currentEle.moneyUnit)
-                this.getTrial()
-              }
-            }
+        }
+        // 国富人寿富桂金生养老年金保险（GFRS_M0053）中介渠道鑫享金生养老年金保险（GFRS_M0061）
+      }
+      else if (productCode == 'GFRS_M0053' || productCode == 'GFRS_M0061') {
+        if (Number(defalutValue) < Number(min)) {
+          if (riskFactor.yearWay == "一次性交清") {
+            this.$toast(`交费期间为${riskFactor.yearWay}时，最低保费为${Number(min) * Number(riskFactor.moneyUnit)}元`)
+          } else {
+            this.$toast(`交费期间为${riskFactor.yearWay}年交时，最低保费为${Number(min) * Number(riskFactor.moneyUnit)}元`)
           }
-          //isTrial为0 ---暂时为富娃娃两全保险（万能型）专配 输入保费校验
-        } else if (productCode == 'GFRS_M0046') {
-          //被保险人年龄如果在50-65区间
-          if(this.branchTypeVal == 'Z'){  //中介渠道规则
-            if (this.saleInsuredPersonInfo.insuredAge >= 51 && this.saleInsuredPersonInfo.insuredAge <= 60) {
-              //使用rules规则里的第二条控制保额份数
-              // 年龄在51周岁及以上被保险人，投保本险种时，最低基本保险金额为10000元。超过最低基本保险金额为10000元整数倍。
-              if (Number(defalutValue) < Number(riskFactor.rules[1].minPrem) || Number(defalutValue) > Number(riskFactor.rules[1].maxPrem)) {
-                this.$toast('51周岁-60周岁最低基本保险金额为'+ (Number(riskFactor.rules[1].minPrem) * 10000) +'元。超过最低基本保险金额为'+ (Number(riskFactor.rules[1].limit) * 10000) +'元整数倍。')
-                this.nextStepFlag = true
-              } else {
-                if ((Number(defalutValue) * 10000) % (Number(currentEle.limit) * 10000) != 0) {
-                  // this.defalutAmt = currentEle.rules[productIndex].displayAmount
-                  this.$toast('51周岁-60周岁最低基本保险金额为'+ (Number(riskFactor.rules[1].minPrem) * 10000) +'元。超过最低基本保险金额为'+ (Number(riskFactor.rules[1].limit) * 10000) +'元整数倍。')
-                  this.nextStepFlag = true
-                } else {
-                  this.mainRiskInfluenceAddRisk()
-                  currentEle['amt'] = Number(defalutValue) * Number(currentEle.moneyUnit)
-                  this.getTrial()
-                }
-              }
-              //年龄在0-50周岁被保险人，投保本险种时，最低基本保险金额为50000元，超过最低基本保险金额为10000元整数倍。
-            } else if (this.saleInsuredPersonInfo.insuredAge >= 0 && this.saleInsuredPersonInfo.insuredAge <= 50) {
-              //使用rules规则里的第一条控制保额份数
-              if (Number(defalutValue) < Number(riskFactor.rules[0].minPrem) || Number(defalutValue) > Number(riskFactor.rules[0].maxPrem)) {
-                this.$toast('0周岁-50周岁最低基本保险金额为'+ (Number(riskFactor.rules[0].minPrem) * 10000) +'元。超过最低基本保险金额为'+ (Number(riskFactor.rules[0].limit) * 10000) +'元整数倍。')
-                this.nextStepFlag = true
-              } else {
-                if ((Number(defalutValue) * 10000) % (Number(currentEle.limit) * 10000) != 0) {
-                  this.$toast('0周岁-50周岁最低基本保险金额为'+ (Number(riskFactor.rules[0].minPrem) * 10000) +'元。超过最低基本保险金额为'+ (Number(riskFactor.rules[0].limit) * 10000) +'元整数倍。')
-                  this.nextStepFlag = true
-                } else {
-                  this.mainRiskInfluenceAddRisk()
-                  currentEle['amt'] = Number(defalutValue) * Number(currentEle.moneyUnit)
-                  this.getTrial()
-                }
-              }
-            }
-          }else if(this.branchTypeVal == 'G' || this.branchTypeVal == 'T'|| this.branchTypeVal == 'Y' ){ //世纪无忧中介渠道规则（银销个,健销个投保规则同个险规则）
-            //被保险人年龄如果在50-65区间
-            if (this.saleInsuredPersonInfo.insuredAge >= 56 && this.saleInsuredPersonInfo.insuredAge <= 60) {
-              //使用rules规则里的第二条控制保额份数
-              // 年龄在51周岁及以上被保险人，投保本险种时，最低基本保险金额为10000元。超过最低基本保险金额为10000元整数倍。
-              if (Number(defalutValue) < Number(riskFactor.rules[1].minPrem) || Number(defalutValue) > Number(riskFactor.rules[1].maxPrem)) {
-                this.$toast('56周岁-60周岁最低基本保险金额为'+ (Number(riskFactor.rules[1].minPrem) * 10000) +'元。超过最低基本保险金额为'+ (Number(riskFactor.rules[1].limit) * 10000) +'元整数倍。')
-                this.nextStepFlag = true
-              } else {
-                if ((Number(defalutValue) * 10000) % (Number(currentEle.limit) * 10000) != 0) {
-                  // this.defalutAmt = currentEle.rules[productIndex].displayAmount
-                  this.$toast('56周岁-60周岁最低基本保险金额为'+ (Number(riskFactor.rules[1].minPrem) * 10000) +'元。超过最低基本保险金额为'+ (Number(riskFactor.rules[1].limit) * 10000) +'元整数倍。')
-                  this.nextStepFlag = true
-                } else {
-                  this.mainRiskInfluenceAddRisk()
-                  currentEle['amt'] = Number(defalutValue) * Number(currentEle.moneyUnit)
-                  this.getTrial()
-                }
-              }
-              //年龄在0-50周岁被保险人，投保本险种时，最低基本保险金额为50000元，超过最低基本保险金额为10000元整数倍。
-            } else if (this.saleInsuredPersonInfo.insuredAge >= 0 && this.saleInsuredPersonInfo.insuredAge <= 55) {
-              //使用rules规则里的第一条控制保额份数
-              if (Number(defalutValue) < Number(riskFactor.rules[0].minPrem) || Number(defalutValue) > Number(riskFactor.rules[0].maxPrem)) {
-                this.$toast('0周岁-55周岁最低基本保险金额为'+ (Number(riskFactor.rules[0].minPrem) * 10000) +'元。超过最低基本保险金额为'+ (Number(riskFactor.rules[0].limit) * 10000) +'元整数倍。')
-                this.nextStepFlag = true
-              } else {
-                if ((Number(defalutValue) * 10000) % (Number(currentEle.limit) * 10000) != 0) {
-                  this.$toast('0周岁-55周岁最低基本保险金额为'+ (Number(riskFactor.rules[0].minPrem) * 10000) +'元。超过最低基本保险金额为'+ (Number(riskFactor.rules[0].limit) * 10000) +'元整数倍。')
-                  this.nextStepFlag = true
-                } else {
-                  this.mainRiskInfluenceAddRisk()
-                  currentEle['amt'] = Number(defalutValue) * Number(currentEle.moneyUnit)
-                  this.getTrial()
-                }
-              }
-            }
+          this.nextStepFlag = true
+        }else{
+          this.nextStepFlag = false
+          this.mainRiskInfluenceAddRisk()
+          currentEle['amt'] = Number(defalutValue) * Number(riskFactor.moneyUnit)
+          this.getTrial()
+        }
+      }
+      else if (this.isTrial === '0' && this.chooseProducts[productIndex].isMainRisk == '0') {
+        if (Number(defalutValue) < Number(min)) {
+          if (riskFactor.yearWay == "一次性交清") {
+            this.$toast(`交费期间为${riskFactor.yearWay}时，最低保费为${Number(min) * Number(riskFactor.moneyUnit)}元`)
+          } else {
+            this.$toast(`交费期间为${riskFactor.yearWay}年交时，最低保费为${Number(min) * Number(riskFactor.moneyUnit)}元`)
           }
-          // 国富人寿富桂金生养老年金保险（GFRS_M0053）中介渠道鑫享金生养老年金保险（GFRS_M0061）
-        } else if (productCode == 'GFRS_M0053' || productCode == 'GFRS_M0061') {
-          if (Number(defalutValue) < Number(min)) {
-            if (riskFactor.yearWay == "一次性交清") {
-              this.$toast(`交费期间为${riskFactor.yearWay}时，最低保费为${Number(min) * Number(riskFactor.moneyUnit)}元`)
-            } else {
-              this.$toast(`交费期间为${riskFactor.yearWay}年交时，最低保费为${Number(min) * Number(riskFactor.moneyUnit)}元`)
-            }
+          this.nextStepFlag = true
+        } else {
+          if ((Number(defalutValue) * 10000) % (Number(currentEle.limit) * 10000) != 0) {
+            // this.defalutAmt = currentEle.rules[productIndex].displayAmount
+            this.$toast(`超过最低保费部分金额需为1000元整数倍`)
             this.nextStepFlag = true
-          }else{
+          } else {
             this.nextStepFlag = false
             this.mainRiskInfluenceAddRisk()
             currentEle['amt'] = Number(defalutValue) * Number(riskFactor.moneyUnit)
             this.getTrial()
           }
-        } else if (this.isTrial === '0' && this.chooseProducts[productIndex].isMainRisk == '0') {
-          if (Number(defalutValue) < Number(min)) {
-            if (riskFactor.yearWay == "一次性交清") {
-              this.$toast(`交费期间为${riskFactor.yearWay}时，最低保费为${Number(min) * Number(riskFactor.moneyUnit)}元`)
-            } else {
-              this.$toast(`交费期间为${riskFactor.yearWay}年交时，最低保费为${Number(min) * Number(riskFactor.moneyUnit)}元`)
-            }
-            this.nextStepFlag = true
-          } else {
-            if ((Number(defalutValue) * 10000) % (Number(currentEle.limit) * 10000) != 0) {
-              // this.defalutAmt = currentEle.rules[productIndex].displayAmount
-              this.$toast(`超过最低保费部分金额需为1000元整数倍`)
-              this.nextStepFlag = true
-            } else {
-              this.nextStepFlag = false
-              this.mainRiskInfluenceAddRisk()
-              currentEle['amt'] = Number(defalutValue) * Number(riskFactor.moneyUnit)
-              this.getTrial()
-            }
-          }
-          //其他产品按照原先的逻辑判断
-        } else if (this.isTrial === '0' && this.chooseProducts[productIndex].isMainRisk == '1') {
-          if (Number(defalutValue) < Number(min) || Number(defalutValue) > Number(max)) {
+        }
+        //其他产品按照原先的逻辑判断
+      }
+      else if (this.isTrial === '0' && this.chooseProducts[productIndex].isMainRisk == '1') {
+        if (Number(defalutValue) < Number(min) || Number(defalutValue) > Number(max)) {
+          this.$toast('投保本险种最低基本保险金额为10000元，超过最低基本保险金额为1000元整数倍')
+          this.nextStepFlag = true
+        } else {
+          if ((Number(defalutValue) * 10000) % (Number(currentEle.limit) * 10000) != 0) {
+            // defalutValue = currentEle.rules[productIndex].displayAmount
             this.$toast('投保本险种最低基本保险金额为10000元，超过最低基本保险金额为1000元整数倍')
             this.nextStepFlag = true
           } else {
-            if ((Number(defalutValue) * 10000) % (Number(currentEle.limit) * 10000) != 0) {
-              // defalutValue = currentEle.rules[productIndex].displayAmount
-              this.$toast('投保本险种最低基本保险金额为10000元，超过最低基本保险金额为1000元整数倍')
-              this.nextStepFlag = true
-            } else {
-              this.mainRiskInfluenceAddRisk()
-              currentEle['amt'] = Number(defalutValue) * Number(currentEle.moneyUnit)
-              this.getTrial()
-            }
+            this.mainRiskInfluenceAddRisk()
+            currentEle['amt'] = Number(defalutValue) * Number(currentEle.moneyUnit)
+            this.getTrial()
           }
+        }
+      }
+      else {
+        if (Number(defalutValue) < Number(min) || Number(defalutValue) > Number(max)) {
+          this.$toast(showHint)
+          this.nextStepFlag = true
         } else {
-          if (Number(defalutValue) < Number(min) || Number(defalutValue) > Number(max)) {
+          if ((Number(defalutValue) * 10000) % (Number(currentEle.limit) * 10000) != 0) {
+            // defalutValue = currentEle.rules[productIndex].displayAmount
             this.$toast(showHint)
             this.nextStepFlag = true
           } else {
-            if ((Number(defalutValue) * 10000) % (Number(currentEle.limit) * 10000) != 0) {
-              // defalutValue = currentEle.rules[productIndex].displayAmount
-              this.$toast(showHint)
-              this.nextStepFlag = true
-            } else {
-              this.mainRiskInfluenceAddRisk()
-              currentEle['amt'] = Number(defalutValue) * Number(currentEle.moneyUnit)
-              this.getTrial()
-            }
+            this.mainRiskInfluenceAddRisk()
+            currentEle['amt'] = Number(defalutValue) * Number(currentEle.moneyUnit)
+            this.getTrial()
           }
         }
-        // let currentEle = this.chooseProducts[this.productIndex].calFactorLst[this.calFactorIndex]
-        // defalutValue = value
-        console.log('进来几次')
-        this.mult = Math.ceil(Number(defalutValue) / Number(riskFactor.defaultValue))
-      },
+      }
+      // let currentEle = this.chooseProducts[this.productIndex].calFactorLst[this.calFactorIndex]
+      // defalutValue = value
+      console.log('进来几次')
+      this.mult = Math.ceil(Number(defalutValue) / Number(riskFactor.defaultValue))
+    },
     //下一步
     async nextStep(isFrom) {
       //GFRS_M0016需要验证责任
@@ -2845,7 +2879,7 @@ export default {
       //建议书需要添加全部投保人信息，电投只需要投保人ID
       let insuredDTOItem = Object.assign(this.saleInsuredPersonInfo, { riskDTOLst: riskDTOLst })
       if (!insuredDTOItem.insuredAge) {
-        insuredDTOItem.insuredAge = insuredDTOItem.age
+        insuredDTOItem.insuredAge = insuredDTOItem.birthday ? utilsAge.getAge(insuredDTOItem.birthday, new Date()) : insuredDTOItem.age
       }
       let orderNo = localStorage.isFrom == 'proposal'?this.$route.query.proposalOrderNo:this.$route.query.orderNo
       let params = {
@@ -2956,7 +2990,7 @@ export default {
           }
         })
         let data = {
-          serialNo:this.$CacheUtils.getLocItem('proposalNo'),
+          serialNo:this.$route.query.proposalOrderNo,
           mainRiskId:insuanceId+'',
           trialJsonStr:localStorage.chooseProducts
         }

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_M0002')" />
+                <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_M0035')" />
+                <img src="../../../assets/images/home_cp_2.png" style="width: 100%;" @click="goDetail('GFRSPRO_M0072')" />
               </div>
             </template>
             <template v-else-if="branchType == '6'">
@@ -122,10 +122,10 @@
         <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_M0002')" />
+              <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_M0046')" />
+              <img src="../../../assets/images/home_cp_2.png" style="width: 100%;" @click="goDetail('GFRSPRO_M0072')" />
             </div>
           </div>
         </div>

src/views/ebiz/proposal/InsuredPerson.vue

@@ -326,11 +326,11 @@ export default {
     //点击下一步
     nextStep() {
       // 建议书投保人/被保人姓名不必填, 填写姓名时展示姓名(落库),不填写姓名时展示性别+年龄,如:男30岁(不落库)
-      let sex = this.insured.sex == '0'?'男':'女'
-      let name = sex + this.insured.insuredAge+'岁'
-      if(this.insured.name == name){
-        this.insured.name = ''
-      }
+      // let sex = this.insured.sex == '0'?'男':'女'
+      // let name = sex + this.insured.insuredAge+'岁'
+      // if(this.insured.name == name){
+      //   this.insured.name = ''
+      // }
       //保存有没有社保，在保费计算用到
       //localStorage.setItem('proposalMedical', this.insured.medical == '0' ? '1' : '0')
       localStorage.proposalMedical = this.insured.medical == '0' ? '1' : '0'

src/views/ebiz/proposal/PDF.vue

@@ -4,11 +4,12 @@
   </div>
 </template>
 <script>
-import { makePdf, share } from '@/api/ebiz/proposal/proposal.js'
+import { makePdf, share, getDemo } from '@/api/ebiz/proposal/proposal.js'
 import { Toast } from 'vant'
 import config from '@/config'
 import dataDictionary from '@/assets/js/utils/data-dictionary' //使用数据字典中的险种类型
 import { weixinShare } from '@/assets/js/utils/wxShare.js'
+import { getAgentInfo } from '@/api/ebiz/my/my.js'
 import { queryPersonal } from '@/api/ebiz/laurelClub/laurelClub'
 export default {
   data() {
@@ -16,7 +17,8 @@ export default {
     return {
       pdfUrl: '',
       isWeixin,
-      title: ''
+      title: '',
+      agent:{}
     }
   },
   components: {
@@ -31,7 +33,7 @@ export default {
       this.init()
     }
   },
-  mounted() {
+  async mounted() {
     let riskCode = localStorage.pdfShareCode
     dataDictionary.riskType.some(item => {
       if (item.code == riskCode) {
@@ -39,10 +41,78 @@ export default {
         return true
       }
     })
+    if(this.$route.query.proposalOrderNo){
+      let params = {
+        proposalInfoDTO: {
+          proposalNo: this.$route.query.proposalOrderNo
+        }
+      }
+      let res = await getDemo(params)
+      if(res.result == 0){
+        let mainRiskNameList = []
+        res.content.orderDTO.insuredDTOs.forEach(item => {
+          item.riskDTOLst.forEach(item01 => {
+            if (item01.isMainRisk == '0') {
+              mainRiskNameList.push(item01.riskName)
+            }
+          })
+        })
+        // 一、单个被保险人
+        // 1、1个主险（含附加险）的情况，直接显示“主险产品名称”
+        // 2、有2个及以上主险组合，建议书名称显示“保险产品组合计划”
+        // 二、有多个被保险人
+        // 都显示“家庭保障计划”
+        if(mainRiskNameList.length == 1){
+          if (res.content.orderDTO.insuredDTOs.length > 1) {
+            this.title = '家庭保障计划'
+          } else {
+            this.title = mainRiskNameList[0]
+          }
+        }else{
+          if (res.content.orderDTO.insuredDTOs.length > 1) {
+            this.title = '家庭保障计划'
+          } else {
+            this.title = '保险产品组合计划'
+          }
+        }
+      }
+    }
+    let agentResult = await getAgentInfo({}) //调取代理人查询接口
+    if (agentResult.result == '0'){
+      let { agent } = this
+      let { name } = agentResult
+      agent.name = name
+    }
+    let date = new Date()
+    let month = date.getMonth() + 1
+    if (month <= 9) {
+      month = '0' + month
+    }
+    let reqData = {
+      mdType: 'm',
+      monthStr:date.getFullYear() + month
+    }
+    let shareContent;
+    let resData = await queryPersonal(reqData)
+    if (resData.content.length&&resData.content[0].glevel>0&&resData.content[0].ggrade) {
+      if(resData.content[0].glevel<3){
+        resData.content[0].ggrade='00'
+      }
+    }
+    if (resData.content.length&&resData.content[0].slevel>0&&resData.content[0].sgrade&&resData.content[0].sgrade!='00') {
+      let sgrade =this.memberConversion(resData.content[0].sgrade);
+      shareContent='国富双冠精英'+resData.content[0].slevel+'级'+sgrade+resData.content[0].name+'为您量身定制的保险产品，请查收';
+    }else if (resData.content.length&&resData.content[0].glevel>0&&resData.content[0].ggrade&&resData.content[0].ggrade!='00') {
+      let ggrade =this.memberConversion(resData.content[0].ggrade);
+      shareContent='国富桂冠精英'+resData.content[0].glevel+'级'+ggrade+resData.content[0].name+'为您量身定制的保险产品，请查收';
+    } else {
+      shareContent = this.agent.name+'为您设计的专属保险计划书，请查阅！因为国富，所以民安！';
+    }
+
     weixinShare({
       title: this.title,
       imgUrl: this.$assetsUrl + 'images/logo.png',
-      desc: '国富为您量身定制的保险产品，请查收'
+      desc: shareContent
     })
     //重置左上角按钮，变成返回
     window.EWebBridge.webCallAppInJs("webview_left_button",{
@@ -109,10 +179,15 @@ export default {
         if(resData.content[0].glevel<3){
           resData.content[0].ggrade='00'
         }
+      }
+      if (resData.content.length&&resData.content[0].slevel>0&&resData.content[0].sgrade&&resData.content[0].sgrade!='00') {
+        let sgrade =this.memberConversion(resData.content[0].sgrade);
+        shareContent='国富双冠精英'+resData.content[0].slevel+'级'+sgrade+resData.content[0].name+'为您量身定制的保险产品，请查收';
+      }else if (resData.content.length&&resData.content[0].glevel>0&&resData.content[0].ggrade&&resData.content[0].ggrade!='00') {
         let ggrade =this.memberConversion(resData.content[0].ggrade);
-        shareContent='国富桂冠人力'+resData.content[0].glevel+'级'+ggrade+resData.content[0].name+'为您量身定制的保险产品，请查收';
+        shareContent='国富桂冠精英'+resData.content[0].glevel+'级'+ggrade+resData.content[0].name+'为您量身定制的保险产品，请查收';
       } else {
-        shareContent='国富为您量身定制的保险产品，请查收';
+        shareContent = this.agent.name+'为您设计的专属保险计划书，请查阅！因为国富，所以民安！';
       }
       if (data.trigger == 'right_button_click') {
         // eslint-disable-next-line no-undef

src/views/ebiz/proposal/ProposalInfo.vue

@@ -4,7 +4,7 @@
       <div>
         <div class="mb50">
           <img class="w178 h41 div_1" src="@/assets/images/proposal/proposal_logo.png" />
-          <div class="white fw500 fs18 div_2">家庭保障计划</div>
+          <div class="white fw500 fs18 div_2">{{mainRiskName}}</div>
           <van-sticky @scroll="testSticky">
             <div class="pl15 pt15 flex justify-content-fs align-items-c sticky_div" :class="pageShowType.isFixed ? 'divbg_1' : 'divbg_2'">
               <div class="mr9 title_item" v-for="(item, index) in pageShowInfo.insuredDTOs" :key="index" @click="checkInsure(item.insuredId)">
@@ -199,7 +199,11 @@
                   <div class="text-left" style="width: 75%;">
                     <span>{{ moneyItem.contentLabel }}</span>
                   </div>
-                  <div class="text-right">
+                  <div class="text-right" v-if="moneyItem.content == 'currentBonus_M'">
+                    <span class="color_3A81F6">{{ moneyItem.value | numFormat2 }}</span
+                    >{{ moneyItem.content | productRateUnit }}
+                  </div>
+                  <div class="text-right" v-else>
                     <span class="color_3A81F6">{{ moneyItem.value | numFormatNo }}</span
                     >{{ moneyItem.content | productRateUnit }}
                   </div>
@@ -279,7 +283,7 @@
       </div>
       <div class="div_02">
         <div class="text-center div_021">
-          <div class="text-center div_022">家庭保障计划</div>
+          <div class="text-center div_022">{{mainRiskName}}</div>
           <!-- 如果没有姓名的话，根据性别展示男士或女士 -->
           <div class="text-center div_023">尊敬的<span v-if="pageShowInfo.appntDTO.name">{{ pageShowInfo.appntDTO.name.substr(0, 1) }}</span>{{ pageShowInfo.appntDTO.sex == '0' ? '先生' : '女士' }}</div>
         </div>
@@ -382,6 +386,7 @@ export default {
       mainRiskCodes: [],
       time: 5,
       proposalNo:'',
+      mainRiskName: ''
     }
   },
   filters: {
@@ -395,6 +400,13 @@ export default {
     numFormat(str) {
       return str.replace(/\.00/, '')
     },
+    numFormat2(str) {
+      if (str) {
+        return Number(str.replace(/,/g, '')).toFixed(2)
+      } else {
+        return '-'
+      }
+    },
     numFormatNo(str) {
       if (str) {
         return Number(str.replace(/,/g, '')).toFixed(0)
@@ -437,6 +449,7 @@ export default {
       })
     }, 1000)
     window['appCallBack'] = this.appCallBack*/
+    // init方法在微信端存储token，接口请求用此token，所以init方法前不要请求接口，会影响分享微信功能，接口会报token为空
     this.init()
     //校验当前用户权限
     funcPermCheck({}).then(res => {
@@ -596,7 +609,7 @@ export default {
       }
     },
     async sharePeople() {
-      console.log(this.agent,'this.agent.name')
+      console.log(this.pageShowInfo.insuredDTOs,'this.pageShowInfo.insuredDTOs')
       let date = new Date()
       let month = date.getMonth() + 1
       if (month <= 9) {
@@ -608,25 +621,34 @@ export default {
       }
       let shareContent;
       let resData = await queryPersonal(reqData)
+      // debugger
+      //准会员话术改为普通人话术
+      if(resData.content.length&&resData.content[0].slevel<3){
+        resData.content[0].sgrade='00'
+      }
+      if(resData.content.length&&resData.content[0].glevel<3){
+        resData.content[0].ggrade='00'
+      }
       if (resData.content.length&&resData.content[0].slevel>0&&resData.content[0].sgrade&&resData.content[0].sgrade!='00') {
-        if(resData.content[0].slevel<3){
-          resData.content[0].sgrade='00'
-        }
+        // if(resData.content[0].slevel<3){
+        //   resData.content[0].sgrade='00'
+        // }
         let sgrade =this.memberConversion(resData.content[0].sgrade);
         shareContent='国富双冠精英'+resData.content[0].slevel+'级'+sgrade+resData.content[0].name+'为您量身定制的保险产品，请查收';
-      }else if (resData.content.length&&resData.content[0].glevel>0&&resData.content[0].ggrade&&!resData.content[0].sgrade&&resData.content[0].sgrade!='00') {
-        if(resData.content[0].glevel<3){
-          resData.content[0].ggrade='00'
-        }
+      }else if (resData.content.length&&resData.content[0].glevel>0&&resData.content[0].ggrade&&resData.content[0].ggrade!='00') {
+        // if(resData.content[0].glevel<3){
+        //   resData.content[0].ggrade='00'
+        // }
         let ggrade =this.memberConversion(resData.content[0].ggrade);
         shareContent='国富桂冠精英'+resData.content[0].glevel+'级'+ggrade+resData.content[0].name+'为您量身定制的保险产品，请查收';
       } else {
-        shareContent = this.agent.name+'为您设计的专属保险计划书，请查阅！因为国富，所以民安！';
+        shareContent = this.agent.name+'为您设计的专属保险计划书，请查阅！因为国富，所以民安！'; 
       }
+      console.log(shareContent,'shareContent')
       let title
       let riskList = [] //所有险种
       let riskCodeList = [] //所有险种code
-      this.pageShowInfo.insuredDTOs.map(item => { 
+      this.pageShowInfo.insuredDTOs.map(item => {
         item.mainRisk.map(item01 => {
           if (item01.isMainRisk == '0') { //主险
             riskList.push(item01)
@@ -637,11 +659,23 @@ export default {
         riskCodeList.push(item.riskCode)
       })
       let sameRisk = isAllEqual(riskCodeList)
-      // 以主险为单位，一个主险，显示主险名称。 多个主险，显示“家庭综合保障计划”，跟被保人人数无关
+      // 一、单个被保险人
+      // 1、1个主险（含附加险）的情况，直接显示“主险产品名称”
+      // 2、有2个及以上主险组合，建议书名称显示“保险产品组合计划”
+      // 二、有多个被保险人
+      // 都显示“家庭保障计划”
       if(sameRisk){
-        title= riskList[0].riskName
+        if(this.pageShowInfo.insuredDTOs.length > 1){
+          title='家庭保障计划'
+        }else{
+          title= riskList[0].riskName
+        }
       }else{
-        title='家庭综合保障计划'
+        if(this.pageShowInfo.insuredDTOs.length > 1){
+          title='家庭保障计划'
+        }else{
+          title= '保险产品组合计划'
+        }
       }
       let res = await getSharingToken({ shareType: 'proposal_demonstrate' })
       if (res.result == '0') {
@@ -691,6 +725,32 @@ export default {
         this.pageShowInfo.appntDTO = res.content.orderDTO.appntDTO
         this.pageShowInfo.insuredDTOs = res.content.orderDTO.insuredDTOs
         this.pageShowInfo.showInsuredDTO = this.pageShowInfo.insuredDTOs[0]
+        let mainRiskNameList = []
+        that.pageShowInfo.insuredDTOs.forEach(item => {
+          item.riskDTOLst.forEach(item01 => {
+            if (item01.isMainRisk == '0') {
+              mainRiskNameList.push(item01.riskName)
+            }
+          })
+        })
+        // 一、单个被保险人
+        // 1、1个主险（含附加险）的情况，直接显示“主险产品名称”
+        // 2、有2个及以上主险组合，建议书名称显示“保险产品组合计划”
+        // 二、有多个被保险人
+        // 都显示“家庭保障计划”
+        if(mainRiskNameList.length == 1){
+          if (this.pageShowInfo.insuredDTOs.length > 1) {
+            that.mainRiskName = '家庭保障计划'
+          } else {
+            that.mainRiskName = mainRiskNameList[0]
+          }
+        }else{
+          if (this.pageShowInfo.insuredDTOs.length > 1) {
+            that.mainRiskName = '家庭保障计划'
+          } else {
+            that.mainRiskName = '保险产品组合计划'
+          }
+        }
         //投保人年龄
         // this.pageShowInfo.appntDTO.age = getAge.getAge(this.pageShowInfo.appntDTO.birthdayLabel, new Date())
         let { insuredLabelResult, insuredResult, insuredInfoResult } = res.content.calculusResDTO
@@ -880,7 +940,17 @@ export default {
     },
     //跳转到pdf 进入建议书后 根据建议书编码来查找相应的pdf
     async goPDF() {
-      this.$router.push({ path: '/proposal/pdf' })
+      if(this.$route.query.proposalOrderNo){
+        this.$router.push({
+          path: '/proposal/pdf',
+          query: {
+            proposalOrderNo:this.$route.query.proposalOrderNo
+          }
+        })
+      }else{
+        this.$router.push({ path: '/proposal/pdf' })
+      }
+
       // this.$jump({
       //   flag: 'h5',
       //   extra: {

src/views/ebiz/sale/AddBeneficiaryInfo.vue

@@ -241,6 +241,7 @@ import FieldDatePicter from '@/components/ebiz/FieldDatePicter'
 import OccupationPicker from '@/components/ebiz/occipation/OccupationPicker'
 import DataDictionary from '@/assets/js/utils/data-dictionary'
 import areaList from '@/assets/js/utils/areaForSale'
+import countCredentialValidity from '@/assets/js/utils/countCredentialValidity'
 import filter from '@/filters/index'
 import utilsAge from '@/assets/js/utils/age'
 import IdentityCardScan from '@/components/ebiz/sale/IdentityCardScan'
@@ -640,6 +641,9 @@ export default {
             if (this.userInfo.idType == '1') {
               let age = utilsAge.getAge(this.userInfo.birthday, new Date())
               this.effectiveDateTypeAble = age <= 45
+              if(this.userInfo.birthday){
+                this.userInfo.certiexpiredate = countCredentialValidity.getEndDate(age,val)
+              }
             }
           }
           break
@@ -664,63 +668,9 @@ export default {
             if (this.userInfo.idType == '1') {
               //获取年龄
               let age = utilsAge.getAge(this.userInfo.birthday, new Date())
-              console.log(age)
-              //年龄在16周岁以下
-              if (age < 16) {
-                if (new Date(val).getFullYear() - new Date(this.userInfo.certificateValidate).getFullYear() != 5) {
-                  this.userInfo.certiexpiredate = ''
-                  this.$refs.certiexpiredate.date = ''
-                  return this.$toast('16周岁以下的证件有效期为5年')
-                }
-              //年龄在16-21周岁之间
-              }else if (age >= 16 && age <= 21) {
-                if (new Date(val).getFullYear() - new Date(this.userInfo.certificateValidate).getFullYear() != 10 && new Date(val).getFullYear() - new Date(this.userInfo.certificateValidate).getFullYear() != 5) {
-                  this.userInfo.certiexpiredate = ''
-                  this.$refs.certiexpiredate.date = ''
-                  return this.$toast('16周岁~21周岁的证件有效期为10年或5年')
-                }
-              //年龄在22-25周岁之间
-              }else if (age >= 22 && age <= 25) {
-                if (new Date(val).getFullYear() - new Date(this.userInfo.certificateValidate).getFullYear() != 10) {
-                  this.userInfo.certiexpiredate = ''
-                  this.$refs.certiexpiredate.date = ''
-                  return this.$toast('22周岁~25周岁的证件有效期为10年')
-                }
-              //年龄在26-35周岁之间
-              }else if (age >= 26 && age <= 35) {
-                if (new Date(val).getFullYear() - new Date(this.userInfo.certificateValidate).getFullYear() != 20 && new Date(val).getFullYear() - new Date(this.userInfo.certificateValidate).getFullYear() != 10) {
-                  this.userInfo.certiexpiredate = ''
-                  this.$refs.certiexpiredate.date = ''
-                  return this.$toast('26周岁~35周岁的证件有效期为20年或10年')
-                }
-                //年龄在36-45周岁之间
-              } else if (age >= 36 && age <= 45) {
-                if (new Date(val).getFullYear() - new Date(this.userInfo.certificateValidate).getFullYear() != 20) {
-                  this.userInfo.certiexpiredate = ''
-                  this.$refs.certiexpiredate.date = ''
-                  return this.$toast('36周岁~45周岁的证件有效期为20年')
-                }
-                //年龄在46-65周岁之间
-              } else if (age >= 46 && age <= 65) {
-                if (new Date(val).getFullYear() - new Date(this.userInfo.certificateValidate).getFullYear() != 20 || this.effectiveDateType == false) {
-                  this.userInfo.certiexpiredate = ''
-                  this.$refs.certiexpiredate.date = ''
-                  return this.$toast('46周岁~65周岁的证件有效期为20年或长期')
-                }
-                //年龄在65周岁以上
-              } else if (age > 65) {
-                if (this.userInfo.effectiveDateType == false) { 
-                  this.userInfo.certiexpiredate = ''
-                  this.$refs.certiexpiredate.date = ''
-                  return this.$toast('65周岁以上的证件有效期为长期')
-                }   
-              } 
-              //此外的年龄段不支持
-              // else {
-              //   this.userInfo.certiexpiredate = ''
-              //   this.$refs.certiexpiredate.date = ''
-              //   return this.$toast('身份证不支持此年龄段')
-              // }
+              if(this.userInfo.birthday){
+                this.userInfo.certificateValidate = countCredentialValidity.getStartDate(age,val)
+              }
             }
           }
           break
@@ -746,6 +696,13 @@ export default {
                 return this.$toast('出生证有效期或出生日期有误')
               }
             }
+            let age = utilsAge.getAge(this.userInfo.birthday, new Date())
+            if (this.userInfo.certificateValidate && !this.userInfo.certiexpiredate) {
+              this.userInfo.certiexpiredate = countCredentialValidity.getEndDate(age,this.userInfo.certificateValidate)
+            }
+            if (this.userInfo.certiexpiredate && !this.userInfo.certificateValidate) {
+              this.userInfo.certificateValidate = countCredentialValidity.getEndDate(age,this.userInfo.certiexpiredate)
+            }
           }
           break
       }
@@ -958,53 +915,44 @@ export default {
           }
           //证件止期
           let val = this.userInfo.certiexpiredate
+          if (Date.parse(val) < Date.parse(new Date())) {
+            this.userInfo.certiexpiredate = ''
+            this.$refs.certiexpiredate.date = ''
+            return this.$toast('您的证件已过期')
+          }
           //年龄在16周岁以下
           if (age < 16) {
             if (new Date(val).getFullYear() - new Date(this.userInfo.certificateValidate).getFullYear() != 5) {
-              this.userInfo.certiexpiredate = ''
-              this.$refs.certiexpiredate.date = ''
               return this.$toast('16周岁以下的证件有效期为5年')
             }
             //年龄在16-21周岁之间
           }else if (age >= 16 && age <= 21) {
             if (new Date(val).getFullYear() - new Date(this.userInfo.certificateValidate).getFullYear() != 10 && new Date(val).getFullYear() - new Date(this.userInfo.certificateValidate).getFullYear() != 5) {
-              this.userInfo.certiexpiredate = ''
-              this.$refs.certiexpiredate.date = ''
               return this.$toast('16周岁~21周岁的证件有效期为10年或5年')
             }
             //年龄在22-25周岁之间
           }else if (age >= 22 && age <= 25) {
             if (new Date(val).getFullYear() - new Date(this.userInfo.certificateValidate).getFullYear() != 10) {
-              this.userInfo.certiexpiredate = ''
-              this.$refs.certiexpiredate.date = ''
               return this.$toast('22周岁~25周岁的证件有效期为10年')
             }
             //年龄在26-35周岁之间
           }else if (age >= 26 && age <= 35) {
             if (new Date(val).getFullYear() - new Date(this.userInfo.certificateValidate).getFullYear() != 20 && new Date(val).getFullYear() - new Date(this.userInfo.certificateValidate).getFullYear() != 10) {
-              this.userInfo.certiexpiredate = ''
-              this.$refs.certiexpiredate.date = ''
               return this.$toast('26周岁~35周岁的证件有效期为20年或10年')
             }
             //年龄在36-45周岁之间
           } else if (age >= 36 && age <= 45) {
             if (new Date(val).getFullYear() - new Date(this.userInfo.certificateValidate).getFullYear() != 20) {
-              this.userInfo.certiexpiredate = ''
-              this.$refs.certiexpiredate.date = ''
               return this.$toast('36周岁~45周岁的证件有效期为20年')
             }
             //年龄在46-65周岁之间
           } else if (age >= 46 && age <= 65) {
             if (new Date(val).getFullYear() - new Date(this.userInfo.certificateValidate).getFullYear() != 20 && this.userInfo.effectiveDateType == false) {
-              this.userInfo.certiexpiredate = ''
-              this.$refs.certiexpiredate.date = ''
               return this.$toast('46周岁~65周岁的证件有效期为20年或长期')
             }
             //年龄在65周岁以上
           } else if (age > 65) {
             if (this.userInfo.effectiveDateType == false) {
-              this.userInfo.certiexpiredate = ''
-              this.$refs.certiexpiredate.date = ''
               return this.$toast('65周岁以上的证件有效期为长期')
             }
           }
@@ -1342,6 +1290,14 @@ export default {
         }
         this.effectiveDateTypeAble = false
       }
+      //如果选择户口本
+      if (this.userInfo.idType == '2') {
+        let exipreDate = Date.parse(this.userInfo.birthday) + Date.parse('1985-12-31')
+        this.userInfo.certificateValidate = this.userInfo.birthday
+        this.userInfo.certiexpiredate = this.timeStampFormat(exipreDate)
+        this.idLimit = true
+        //如果选择出生证明
+      }
     }
   },
   filters: {

src/views/ebiz/sale/InsuredInfo.vue

@@ -388,6 +388,7 @@ import OccupationPicker from '@/components/ebiz/occipation/OccupationPicker'
 import CustomerPicker from '@/components/ebiz/customer/CustomerPicker'
 import DataDictionary from '@/assets/js/utils/data-dictionary'
 import areaList from '@/assets/js/utils/areaForSale'
+import countCredentialValidity from '@/assets/js/utils/countCredentialValidity'
 import areaLists from '@/assets/js/utils/areaNewForSale'
 import { saveOrUpdateOrderInfo, getAuthCode, getOrderDetail, getCompany } from '@/api/ebiz/sale/sale'
 import utilsAge from '@/assets/js/utils/age'
@@ -858,20 +859,14 @@ export default {
               let age = utilsAge.getAge(this.userInfo.birthday, new Date())
               // 长期按钮是否禁用
               this.effectiveDateTypeAble = age <= 45
+              if(this.userInfo.birthday){
+                this.userInfo.certiexpiredate = countCredentialValidity.getEndDate(age,val)
+              }
             }
           }
           break
         case '1':
           {
-            console.log('证件截止日期')
-            //证件截止日期
-            //如果已经勾选了长期
-            // if (this.userInfo.effectiveDateType) {
-            //   //清空数据并返回
-            //   this.userInfo.certiexpiredate = ''
-            //   this.$refs.certiexpiredate.date = ''
-            //   return
-            // }
             this.userInfo.effectiveDateType = false
             //如果录入日期早于当前日期
             if (Date.parse(val) < Date.parse(new Date())) {
@@ -881,65 +876,10 @@ export default {
             }
             //身份证证件类型的判断
             if (this.userInfo.idType == '1') {
-              //获取年龄
               let age = utilsAge.getAge(this.userInfo.birthday, new Date())
-              console.log(age)
-              //年龄在16周岁以下
-              if (age < 16) {
-                if (new Date(val).getFullYear() - new Date(this.userInfo.certificateValidate).getFullYear() != 5) {
-                  this.userInfo.certiexpiredate = ''
-                  this.$refs.certiexpiredate.date = ''
-                  return this.$toast('16周岁以下的证件有效期为5年')
-                }
-              //年龄在16-21周岁之间
-              }else if (age >= 16 && age <= 21) {
-                if (new Date(val).getFullYear() - new Date(this.userInfo.certificateValidate).getFullYear() != 10 && new Date(val).getFullYear() - new Date(this.userInfo.certificateValidate).getFullYear() != 5) {
-                  this.userInfo.certiexpiredate = ''
-                  this.$refs.certiexpiredate.date = ''
-                  return this.$toast('16周岁~21周岁的证件有效期为10年或5年')
-                }
-              //年龄在22-25周岁之间
-              }else if (age >= 22 && age <= 25) {
-                if (new Date(val).getFullYear() - new Date(this.userInfo.certificateValidate).getFullYear() != 10) {
-                  this.userInfo.certiexpiredate = ''
-                  this.$refs.certiexpiredate.date = ''
-                  return this.$toast('22周岁~25周岁的证件有效期为10年')
-                }
-              //年龄在26-35周岁之间
-              }else if (age >= 26 && age <= 35) {
-                if (new Date(val).getFullYear() - new Date(this.userInfo.certificateValidate).getFullYear() != 20 && new Date(val).getFullYear() - new Date(this.userInfo.certificateValidate).getFullYear() != 10) {
-                  this.userInfo.certiexpiredate = ''
-                  this.$refs.certiexpiredate.date = ''
-                  return this.$toast('26周岁~35周岁的证件有效期为20年或10年')
-                }
-                //年龄在36-45周岁之间
-              } else if (age >= 36 && age <= 45) {
-                if (new Date(val).getFullYear() - new Date(this.userInfo.certificateValidate).getFullYear() != 20) {
-                  this.userInfo.certiexpiredate = ''
-                  this.$refs.certiexpiredate.date = ''
-                  return this.$toast('36周岁~45周岁的证件有效期为20年')
-                }
-                //年龄在46-65周岁之间
-              } else if (age >= 46 && age <= 65) {
-                if (new Date(val).getFullYear() - new Date(this.userInfo.certificateValidate).getFullYear() != 20 && this.userInfo.effectiveDateType == false) {
-                  this.userInfo.certiexpiredate = ''
-                  this.$refs.certiexpiredate.date = ''
-                  return this.$toast('46周岁~65周岁的证件有效期为20年或长期')
-                }
-                //年龄在65周岁以上
-              } else if (age > 65) {
-                if (this.userInfo.effectiveDateType == false) { 
-                  this.userInfo.certiexpiredate = ''
-                  this.$refs.certiexpiredate.date = ''
-                  return this.$toast('65周岁以上的证件有效期为长期')
-                }   
-              } 
-              //此外的年龄段不支持
-              // else {
-              //   this.userInfo.certiexpiredate = ''
-              //   this.$refs.certiexpiredate.date = ''
-              //   return this.$toast('身份证不支持此年龄段')
-              // }
+              if(this.userInfo.birthday){
+                this.userInfo.certificateValidate = countCredentialValidity.getStartDate(age,val)
+              }
             }
           }
           break
@@ -961,6 +901,12 @@ export default {
             if (age < 18) {
               this.userInfo.workcompany = this.userInfo.workcompany || '无'
             }
+            if (this.userInfo.certificateValidate && !this.userInfo.certiexpiredate) {
+              this.userInfo.certiexpiredate = countCredentialValidity.getEndDate(age,this.userInfo.certificateValidate)
+            }
+            if (this.userInfo.certiexpiredate && !this.userInfo.certificateValidate) {
+              this.userInfo.certificateValidate = countCredentialValidity.getEndDate(age,this.userInfo.certiexpiredate)
+            }
           }
           break
       }
@@ -1054,32 +1000,9 @@ export default {
 
         //如果证件类型是身份证
         if (this.userInfo.idType == '1') {
-          console.log('证件类型是身份证')
-
           if (this.userInfo.nativeplace != '1') {
             return this.$toast('证件类型”为“身份证，国籍必须为中国哦')
           }
-
-          //校验性别是否与身份证号码位相符
-          // if (this.userInfo.idNo.length == '15') {
-          //   //15位身份证第15位是性别位, 奇男偶女
-          //   let sexSign = this.userInfo.idNo.substr(14, 1)
-          //   console.log('性别位' + sexSign)
-          //   if ((parseInt(sexSign) % 2 == 0 && this.userInfo.sex != 1) || (parseInt(sexSign) % 2 != 0 && this.userInfo.sex != 0)) {
-          //     return this.$toast('性别录入与身份证不符')
-          //   }
-
-          //   //15位身份证第7-12位是生日位, 年月日
-          //   let birthSign = this.userInfo.idNo.substr(6, 6)
-          //   console.log('生日位' + birthSign)
-          //   if (
-          //     this.userInfo.birthday.substr(2, 2) != birthSign.substr(0, 2) ||
-          //     this.userInfo.birthday.substr(5, 2) != birthSign.substr(2, 2) ||
-          //     this.userInfo.birthday.substr(8, 2) != birthSign.substr(4, 2)
-          //   ) {
-          //     return this.$toast('生日录入与身份证不符')
-          //   }
-          // } else
           if (this.userInfo.idNo.length == '18') {
             //18位身份证第17位是性别位, 奇男偶女
             let sexSign = this.userInfo.idNo.substr(16, 1)
@@ -1110,75 +1033,48 @@ export default {
 
           //身份证证件类型的判断
           //证件止期
-          let val = this.userInfo.certiexpiredate 
+          let val = this.userInfo.certiexpiredate
+          if (Date.parse(val) < Date.parse(new Date())) {
+            this.userInfo.certiexpiredate = ''
+            this.$refs.certiexpiredate.date = ''
+            return this.$toast('您的证件已过期')
+          }
           //年龄在16周岁以下
           if (age < 16) {
             if (new Date(val).getFullYear() - new Date(this.userInfo.certificateValidate).getFullYear() != 5) {
-              this.userInfo.certiexpiredate = ''
-              this.$refs.certiexpiredate.date = ''
               return this.$toast('16周岁以下的证件有效期为5年')
             }
           //年龄在16-21周岁之间
           }else if (age >= 16 && age <= 21) {
             if (new Date(val).getFullYear() - new Date(this.userInfo.certificateValidate).getFullYear() != 10 && new Date(val).getFullYear() - new Date(this.userInfo.certificateValidate).getFullYear() != 5) {
-              this.userInfo.certiexpiredate = ''
-              this.$refs.certiexpiredate.date = ''
               return this.$toast('16周岁~21周岁的证件有效期为10年或5年')
             }
           //年龄在22-25周岁之间
           }else if (age >= 22 && age <= 25) {
             if (new Date(val).getFullYear() - new Date(this.userInfo.certificateValidate).getFullYear() != 10) {
-              this.userInfo.certiexpiredate = ''
-              this.$refs.certiexpiredate.date = ''
               return this.$toast('22周岁~25周岁的证件有效期为10年')
             }
           //年龄在26-35周岁之间
           }else if (age >= 26 && age <= 35) {
             if (new Date(val).getFullYear() - new Date(this.userInfo.certificateValidate).getFullYear() != 20 && new Date(val).getFullYear() - new Date(this.userInfo.certificateValidate).getFullYear() != 10) {
-              this.userInfo.certiexpiredate = ''
-              this.$refs.certiexpiredate.date = ''
               return this.$toast('26周岁~35周岁的证件有效期为20年或10年')
             }
             //年龄在36-45周岁之间
           } else if (age >= 36 && age <= 45) {
             if (new Date(val).getFullYear() - new Date(this.userInfo.certificateValidate).getFullYear() != 20) {
-              this.userInfo.certiexpiredate = ''
-              this.$refs.certiexpiredate.date = ''
               return this.$toast('36周岁~45周岁的证件有效期为20年')
             }
             //年龄在46-65周岁之间
           } else if (age >= 46 && age <= 65) {
             if (new Date(val).getFullYear() - new Date(this.userInfo.certificateValidate).getFullYear() != 20 && this.userInfo.effectiveDateType == false) {
-              this.userInfo.certiexpiredate = ''
-              this.$refs.certiexpiredate.date = ''
               return this.$toast('46周岁~65周岁的证件有效期为20年或长期')
             }
             //年龄在65周岁以上
           } else if (age > 65) {
-            if (this.userInfo.effectiveDateType == false) { 
-              this.userInfo.certiexpiredate = ''
-              this.$refs.certiexpiredate.date = ''
+            if (this.userInfo.effectiveDateType == false) {
               return this.$toast('65周岁以上的证件有效期为长期')
             }   
-          } 
-              
-          // 年龄在 16-25 周岁之间
-          // if (age >= 16 && age <= 25) {
-          //   if (Date.parse(this.userInfo.certiexpiredate) - Date.parse(new Date()) > Date.parse('1980-01-01')) {
-          //     this.userInfo.certiexpiredate = ''
-          //     this.$refs.certiexpiredate.date = ''
-          //     this.effectiveDateTypeAble = true
-          //     return this.$toast('证件有效期错误，16周岁~25周岁的公民身份证有效期应小于等于10年')
-          //   }
-          //   //年龄在 26-45 周岁之间
-          // } else if (age >= 26 && age <= 45) {
-          //   if (Date.parse(this.userInfo.certiexpiredate) - Date.parse(new Date()) > Date.parse('1990-01-01')) {
-          //     this.userInfo.certiexpiredate = ''
-          //     this.$refs.certiexpiredate.date = ''
-          //     this.effectiveDateTypeAble = true
-          //     return this.$toast('证件有效期错误，26周岁~45周岁的公民身份证有效期应小于等于20年')
-          //   }
-          // }
+          }
           //证件类型是户口本
         } else if (this.userInfo.idType == '2') {
           if (age > 16) {

src/views/ebiz/sale/InsuredPerson.vue

@@ -452,6 +452,7 @@ import CustomerPicker from '@/components/ebiz/customer/CustomerPicker'
 import DataDictionary from '@/assets/js/utils/data-dictionary'
 import areaList from '@/assets/js/utils/areaForSale'
 import areaLists from '@/assets/js/utils/areaNewForSale'
+import countCredentialValidity from '@/assets/js/utils/countCredentialValidity'
 import { saveOrUpdateOrderInfo, getAuthCode, getOrderDetail } from '@/api/ebiz/sale/sale'
 import utilsAge from '@/assets/js/utils/age'
 import getAreaName from '@/assets/js/utils/getAreaNameForSale'
@@ -1062,6 +1063,9 @@ export default {
               let age = utilsAge.getAge(this.userInfo.birthday, new Date())
               // 长期按钮是否禁用
               this.effectiveDateTypeAble = age <= 45
+              if(this.userInfo.birthday){
+                this.userInfo.certiexpiredate = countCredentialValidity.getEndDate(age,val)
+              }
             }
           }
           break
@@ -1088,62 +1092,9 @@ export default {
               //获取年龄
               let age = utilsAge.getAge(this.userInfo.birthday, new Date())
               console.log(age)
-              //年龄在16周岁以下
-              if (age < 16) {
-                if (new Date(val).getFullYear() - new Date(this.userInfo.certificateValidate).getFullYear() != 5) {
-                  this.userInfo.certiexpiredate = ''
-                  this.$refs.certiexpiredate.date = ''
-                  return this.$toast('16周岁以下的证件有效期为5年')
-                }
-              //年龄在16-21周岁之间
-              }else if (age >= 16 && age <= 21) {
-                if (new Date(val).getFullYear() - new Date(this.userInfo.certificateValidate).getFullYear() != 10 && new Date(val).getFullYear() - new Date(this.userInfo.certificateValidate).getFullYear() != 5) {
-                  this.userInfo.certiexpiredate = ''
-                  this.$refs.certiexpiredate.date = ''
-                  return this.$toast('16周岁~21周岁的证件有效期为10年或5年')
-                }
-              //年龄在22-25周岁之间
-              }else if (age >= 22 && age <= 25) {
-                if (new Date(val).getFullYear() - new Date(this.userInfo.certificateValidate).getFullYear() != 10) {
-                  this.userInfo.certiexpiredate = ''
-                  this.$refs.certiexpiredate.date = ''
-                  return this.$toast('22周岁~25周岁的证件有效期为10年')
-                }
-              //年龄在26-35周岁之间
-              }else if (age >= 26 && age <= 35) {
-                if (new Date(val).getFullYear() - new Date(this.userInfo.certificateValidate).getFullYear() != 20 && new Date(val).getFullYear() - new Date(this.userInfo.certificateValidate).getFullYear() != 10) {
-                  this.userInfo.certiexpiredate = ''
-                  this.$refs.certiexpiredate.date = ''
-                  return this.$toast('26周岁~35周岁的证件有效期为20年或10年')
-                }
-                //年龄在36-45周岁之间
-              } else if (age >= 36 && age <= 45) {
-                if (new Date(val).getFullYear() - new Date(this.userInfo.certificateValidate).getFullYear() != 20) {
-                  this.userInfo.certiexpiredate = ''
-                  this.$refs.certiexpiredate.date = ''
-                  return this.$toast('36周岁~45周岁的证件有效期为20年')
-                }
-                //年龄在46-65周岁之间
-              } else if (age >= 46 && age <= 65) {
-                if (new Date(val).getFullYear() - new Date(this.userInfo.certificateValidate).getFullYear() != 20 && this.userInfo.effectiveDateType == false) {
-                  this.userInfo.certiexpiredate = ''
-                  this.$refs.certiexpiredate.date = ''
-                  return this.$toast('46周岁~65周岁的证件有效期为20年或长期')
-                }
-                //年龄在65周岁以上
-              } else if (age > 65) {
-                if (this.userInfo.effectiveDateType == false) { 
-                  this.userInfo.certiexpiredate = ''
-                  this.$refs.certiexpiredate.date = ''
-                  return this.$toast('65周岁以上的证件有效期为长期')
-                }   
-              } 
-              //此外的年龄段不支持
-              // else {
-              //   this.userInfo.certiexpiredate = ''
-              //   this.$refs.certiexpiredate.date = ''
-              //   return this.$toast('身份证不支持此年龄段')
-              // }
+              if(this.userInfo.birthday){
+                this.userInfo.certificateValidate = countCredentialValidity.getStartDate(age,val)
+              }
             }
           }
           break
@@ -1170,24 +1121,14 @@ export default {
                 this.userInfo.otherSalarySource = '无'
                 this.userInfo.averageAnnualIncome = '0'
                 this.userInfo.liabilitiesMoney = '0'
-                // this.userInfo.jobStatus = '3'
-                // this.userInfo.marriage = '2'
-              } else {
-                // this.userInfo.salarySource = ''
-                // this.userInfo.averageAnnualIncome = ''
-                // this.userInfo.liabilitiesMoney = ''
-                // this.userInfo.jobStatus = ''
-                // this.userInfo.marriage = ''
               }
             }
-            //出生证有效期
-            // if (this.userInfo.idType == '3') {
-            //   if (Date.parse(this.userInfo.certiexpiredate) - Date.parse(val) > Date.parse('1973-01-01')) {
-            //     this.userInfo.birthday = ''
-            //     this.$refs.birthday.date = ''
-            //     return this.$toast('出生证有效期或出生日期有误')
-            //   }
-            // }
+            if (this.userInfo.certificateValidate && !this.userInfo.certiexpiredate) {
+              this.userInfo.certiexpiredate = countCredentialValidity.getEndDate(age,this.userInfo.certificateValidate)
+            }
+            if (this.userInfo.certiexpiredate && !this.userInfo.certificateValidate) {
+              this.userInfo.certificateValidate = countCredentialValidity.getEndDate(age,this.userInfo.certiexpiredate)
+            }
           }
           break
       }
@@ -1469,56 +1410,47 @@ export default {
 
           //证件止期
           let val = this.userInfo.certiexpiredate
+          if (Date.parse(val) < Date.parse(new Date())) {
+            this.userInfo.certiexpiredate = ''
+            this.$refs.certiexpiredate.date = ''
+            return this.$toast('您的证件已过期')
+          }
           //年龄在16周岁以下
           if (age < 16) {
             if (new Date(val).getFullYear() - new Date(this.userInfo.certificateValidate).getFullYear() != 5) {
-              this.userInfo.certiexpiredate = ''
-              this.$refs.certiexpiredate.date = ''
               return this.$toast('16周岁以下的证件有效期为5年')
             }
           //年龄在16-21周岁之间
           }else if (age >= 16 && age <= 21) {
             if (new Date(val).getFullYear() - new Date(this.userInfo.certificateValidate).getFullYear() != 10 && new Date(val).getFullYear() - new Date(this.userInfo.certificateValidate).getFullYear() != 5) {
-              this.userInfo.certiexpiredate = ''
-              this.$refs.certiexpiredate.date = ''
               return this.$toast('16周岁~21周岁的证件有效期为10年或5年')
             }
           //年龄在22-25周岁之间
           }else if (age >= 22 && age <= 25) {
             if (new Date(val).getFullYear() - new Date(this.userInfo.certificateValidate).getFullYear() != 10) {
-              this.userInfo.certiexpiredate = ''
-              this.$refs.certiexpiredate.date = ''
               return this.$toast('22周岁~25周岁的证件有效期为10年')
             }
           //年龄在26-35周岁之间
           }else if (age >= 26 && age <= 35) {
             if (new Date(val).getFullYear() - new Date(this.userInfo.certificateValidate).getFullYear() != 20 && new Date(val).getFullYear() - new Date(this.userInfo.certificateValidate).getFullYear() != 10) {
-              this.userInfo.certiexpiredate = ''
-              this.$refs.certiexpiredate.date = ''
               return this.$toast('26周岁~35周岁的证件有效期为20年或10年')
             }
             //年龄在36-45周岁之间
           } else if (age >= 36 && age <= 45) {
             if (new Date(val).getFullYear() - new Date(this.userInfo.certificateValidate).getFullYear() != 20) {
-              this.userInfo.certiexpiredate = ''
-              this.$refs.certiexpiredate.date = ''
               return this.$toast('36周岁~45周岁的证件有效期为20年')
             }
             //年龄在46-65周岁之间
           } else if (age >= 46 && age <= 65) {
             if (new Date(val).getFullYear() - new Date(this.userInfo.certificateValidate).getFullYear() != 20 && this.userInfo.effectiveDateType == false) {
-              this.userInfo.certiexpiredate = ''
-              this.$refs.certiexpiredate.date = ''
               return this.$toast('46周岁~65周岁的证件有效期为20年或长期')
             }
             //年龄在65周岁以上
           } else if (age > 65) {
-            if (this.userInfo.effectiveDateType == false) { 
-              this.userInfo.certiexpiredate = ''
-              this.$refs.certiexpiredate.date = ''
+            if (this.userInfo.effectiveDateType == false) {
               return this.$toast('65周岁以上的证件有效期为长期')
             }   
-          } 
+          }
           //年龄在0-15周岁之间
           // if (age <= 15) {
           //   if (Date.parse(this.userInfo.certiexpiredate) - Date.parse(new Date()) > Date.parse('1975-01-01')) {
@@ -2003,36 +1935,27 @@ export default {
           this.userInfo.otherSalarySource = '无'
           this.userInfo.averageAnnualIncome = '0'
           this.userInfo.liabilitiesMoney = '0'
-          // this.userInfo.jobStatus = '3'
-          // this.userInfo.marriage = '2'
         } else {
           this.userInfo.salarySource = ''
           this.userInfo.averageAnnualIncome = ''
           this.userInfo.liabilitiesMoney = ''
-          // this.userInfo.jobStatus = ''
-          // this.userInfo.marriage = ''
         }
       }
       if (idToData(val).age > 45) {
-        // this.idLimit = true
-        // this.isRequired = false
         if (from) {
           this.userInfo.effectiveDateType = true
         }
         this.effectiveDateTypeAble = false
-      } else {
-        // this.idLimit = false
-        // this.isRequired = true
-        // this.userInfo.effectiveDateType = false
       }
       //如果选择户口本
-      // if (this.userInfo.idType == '2') {
-      //   let exipreDate = Date.parse(this.userInfo.birthday) + Date.parse('1985-12-31')
-      //   this.userInfo.certificateValidate = this.userInfo.birthday
-      //   this.userInfo.certiexpiredate = this.timeStampFormat(exipreDate)
-      //   this.idLimit = true
-      //   //如果选择出生证明
-      // } else if (this.userInfo.idType == '3') {
+      if (this.userInfo.idType == '2') {
+        let exipreDate = Date.parse(this.userInfo.birthday) + Date.parse('1985-12-31')
+        this.userInfo.certificateValidate = this.userInfo.birthday
+        this.userInfo.certiexpiredate = this.timeStampFormat(exipreDate)
+        this.idLimit = true
+        //如果选择出生证明
+      }
+      // else if (this.userInfo.idType == '3') {
       //   let exipreDate = Date.parse(this.userInfo.birthday) + Date.parse('1972-12-31')
       //   this.userInfo.certificateValidate = this.userInfo.birthday
       //   this.userInfo.certiexpiredate = this.timeStampFormat(exipreDate)

src/views/ebiz/sale/insuranceClauses.vue

@@ -148,6 +148,11 @@ export default {
           if (res.result == '0') {
             res.orderDTO.insuredDTOs[0].riskDTOLst.forEach(item => {
               if(item.isMainRisk == '0'){
+                /**
+                 * @Author: LiuXiaoFeng
+                 * @Description: 保险期间大于1年或者是保终身的才展示产品说明书
+                 * @Date: 2023/7/4
+                 **/
                 if(item.insuYearFlag == 'Y' && item.insuYear > 1){
                   this.hasProductTip = true
                 }