保费试算页面变更保额或者保费重新定义当前数据

src/assets/js/utils/countCredentialValidity.js

@@ -1,167 +0,0 @@
-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/views/ebiz/cardList/information.vue

@@ -978,7 +978,9 @@ export default {
             if (res.result == 0) {
               //选择保障方案
               this.trialList = res.trialList
-              this.allPrice = res.trialList[0].prem
+              if (!this.allPrice) {
+                this.allPrice = res.trialList[0].prem
+              }
             } else {
               this.$toast(res.resultMessage)
             }
@@ -1594,10 +1596,32 @@ export default {
         this.userInfo.homeAddress = data.homeAddress //家庭详细地址
         this.userInfo.occupationCode = data.occupationCode
         this.userInfo.occupationName = data.occupationName
+        let thisoccupationType = ''
+        let thislifeGrade = ''
+        let thishealthGrade = ''
+        let collect = (data,code) => {
+          data.forEach(item => {
+            if (item.code == code) {
+              if (this.trialDTOS.productInsuredDTO.healthGrade && this.trialDTOS.productInsuredDTO.healthGrade != '0') {
+                thisoccupationType = item.healthGrade
+              }
+              if (this.trialDTOS.productInsuredDTO.lifeGrade && this.trialDTOS.productInsuredDTO.lifeGrade != '0') {
+                thisoccupationType = item.lifeGrade
+              }
+              thislifeGrade = item.lifeGrade
+              thishealthGrade = item.healthGrade
+            } else {
+              if (item.subs && item.subs.length != 0) {
+                collect(item.subs,code)
+              }
+            }
+          })
+        }
+        collect(occupationList,data.occupationCode)
 
-        this.userInfo.occupationType = data.lifeGrade
-        this.userInfo.lifeGrade = data.lifeGrade
-        this.userInfo.healthGrade = data.healthGrade
+        this.userInfo.occupationType =thisoccupationType
+        this.userInfo.lifeGrade = thislifeGrade
+        this.userInfo.healthGrade = thishealthGrade
         this.userInfo.averageAnnualIncome = this.itemProductDTOS.productCode == 'GFRS_M0032' ? data.averageYearlyIncome : '0' //平均年收入
         //2516--三个学平险--被保险人国籍默认中国，允许修改
         if (this.itemProductDTOS.productCode == 'GFRS_M0048' || this.itemProductDTOS.productCode == 'GFRS_M0049' || this.itemProductDTOS.productCode == 'GFRS_M0050' 

src/views/ebiz/common/SelectedProduct.vue

@@ -23,7 +23,7 @@
       </div>
 
       <div class="text-right pv5">
-<!--        <van-button v-if="isFrom == 'proposal'" size="small" round @click="editInsure(index,item)" class="mr5" type="danger">编辑</van-button>-->
+        <van-button v-if="isFrom == 'proposal'" size="small" round @click="editInsure(index,item)" class="mr5" type="danger">编辑</van-button>
         <van-button size="small" round @click="deteleInsure(index)" plain type="danger">删除</van-button>
       </div>
     </div>
@@ -119,7 +119,7 @@
 <script>
 import { Tag, SubmitBar, Icon, Dialog, RadioGroup, Radio, Image } from 'vant'
 import FieldPicker from '@/components/ebiz/FieldPicker'
-import { orderDetail, deleteOrderInfo } from '@/api/ebiz/common/common'
+import { orderDetail, deleteOrderInfo, mainRiskList, mainRiskListProposal, calculatePremium } from '@/api/ebiz/common/common'
 import { formatAllRisk } from '@/assets/js/utils/formatRiskList'
 import { getDetail, deleteProposal } from '@/api/ebiz/proposal/proposal.js'
 import { saveOrderActiveType,getActivityList } from '@/api/ebiz/sale/sale.js'
@@ -148,6 +148,7 @@ export default {
       noCheckedUrl: require('@/assets/images/kmh/no_checked.png'),
       proposalOrderNo:'',
       renovate:'',//刷新子组件
+      isCrossChannel: 0,   // 是否选择交叉渠道列表 0-否 1-是
     }
   },
   components: {
@@ -180,18 +181,30 @@ export default {
     }
     //建议书--右上角为退出流程键(到建议书列表)×,并清除浏览记录
     if (localStorage.isFrom == 'proposal') {
-        // eslint-disable-next-line no-undef
-        setTimeout(() => {
-          EWebBridge.webCallAppInJs('webview_right_button', {
-            btns: [
-              {
-                img: this.$assetsUrl + 'images/del-close.png',
-                route: { flag: '', extra: {} }
-              }
-            ]
-          })
-        }, 500)
+      // eslint-disable-next-line no-undef
+      setTimeout(() => {
+        EWebBridge.webCallAppInJs('webview_right_button', {
+          btns: [
+            {
+              img: this.$assetsUrl + 'images/del-close.png',
+              route: { flag: '', extra: {} }
+            }
+          ]
+        })
+      }, 500)
+      getDetail({
+        orderNo: this.$route.query.proposalOrderNo
+      }).then(res => {
+        if (res.result == '0') {
+          this.recommendType = res.content[0].recmdDTO?res.content[0].recmdDTO.recommendType:'';
+          if (this.recommendType == '02' || this.recommendType == '11') {
+            // 电投 团险渠道产品  均为交叉渠道销售
+            this.isCrossChannel = '1';
+          }
+        }
+      })
     }
+
     window.appCallBack = this.appCallBack
     document.body.style.backgroundColor = '#fff'
     this.getProductList()
@@ -422,8 +435,236 @@ export default {
         this.$toast(resultData.resultMessage)
       }
     },
-    //编辑
-    editInsure(index,data){
+    //获取主险列表--普通产品
+    async getMainRiskList(riskProductCode) {
+      let mainRiskCodes = localStorage.mainRiskCodes && JSON.parse(localStorage.mainRiskCodes)
+      let mainListDate = { platform: 'app' }
+      switch (this.isFrom) {
+        case 'proposal':
+          mainListDate.platform = 'proposal'
+          break
+        case 'sale':
+          mainListDate.platform = 'app'
+          break
+      }
+      if (this.isCrossChannel == '1') {
+        mainListDate.platform = 'cross'
+      }
+      let resultData
+      if(this.isFrom == 'proposal'){
+        resultData = await mainRiskListProposal(mainListDate)
+      }else{
+        resultData = await mainRiskList(mainListDate)
+      }
+      if (resultData.result == 0) {
+        if (resultData.mainRiskDTOS && resultData.mainRiskDTOS.length > 0){
+          resultData.mainRiskDTOS.forEach(item=>{
+            if (item.riskProductCode == riskProductCode) {
+              this.result = item
+            }
+          })
+          this.addMainRisk()
+        }
+      }
+    },
+    //储存主险
+    async addMainRisk() {
+      localStorage.setItem('isTrial', '1')
+      let riskProductCode = this.result.riskProductCode
+      let resultData = await calculatePremium({ productCodes: [riskProductCode], platform: 'app', type: '1' })
+      if (resultData.result == 0) {
+        resultData = resultData.trialDTOS[0]
+        localStorage.isTrial = resultData.productTrialInfoDTO.productTrialYearDTOS != null ? '0' : '1'
+        localStorage.hint = resultData.hint
+        if (resultData.productTrialInfoDTO.dutyGroup != null) {
+          resultData.productTrialInfoDTO.dutyGroup.map(item => {
+            if (item.dutyName == '意外身故/伤残保险金') {
+              item.defaultDutyAmt = item.minDutyAmt
+            }
+          })
+        }
+
+        if (resultData.productTrialInfoDTO.ruleExpression) {
+          let ruleExpression = localStorage.ruleExpression ? JSON.parse(localStorage.ruleExpression) : {}
+          ruleExpression[resultData.productCode] = resultData.productTrialInfoDTO.ruleExpression
+          localStorage.ruleExpression = JSON.stringify(ruleExpression)
+        }
+
+        /********start 主险选择限制 start******/
+
+        // 检验投被人关系  惠企保特殊校验
+        if (riskProductCode == 'GFRS_M0040') {
+          if (riskRules.relationLimit(resultData, JSON.parse(this.$CacheUtils.getLocItem('saleInsuredPersonInfo')).relationToAppnt, this)) {
+            return
+          }
+        }
+        // 检验投被人关系  国富人寿特定疾病药品费用医疗保险特殊校验
+        if (riskProductCode == 'GFRS_M0045') {
+          if (riskRules.relationCommonLimit(resultData, JSON.parse(this.$CacheUtils.getLocItem('saleInsuredPersonInfo')).relationToAppnt, this)) {
+            return
+          }
+        }
+
+        if (riskRules.ageLimit(resultData, this, null,riskProductCode)) {
+          return
+        }
+
+        if (riskRules.medicalLimit(resultData, this)) {
+          return
+        }
+
+        if (riskRules.healthGradeLimit(resultData, this)) {
+          return
+        }
+        // if (riskRules.lifeGradeLimit(resultData, this)) {
+        //   return
+        // }
+        //validateAppntFlag 0-职业寿险等级需校验主合同的投保人；1-职业寿险等级无需校验主合同的投保人
+        if (resultData.productInsuredDTO.validateAppntFlag == '0') {
+          //校验主合同投保人寿险职业等级
+          if (riskRules.lifeGradeLimitForBaby(resultData, this)) {
+            return
+          }
+        } else {
+          //校验主合同被保险人寿险职业等级
+          if (riskRules.lifeGradeLimit(resultData, this)) {
+            return
+          }
+        }
+
+        let flagPermission = await riskRules.getProductSellPermissionList(resultData.productCode, this,this.isCrossChannel)
+        if (flagPermission.flag && localStorage.isFrom != 'proposal') {
+          //校验该代理人是否有该产品的售卖权限
+          return this.$toast(flagPermission.resultMessage)
+        }
+        let flagCompany = await riskRules.checkCompany(resultData.productCode, JSON.parse(this.$CacheUtils.getLocItem('saleInsuredInfo')).workcompany,  JSON.parse(this.$CacheUtils.getLocItem('saleInsuredInfo')).isAsync,this)
+        if (flagCompany && localStorage.isFrom != 'proposal') {
+          //校验该投保人的工作单位是否能够投保该产品
+          return this.$toast('该投保人工作单位不能投保该产品')
+        }
+        /********end 主险选择限制 end******/
+
+        //保存附加险
+        localStorage.addtionRiskLst = JSON.stringify(resultData.productTrialInfoDTO.addtionRiskLst)
+        localStorage.isAutoPay = resultData.isAutoPay
+        localStorage.isRenew = resultData.isRenew
+        localStorage.isForceRenew = resultData.isForceRenew
+        localStorage.isRelated = resultData.isRelated
+
+        let calFactorLst = this.getFactorList(resultData)
+        let productTrialYearDTOS = resultData.productTrialInfoDTO.productTrialYearDTOS != null ? resultData.productTrialInfoDTO.productTrialYearDTOS : null
+        let hasAddtionRisk = (resultData.productTrialInfoDTO.addtionRiskLst != null && resultData.productTrialInfoDTO.addtionRiskLst.length) ? true : false
+        let currentProductInfo = localStorage.isTrial == '1' ? {
+          isCrossChannel:this.isCrossChannel,
+          calFactorLst,
+          hasAddtionRisk,
+          isMainRisk: 0,
+          hint: resultData.hint,
+          riskType: resultData.riskType,
+          riskName: this.result.riskName,
+          productCode: this.result.riskProductCode,
+          mainRiskCode: this.result.riskProductCode,
+          documentDTOS: resultData.productTrialInfoDTO.documentDTOS,
+          influences: resultData.productTrialInfoDTO.influences,
+          isRemit: resultData.productTrialInfoDTO.isRemit,
+          hasPredictTransferPrem: resultData.productTrialInfoDTO.hasPredictTransferPrem, //建议书使用 是否展示预计转入保费
+          predictTransferPrem: null //建议书使用  预计转入保费字段
+        } : {
+          isCrossChannel:this.isCrossChannel,
+          productTrialYearDTOS,
+          calFactorLst,
+          hasAddtionRisk,
+          isMainRisk: 0,
+          hint: resultData.hint,
+          riskType: resultData.riskType,
+          riskName: this.result.riskName,
+          productCode: this.result.riskProductCode,
+          mainRiskCode: this.result.riskProductCode,
+          documentDTOS: resultData.productTrialInfoDTO.documentDTOS,
+          influences: resultData.productTrialInfoDTO.influences,
+          isRemit: resultData.productTrialInfoDTO.isRemit,
+          hasPredictTransferPrem: resultData.productTrialInfoDTO.hasPredictTransferPrem, //建议书使用 是否展示预计转入保费
+          predictTransferPrem: null //建议书使用  预计转入保费字段
+        }
+
+        //构建险种数组
+        let productsData
+        if (localStorage.chooseProducts) {
+          productsData = JSON.parse(localStorage.chooseProducts)
+          productsData.push(currentProductInfo)
+        } else {
+          productsData = [currentProductInfo]
+        }
+        //保存选择险种
+        productsData = this.$utils.unrepeatObj(productsData, 'productCode') //产品数组去重,跳转试算页面未成功重复添加同一产品的情况
+        localStorage.chooseProducts = JSON.stringify(productsData)
+        this.jumpTo(this.thisEditIndex,this.thisEditData)
+      }
+    },
+    //构建险种因子列表
+    getFactorList(resultData) {
+      let productTrialInfoDTO = resultData.productTrialInfoDTO
+      console.log(productTrialInfoDTO, 'wode')
+      let calFactorLst = resultData.productTrialInfoDTO.calFactorLst
+      console.log('calFactorLst', calFactorLst)
+
+      calFactorLst.forEach(item => {
+        item['isMainRisk'] = 0
+        item.columns = []
+        if (item.type == 0) {
+          //1、type=0 select 2、type=1 input+stepper
+          productTrialInfoDTO[item.code].forEach(factor => {
+            if (factor.defaultValue == 0) {
+              item.showContent = factor.showContent
+              if (factor[item.code + 'Flag'] != undefined) {
+                item[item.code] = factor[item.code]
+                item[item.code + 'Flag'] = factor[item.code + 'Flag']
+                item.hasFlag = '1'
+              }else if(item.code == 'pensionAge'){
+                //养老保险金领取年龄
+                item[item.code] = factor[item.code]
+                item['sex'] = factor.sex
+              }else {
+                item[item.code] = factor[item.code]
+              }
+            }
+            let itemColumns = { text: factor.showContent, value: factor[item.code], flag: factor[item.code + 'Flag'],sex:factor.sex}
+            if (factor.medical !== undefined) {
+              itemColumns.medical = factor.medical
+            }
+            item.columns.push(itemColumns)
+          })
+        } else if (item.type == 1) {
+          //按年龄选择
+          if (productTrialInfoDTO[item.code] != null) {
+            productTrialInfoDTO[item.code].forEach(factor => {
+              // item = Object.assign(item, factor)
+              if(JSON.parse(this.$CacheUtils.getLocItem('saleInsuredPersonInfo')).insuredAge >= Number(factor.minAge) && JSON.parse(this.$CacheUtils.getLocItem('saleInsuredPersonInfo')).insuredAge <= Number(factor.maxAge)){
+                // if(JSON.parse(this.$CacheUtils.getLocItem('saleInsuredPersonInfo')).age >= Number(factor.minAge) && JSON.parse(this.$CacheUtils.getLocItem('saleInsuredPersonInfo')).age <= Number(factor.maxAge)){
+                item = Object.assign(item, factor)
+              }
+            })
+            if (item.code == 'inputPrem') {
+              item['inputPrem'] = Number(item.minPrem) * Number(item.moneyUnit)
+            } else {
+              item['amt'] = Number(item.minAmt) * Number(item.moneyUnit)
+            }
+          }
+        }
+        //规则储存
+        item['rules'] = productTrialInfoDTO[item.code]
+      })
+      // // 用于意外险初始化保额
+      // calFactorLst.map(item => {
+      //   if (item.code == '"dutyGroup"') {
+      //     item.rules.map(factor => {
+      //       factor[0].defaultDutyAmt = 50
+      //     })
+      //   }
+      // })
+      return calFactorLst
+    },
+    jumpTo(index,data){
       let insuanceIdInfo = [{insuanceId: data.insuanceId, riskCode: data.riskCode, isMainRisk: 0 }]
       if(data.addtion && data.addtion.length != 0){
         data.addtion.forEach(item=>{
@@ -437,11 +678,12 @@ export default {
       let isProposal = localStorage.isFrom == 'proposal' ? true : false
       let thismyurl = ''
       if (this.$route.query.orderNo) {
-        thismyurl = '/common/calculatePremium/?orderNo=' + this.$route.query.orderNo + '&insuanceId='+insuanceId
+        thismyurl = '/common/calculatePremium/?orderNo=' + this.$route.query.orderNo + '&insuanceIdInfo='+JSON.stringify(insuanceIdInfo)
       } else if (this.$route.query.proposalOrderNo) {
-        thismyurl = '/common/calculatePremium?proposalOrderNo=' + this.$route.query.proposalOrderNo + '&insuanceId='+insuanceId
+        thismyurl = '/common/calculatePremium?proposalOrderNo=' + this.$route.query.proposalOrderNo + '&insuanceIdInfo='+JSON.stringify(insuanceIdInfo)
       }
       if (isProposal) {
+        window.localStorage.removeItem("editproposaladdrisk")
         this.$jump({
           flag: 'h5',
           extra: {
@@ -453,6 +695,12 @@ export default {
         })
       }
     },
+    //编辑
+    editInsure(index,data){
+      this.thisEditIndex = index
+      this.thisEditData = data
+      this.getMainRiskList(data.riskCode)
+    },
     //下一步
     async nextStep() {
       if (!this.$route.query.salePageFlag) {

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_M0056')" />
               </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_M0056')" />
             </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/ChooseInsuredPerson.vue

@@ -453,21 +453,10 @@ export default {
     //编辑被保险人
     edit(item) {
       item.birthday = item.birthdayLabel
-      // item.age = item.insuredAge
       this.$CacheUtils.setLocItem('saleInsuredPersonInfo', JSON.stringify(item)) //存储被保险人信息
       localStorage.isFrom = 'proposal'
-      // let url = `/common/selectedProduct?proposalEdit=1&proposalOrderNo=${item.orderNo}`
       let url = `/proposal/insuredPerson?proposalOrderNo=${this.proposalOrderNo}&insuredId=`+item.insuredId
       this.$router.push({ path: url })
-      // this.$jump({
-      //   flag: 'h5',
-      //   extra: {
-      //     url: location.origin + `/#${url}`
-      //   },
-      //   routerInfo: {
-      //     path: url
-      //   }
-      // })
     },
     //添加被保险人 添加一个没有险种的被保险人
     addPerson(item) {

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/ProposalInfo.vue

@@ -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>
@@ -395,6 +399,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)

src/views/ebiz/sale/AddBeneficiaryInfo.vue

@@ -241,7 +241,6 @@ 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'
@@ -641,9 +640,6 @@ 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
@@ -668,9 +664,63 @@ export default {
             if (this.userInfo.idType == '1') {
               //获取年龄
               let age = utilsAge.getAge(this.userInfo.birthday, new Date())
-              if(this.userInfo.birthday){
-                this.userInfo.certificateValidate = countCredentialValidity.getStartDate(age,val)
-              }
+              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('身份证不支持此年龄段')
+              // }
             }
           }
           break
@@ -696,13 +746,6 @@ 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
       }
@@ -918,36 +961,50 @@ export default {
           //年龄在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周岁以上的证件有效期为长期')
             }
           }
@@ -1285,14 +1342,6 @@ 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,7 +388,6 @@ 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'
@@ -859,14 +858,20 @@ 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())) {
@@ -876,10 +881,65 @@ export default {
             }
             //身份证证件类型的判断
             if (this.userInfo.idType == '1') {
+              //获取年龄
               let age = utilsAge.getAge(this.userInfo.birthday, new Date())
-              if(this.userInfo.birthday){
-                this.userInfo.certificateValidate = countCredentialValidity.getStartDate(age,val)
-              }
+              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('身份证不支持此年龄段')
+              // }
             }
           }
           break
@@ -901,12 +961,6 @@ 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
       }
@@ -1000,9 +1054,32 @@ 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)
@@ -1037,39 +1114,71 @@ export default {
           //年龄在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) {
+            if (this.userInfo.effectiveDateType == false) { 
+              this.userInfo.certiexpiredate = ''
+              this.$refs.certiexpiredate.date = ''
               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,7 +452,6 @@ 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'
@@ -1063,9 +1062,6 @@ 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
@@ -1092,9 +1088,62 @@ export default {
               //获取年龄
               let age = utilsAge.getAge(this.userInfo.birthday, new Date())
               console.log(age)
-              if(this.userInfo.birthday){
-                this.userInfo.certificateValidate = countCredentialValidity.getStartDate(age,val)
-              }
+              //年龄在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('身份证不支持此年龄段')
+              // }
             }
           }
           break
@@ -1121,14 +1170,24 @@ 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.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)
-            }
+            //出生证有效期
+            // 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('出生证有效期或出生日期有误')
+            //   }
+            // }
           }
           break
       }
@@ -1413,39 +1472,53 @@ export default {
           //年龄在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) {
+            if (this.userInfo.effectiveDateType == false) { 
+              this.userInfo.certiexpiredate = ''
+              this.$refs.certiexpiredate.date = ''
               return this.$toast('65周岁以上的证件有效期为长期')
             }   
-          }
+          } 
           //年龄在0-15周岁之间
           // if (age <= 15) {
           //   if (Date.parse(this.userInfo.certiexpiredate) - Date.parse(new Date()) > Date.parse('1975-01-01')) {
@@ -1930,27 +2003,36 @@ 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/SignatureOfElectronic.vue

@@ -606,10 +606,12 @@ export default {
                 this.$toast.clear()
                 if (JSON.parse(data).state == '1') {
                   this.base64 = decodeURI(JSON.parse(data).sign)
-                  this.appntSign.documentStatus = '3'
-                  this.isDisabledComplite = false
-                  this.isSubmit = false
-                  this.isSign = false
+                  if(this.base64){
+                    this.appntSign.documentStatus = '3'
+                    this.isDisabledComplite = false
+                    this.isSubmit = false
+                    this.isSign = false
+                  }
                 }
               })
             }

src/views/ebiz/sale/insuranceClauses.vue

@@ -148,11 +148,6 @@ 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
                 }