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

src/api/ebiz/sale/sale.js

@@ -1,7 +1,6 @@
 import request from '@/assets/js/utils/request'
 import request1 from '@/assets/js/utils/request1'
 import getUrl from '@/assets/js/utils/get-url'
-import store from '@/store'
 // 保费计算
 export function saveOrUpdateOrderInfo(data) {
   return request({
@@ -100,15 +99,6 @@ export function uploadImg(data) {
     data
   })
 }
-
-// 上传图片
-export function uploadImg2(data) {
-  return request1({
-    url: getUrl('/uploadImage?imgType='+store.getters.getUploadImgType+'&orderNo='+store.getters.getUploadImgOrderNo, 1, 2),
-    method: 'post',
-    data
-  })
-}
 /*
 // 人脸识别
 export function recognition(data) {

src/assets/js/business-common.js

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

src/assets/js/utils/countCredentialValidity.js

@@ -1,88 +0,0 @@
-import utilsAge from '@/assets/js/utils/age'
-export default {
-  //计算身份证起始日期
-  getStartDate: function(birthday, endDate) {
-    let startDate = '' //证件起始日期
-    let startage = ''
-    let endage = utilsAge.getAge(birthday, new Date(endDate))
-
-    /**
-     * @Author: LiuXiaoFeng
-     * @Description: 未满16周岁的公民申领的居民身份证有效期为5年
-     * @Date: 2023/7/4
-     **/
-    if (endage - 5 < 16) {
-      return startDate = String(Number(endDate.slice(0,4)) - 5) + endDate.slice(4,11)
-    }
-    /**
-     * @Author: LiuXiaoFeng
-     * @Description: 年满16周岁至25周岁的公民申领的居民身份证有效期为10年
-     * @Date: 2023/7/4
-     **/
-    else if (endage - 5 >= 16 && endage - 10 <= 25) {
-      startDate = String(Number(endDate.slice(0,4)) - 10) + endDate.slice(4,11)
-      startage = utilsAge.getAge(birthday, new Date(startDate))
-      if(startage >= 16 && startage <= 25){
-        return startDate
-      }
-    }
-    /**
-     * @Author: LiuXiaoFeng
-     * @Description: 年满26周岁至45周岁的公民申领的居民身份证有效期为20年
-     * @Date: 2023/7/4
-     **/
-    else if(endage - 10 >= 26 && endage - 20 <= 45) {
-      startDate = String(Number(endDate.slice(0,4)) - 20) + endDate.slice(4,11)
-      startage = utilsAge.getAge(birthday, new Date(startDate))
-      if(startage >= 26 && startage <= 45){
-        return startDate
-      }
-    }
-    /**
-     * @Author: LiuXiaoFeng
-     * @Description: 年满46周岁的公民申领居民身份证有效期为长期
-     * @Date: 2023/7/4
-     **/
-    else if (endage - 20 >= 46) {
-      return startDate
-    }
-  },
-
-  //计算身份证截止日期
-  getEndDate: function(birthday, startDate) {
-    let endDate = '' //证件截止日期
-    let startage = utilsAge.getAge(birthday, new Date(startDate))
-    /**
-     * @Author: LiuXiaoFeng
-     * @Description: 未满16周岁的公民申领的居民身份证有效期为5年
-     * @Date: 2023/7/4
-     **/
-    if (startage < 16) {
-      return endDate = String(Number(startDate.slice(0, 4)) + 5) + startDate.slice(4, 11)
-    }
-    /**
-     * @Author: LiuXiaoFeng
-     * @Description: 年满16周岁至25周岁的公民申领的居民身份证有效期为10年
-     * @Date: 2023/7/4
-     **/
-    else if (startage >= 16 && startage <= 25) {
-      return endDate = String(Number(startDate.slice(0, 4)) + 10) + startDate.slice(4, 11)
-    }
-    /**
-     * @Author: LiuXiaoFeng
-     * @Description: 年满26周岁至45周岁的公民申领的居民身份证有效期为20年
-     * @Date: 2023/7/4
-     **/
-    else if (startage >= 26 && startage <= 45) {
-      return endDate = String(Number(startDate.slice(0, 4)) + 20) + startDate.slice(4, 11)
-    }
-    /**
-     * @Author: LiuXiaoFeng
-     * @Description: 年满46周岁的公民申领居民身份证有效期为长期
-     * @Date: 2023/7/4
-     **/
-    else if (startage > 65) {
-      return endDate
-    }
-  }
-}

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

@@ -3793,38 +3793,6 @@ export default {
     {
       code: "riskAC_M",
       label: "元"
-    },
-    {
-      code: "CardiovascularCerebrovascularDiseasesInsurance",
-      label: "元"
-    },
-    {
-      code: "childrenSpecificDiseaseInsurance",
-      label: "元"
-    },
-    {
-      code: "maleSpecificDiseaseInsurance",
-      label: "元"
-    },
-    {
-      code: "femaleSpecificDiseaseInsurance",
-      label: "元"
-    },
-    {
-      code: "supplementarySpecificDiseaseInsurance",
-      label: "元"
-    },
-    {
-      code: "deductible",
-      label: "免赔额"
-    },
-    {
-      code: "accidentalDeductible",
-      label: "元"
-    },
-    {
-      code: "accidentalLimit",
-      label: "%"
     }
   ],
   // 卡单与短期险重新投保选择职业类别时，两个模块职业类型数据的排序不同，创建这个数据字典，用于在选择职业类别时，作为一个参数传入组件，

src/assets/js/utils/permission.js

@@ -5,14 +5,12 @@ import CacheUtils from '@/assets/js/utils/cacheUtils'
 // import 'nprogress/nprogress.css' // Progress 进度条样式
 export function permission() {
   router.beforeEach((to, from, next) => {
+    // NProgress.start()
     //修改title
     const title = to.meta && to.meta.title
     if (title) {
       document.title = title
     }
-    if(from.path == '/sale/signatureConfirmation' && to.path == '/sale/attachmentManagement'){
-      window.location.href = window.location.origin + '#' + from.path + '?orderNo=' + from.query.orderNo
-    }
     //判断是否登录
     let token = CacheUtils.getLocItem('token')
     if (!token) {

src/components/ebiz/customer/formBlock.vue

@@ -653,6 +653,12 @@ 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/store/index.js

@@ -28,11 +28,6 @@ export default new Vuex.Store({
     secondManageCode: '', //内勤所需参数
     orderDetail: {},//无优卡分享微信端订单信息
     answerType: false,//风险测评tab是否显示
-    YBidNo: '', //银保代理人电子化合同签署证件号码
-    YBname: '', //银保代理人电子化合同签署姓名
-    YBuuid: '', //银保代理人电子化合同签署代理人uuid
-    uploadImgType: '',
-    uploadImgOrderNo: '',
   },
   mutations: {
     setOrderDetail (state, data) {
@@ -80,23 +75,8 @@ export default new Vuex.Store({
       state.pcList = val
     },
     //更新 风险测评是否显示状态
-    updateUploadImgType (state, val) {
-      state.uploadImgType = val
-    },
-    updateUploadImgOrderNo (state, val) {
-      state.uploadImgOrderNo = val
-    },
-    //更新 银保代理人电子化合同签署证件号码
-    updateYBidNo (state, val) {
-      state.YBidNo = val
-    },
-    //更新 银保代理人电子化合同签署姓名
-    updateYBname (state, val) {
-      state.YBname = val
-    },
-    //更新 银保代理人电子化合同签署代理人uuid
-    updateYBuuid (state, val) {
-      state.YBuuid = val
+    updateAnswerType (state, val) {
+      state.answerType = val
     },
   },
   getters: {
@@ -124,21 +104,6 @@ export default new Vuex.Store({
     getAnswerType (state) {
       return state.answerType
     },
-    getUploadImgType (state) {
-      return state.uploadImgType
-    },
-    getUploadImgOrderNo (state) {
-      return state.uploadImgOrderNo
-    },
-    getYBidNo (state) {
-      return state.YBidNo
-    },
-    getYBname (state) {
-      return state.YBname
-    },
-    getYBuuid (state) {
-      return state.YBuuid
-    },
   }
 })
 

src/views/ebiz/cardList/CardTotreasure.vue

@@ -329,7 +329,6 @@ export default {
       let orderStatus = order.orderStatus
       console.log(order.orderStatus,'fdkfa')
       let cardOrderNo = order.orderNo
-      localStorage.setItem('orderNo', JSON.stringify(cardOrderNo))
       let url
       if(orderStatus == '59'){
         url =`/cardList/GroupAppntInfo?cardOrderNo=${cardOrderNo}&editOrder=1`

src/views/ebiz/cardList/GroupCheckInfo.vue

@@ -54,7 +54,7 @@
 </template>
 
 <script>
-  import {Field, GoodsAction, GoodsActionIcon, GoodsActionButton, Icon, Collapse, CollapseItem, Dialog} from 'vant'
+import { Field, GoodsAction, GoodsActionIcon, GoodsActionButton, Icon ,Collapse, CollapseItem} 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,8 +79,7 @@ export default {
       riskDTO: {},
       productDate: '',
       orderInfoDTO:{},
-      isGroupCard:'',
-      mainRiskCode: ''
+      isGroupCard:''
     //   isLessEighteen: true   // 被保人手机号和邮箱默认展示
     }
   },
@@ -102,11 +101,6 @@ 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]
@@ -138,37 +132,15 @@ export default {
   },
   methods: {
     nextStep() {
-      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
-          }
-        })
-      }
+      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,7 +290,6 @@ export default {
       accBankProvince: '',
       accBankCity: '',
       areaStr: '',
-      mainRiskCode: '',
       isGroupCard:'' //1 团险标识
     }
   },
@@ -311,13 +310,17 @@ export default {
       this.bankListName = orderDetail.orderAccountDTO.bankName
       this.orderStatus = orderDetail.orderInfoDTO.orderStatus
       localStorage.orderNo = orderDetail.orderInfoDTO.orderNo
-      orderDetail.insuredDTOs.forEach(item=>{
-        item.riskDTOLst.forEach(ii=>{
-          if(ii.isMainRisk == '0'){
-            this.mainRiskCode = ii.mainRiskCode
-          }
-        })
-      })
+      // this.radio = '3'
+      // this.isLoading = true
+      // this.$toast.loading({
+      //   duration: 0, // 持续展示 toast
+      //   forbidClick: true, // 禁用背景点击
+      //   loadingType: 'spinner',
+      //   message: '加载中……'
+      // })
+      // setTimeout(() => {
+      //   this.pay()
+      // }, 500)
     } else {
       document.title = '支付分享'
       // 再次支付 调详情 获取信息
@@ -510,13 +513,6 @@ 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) {
@@ -746,69 +742,58 @@ 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: '加载中……'
           })
-          this.acceptInsurance()
-        }
 
+          // 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,8 +127,7 @@ 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 = afterDate.getAfterDateTime(insuYear.cvaliDate,1)
+    productDateTime = productDate.getFullYear() + '年' + insuYearM + '月' + insuYearD + '日'
     this.productDate = currentData + '0时至' + productDateTime + '24时止'
     this.orderAmount = this.orderDTO.orderInfoDTO.orderAmount
   },

src/views/ebiz/common/CalculatePremium.vue

@@ -13,9 +13,9 @@
         <van-tag type="primary" v-if="item.isMainRisk == 0" class="mr5 green" plain>主险</van-tag>
         <van-tag type="primary" v-else class="mr5 green" plain>附加险</van-tag>
         <span class="ml5 center fs13 flex1">{{ item.riskName }}</span>
-        <van-tag type="primary" v-if="item.isMainRisk == 0 && item.hasAddtionRisk && isEnterAddtionRisk" plain @click="selectAddtionRisk" class="green mr8">
-          附
-        </van-tag>
+        <van-tag type="primary" v-if="item.isMainRisk == 0 && item.hasAddtionRisk && isEnterAddtionRisk" plain @click="selectAddtionRisk" class="green mr8"
+        >附</van-tag
+        >
         <van-icon name="search" size="20" v-if="item.documentDTOS && item.documentDTOS.length > 0" @click="seeDocument(index)" class="green mr5" />
         <van-icon name="delete" size="22" @click="deleteRisk(index,item)" class="green" />
       </div>
@@ -109,7 +109,6 @@
                       item.productCode == 'GFRS_M0051' ||
                       item.productCode == 'GFRS_M0054' ||
                       item.productCode == 'GFRS_M0073' ||
-                      item.productCode == 'GFRS_M0077' ||
                       item.productCode == 'GFRS_M0057'
                     )
                   "
@@ -128,7 +127,6 @@
                         item.productCode == 'GFRS_M0051' ||
                         item.productCode == 'GFRS_M0054' ||
                         item.productCode == 'GFRS_M0073' ||
-                        item.productCode == 'GFRS_M0077' ||
                         item.productCode == 'GFRS_M0057'
                       )
                     "
@@ -355,17 +353,8 @@
     <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>
-        <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><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>
     </van-dialog>
@@ -378,7 +367,6 @@ 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的责任的验证规则
@@ -667,9 +655,6 @@ 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'?'男':'女'
@@ -749,42 +734,6 @@ export default {
             }
           })
         }
-        if (item.mainRiskCode == 'GFRS_M0077') {
-          item.calFactorLst.map((i) => {
-            if (i.code == 'dutyGroup') {
-              if(i.rules && i.rules.length != 0) {
-                i.rules.forEach(ii=>{
-                  if(this.saleInsuredPersonInfo.insuredAge < 18) {
-                    if(ii.duty == '311504'){
-                      ii.necess = true
-                      ii.defaultValue = '0'
-                    } else {
-                      ii.defaultValue = '0'
-                    }
-                  }else{
-                    if(this.saleInsuredPersonInfo.sex == '0'){
-                      if(ii.duty == '311505'){
-                        ii.necess = true
-                        ii.defaultValue = '0'
-                      }
-                      if(ii.duty == '311504' || ii.duty == '311506'){
-                        ii.defaultValue = '0'
-                      }
-                    } else {
-                      if(ii.duty == '311506'){
-                        ii.defaultValue = '0'
-                        ii.necess = true
-                      }
-                      if(ii.duty == '311504' || ii.duty == '311505'){
-                        ii.defaultValue = '0'
-                      }
-                    }
-                  }
-                })
-              }
-            }
-          })
-        }
         if (item.mainRiskCode == 'GFRS_M0046') {
           if (this.saleInsuredPersonInfo.relationToAppnt == 1) {
             this.isEnterAddtionRiskListFunc()
@@ -812,11 +761,25 @@ export default {
           }
         }
 
-        //保存主险险种编号
-        if (item.isMainRisk == 0) {
-          this.mainRiskCode = item.mainRiskCode
-        }
-      })
+          // if (item.productCode == 'GFRS_A0003') {
+          //   //该附加险的责任保额=主险的保费
+          //   item.calFactorLst.map(v => {
+          //     if (v.code == 'dutyGroup' && v.rules.length > 0) {
+          //       v.rules.map(y => {
+          //         if (y.defaultDutyAmt === null) {
+          //           y.defaultDutyAmt = (JSON.parse(localStorage.trialList)[0].prem / 10000).toFixed(6)
+          //         }
+          //         y.moneyUnit = 10000
+          //         y.changeWithMainRisk = true //责任险保额=主险保费，不允许用户手动更改
+          //       })
+          //     }
+          //   })
+          // }
+          //保存主险险种编号
+          if (item.isMainRisk == 0) {
+            this.mainRiskCode = item.mainRiskCode
+          }
+        })
       if (this.mainRiskCode == 'GFRS_M0005') {
         this.chooseProducts.map((item) => {
           if (item.productCode == 'GFRS_A0004') {
@@ -874,6 +837,91 @@ export default {
           rules.forEach((item) => {
             let config = ''
             config = JSON.parse(item.ruleExpression)
+            // let errorMsg = item.errorMsg;
+            // config = {
+            //   eventName: 'GFRS_M0020_payEndYear_insuYear',
+            //   eventType: 'onConfirm',
+            //   funBody: [
+            //   'let ageMap = {',
+            //   '  "10Y":{"30Y": 55,"70A": 55,"88A": 55},',
+            //   '  "20Y":{ "30Y": 55, "70A": 50, "88A": 55 }, ',
+            //   '  "30Y":{ "30Y": 45, "70A": 40, "88A": 45 },',
+            //   '};',
+            //   'let payEndYear = "";',
+            //   'let insuYear = "";',
+            //   'let age = this.saleInsuredPersonInfo.insuredAge;',
+            //   'let parObj = {};',
+            //   'par.map(item => {',
+            //   '   parObj[item.code] = item;',
+            //   '});',
+            //   'if(ParKey == "payEndYear"){',
+            //   '  payEndYear = Par.value + Par.flag;',
+            //   '  lintAgeObj = ageMap[payEndYear];',
+            //   '  let flag = true, num = parObj.insuYear.columns.length;',
+            //   '  parObj.insuYear.columns.forEach(item => {',
+            //   '    let lintAge = lintAgeObj[ item.value + item.flag ];',
+            //   '    if( age > lintAge ){',
+            //   '      item.disabled = true;',
+            //   '      num = num - 1 ;',
+            //   '    }else{',
+            //   '      if(flag){',
+            //   '        parObj.insuYear.insuYear = item.value;',
+            //   '        parObj.insuYear.insuYearFlag = item.flag;',
+            //   '        parObj.insuYear.showContent = item.text;',
+            //   '        flag = false;',
+            //   '      };',
+            //   '      item.disabled = false;',
+            //   '    };',
+            //   '  });',
+            //   '  if(!num){',
+            //   '    this.errorMsg.push("被保险人年龄不符合当前所选交费期间");',
+            //   '    payEndYear = parObj.payEndYear.payEndYear + parObj.payEndYear.payEndYearFlag;',
+            //   '    lintAgeObj = ageMap[payEndYear];',
+            //   '    parObj.insuYear.columns.forEach(item => {',
+            //   '      let lintAge = lintAgeObj[ item.value + item.flag ];',
+            //   '      if( age > lintAge ){',
+            //   '        item.disabled = true;',
+            //   '      }else{',
+            //   '        item.disabled = false;',
+            //   '      };',
+            //   '    });',
+            //   '    return false;',
+            //   '  };',
+            //   '  return true;',
+            //   '}'],
+            //   funPar: ['par','ParKey','Par'],
+            // }
+            // config = {
+            //   eventName: 'GFRS_A0003_noMainCode',
+            //   eventType: 'init',
+            //   initBody: [
+            //   'for(let item of that.chooseProducts){',
+            //   '  if(item.productCode == "GFRS_A0003"){',
+            //   '    for(let itemC of item.calFactorLst){',
+            //   '      if(itemC.code == "dutyGroup"){',
+            //   '        for(let itemR of itemC.rules){',
+            //   '          that.$emit("GFRS_A0003_noMainCode", itemR, that.mainRiskCode)',
+            //   '        }',
+            //   '      }',
+            //   '    }',
+            //   '  }',
+            //   ' }',
+            //   ],
+            //   funBody: [
+            //     'let noMainCode = {',
+            //     '  "GFRS_M0004" : true,',
+            //     '  "GFRS_M0011" : true',
+            //     '};',
+            //     'let noduty = {',
+            //     '  "310101" : true',
+            //     '};',
+            //     'if(noMainCode[mainRiskCode] && noduty[dutyItem.duty]){',
+            //     '  dutyItem.necess = false;',
+            //     '  dutyItem.isDisabled = true;',
+            //     '}',
+            //     ],
+            //   funPar:['dutyItem', 'mainRiskCode'],
+            // }
             this.$on(config.eventName, new Function(...config.funPar, config.funBody.join('')))
             if (config.eventType == 'init') {
               let initFn = new Function('that', config.initBody.join(''))
@@ -2290,7 +2338,7 @@ export default {
             this.saleInsuredInfo.sex,
             this.saleInsuredInfo.occupationCode,
             this.saleInsuredInfo.occupationName,
-            this.saleInsuredPersonInfo.insuredAge
+            this.saleInsuredInfo.insuredAge?this.saleInsuredInfo.insuredAge:this.saleInsuredInfo.age,
           ]
         } else {
           ;[birthday, sex, occupationCode, occupationName, age] = [
@@ -2298,7 +2346,7 @@ export default {
             this.saleInsuredPersonInfo.sex,
             this.saleInsuredPersonInfo.occupationCode,
             this.saleInsuredPersonInfo.occupationName,
-            this.saleInsuredPersonInfo.insuredAge
+            this.saleInsuredPersonInfo.insuredAge?this.saleInsuredPersonInfo.insuredAge:this.saleInsuredPersonInfo.age
           ]
         }
         trialInfo = Object.assign(trialInfo, {
@@ -2589,42 +2637,6 @@ export default {
           this.getTrial()
         }
       }
-      else if (productCode == 'GFRS_M0076') {
-        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].maxPrem) * 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].maxPrem) * 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('出生满 28 天至 50周岁最低基本保险金额为'+ (Number(riskFactor.rules[0].minPrem) * 10000) +'元,最高投保金额为'+ (Number(riskFactor.rules[0].maxPrem) * 10000) +'元。')
-            this.nextStepFlag = true
-          } else {
-            if ((Number(defalutValue) * 10000) % (Number(currentEle.limit) * 10000) != 0) {
-              this.$toast('出生满 28 天至 50周岁最低基本保险金额为'+ (Number(riskFactor.rules[0].minPrem) * 10000) +'元,最高投保金额为'+ (Number(riskFactor.rules[0].maxPrem) * 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.isTrial === '0' && this.chooseProducts[productIndex].isMainRisk == '0') {
         if (Number(defalutValue) < Number(min)) {
           if (riskFactor.yearWay == "一次性交清") {
@@ -2784,7 +2796,6 @@ export default {
               this.trialList[index].productCode == 'GFRS_M0051' ||
               this.trialList[index].productCode == 'GFRS_M0054' ||
               this.trialList[index].productCode == 'GFRS_M0073' ||
-              this.trialList[index].productCode == 'GFRS_M0077' ||
               this.trialList[index].productCode == 'GFRS_M0057'
             ) {
               riskItem['dutyLst'] = this.trialInfos[index].duty
@@ -2847,7 +2858,7 @@ export default {
       //国富人寿桂企保重大疾病保险产品专写
       this.trialInfos.map((v, i) => {
         if (v.productCode == 'GFRS_M0024' || v.productCode == 'GFRS_M0040' || v.productCode == 'GFRS_M0044'
-                || v.productCode == 'GFRS_M0046'|| v.productCode == 'GFRS_M0051'|| v.productCode == 'GFRS_M0057' || v.productCode == 'GFRS_M0073'|| v.productCode == 'GFRS_M0077') {
+                || v.productCode == 'GFRS_M0046'|| v.productCode == 'GFRS_M0051'|| v.productCode == 'GFRS_M0057' || v.productCode == 'GFRS_M0073') {
           delete riskDTOLst[i].duty
         }
       })
@@ -2855,7 +2866,7 @@ export default {
       //建议书需要添加全部投保人信息，电投只需要投保人ID
       let insuredDTOItem = Object.assign(this.saleInsuredPersonInfo, { riskDTOLst: riskDTOLst })
       if (!insuredDTOItem.insuredAge) {
-        insuredDTOItem.insuredAge = insuredDTOItem.birthday ? utilsAge.getAge(insuredDTOItem.birthday, new Date()) : insuredDTOItem.age
+        insuredDTOItem.insuredAge = insuredDTOItem.age
       }
       let orderNo = localStorage.isFrom == 'proposal'?this.$route.query.proposalOrderNo:this.$route.query.orderNo
       let params = {
@@ -2966,7 +2977,7 @@ export default {
           }
         })
         let data = {
-          serialNo:this.$route.query.proposalOrderNo,
+          serialNo:this.$CacheUtils.getLocItem('proposalNo'),
           mainRiskId:insuanceId+'',
           trialJsonStr:localStorage.chooseProducts
         }

src/views/ebiz/product/HomeProduct.vue

@@ -44,7 +44,7 @@
           <div class="pcenter-list mr20 mb10 ml15">
             <template v-if="branchType != '6'">
               <div class="pcenter-item text-center">
-                <img src="../../../assets/images/home_cp_1.png" style="width: 100%;" @click="goDetail('GFRSPRO_M0073')" />
+                <img src="../../../assets/images/home_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_M0072')" />
@@ -122,7 +122,7 @@
         <div class="home-product-pcenter">
           <div class="pcenter-list mr20 mb10 ml15">
             <div class="pcenter-item text-center">
-              <img src="../../../assets/images/home_cp_1.png" style="width: 100%;" @click="goDetail('GFRSPRO_M0073')" />
+              <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_M0072')" />

src/views/ebiz/proposal/PDF.vue

@@ -4,12 +4,11 @@
   </div>
 </template>
 <script>
-import { makePdf, share, getDemo } from '@/api/ebiz/proposal/proposal.js'
+import { makePdf, share } 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() {
@@ -17,8 +16,7 @@ export default {
     return {
       pdfUrl: '',
       isWeixin,
-      title: '',
-      agent:{}
+      title: ''
     }
   },
   components: {
@@ -33,7 +31,7 @@ export default {
       this.init()
     }
   },
-  async mounted() {
+  mounted() {
     let riskCode = localStorage.pdfShareCode
     dataDictionary.riskType.some(item => {
       if (item.code == riskCode) {
@@ -41,78 +39,10 @@ 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: shareContent
+      desc: '国富为您量身定制的保险产品，请查收'
     })
     //重置左上角按钮，变成返回
     window.EWebBridge.webCallAppInJs("webview_left_button",{
@@ -179,15 +109,10 @@ 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 = this.agent.name+'为您设计的专属保险计划书，请查阅！因为国富，所以民安！';
+        shareContent='国富为您量身定制的保险产品，请查收';
       }
       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">{{mainRiskName}}</div>
+          <div class="white fw500 fs18 div_2">家庭保障计划</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)">
@@ -283,7 +283,7 @@
       </div>
       <div class="div_02">
         <div class="text-center div_021">
-          <div class="text-center div_022">{{mainRiskName}}</div>
+          <div class="text-center div_022">家庭保障计划</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>
@@ -386,7 +386,6 @@ export default {
       mainRiskCodes: [],
       time: 5,
       proposalNo:'',
-      mainRiskName: ''
     }
   },
   filters: {
@@ -449,7 +448,6 @@ export default {
       })
     }, 1000)
     window['appCallBack'] = this.appCallBack*/
-    // init方法在微信端存储token，接口请求用此token，所以init方法前不要请求接口，会影响分享微信功能，接口会报token为空
     this.init()
     //校验当前用户权限
     funcPermCheck({}).then(res => {
@@ -609,7 +607,7 @@ export default {
       }
     },
     async sharePeople() {
-      console.log(this.pageShowInfo.insuredDTOs,'this.pageShowInfo.insuredDTOs')
+      console.log(this.agent,'this.agent.name')
       let date = new Date()
       let month = date.getMonth() + 1
       if (month <= 9) {
@@ -621,34 +619,25 @@ 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].ggrade!='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].sgrade&&resData.content[0].sgrade!='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)
@@ -659,23 +648,11 @@ export default {
         riskCodeList.push(item.riskCode)
       })
       let sameRisk = isAllEqual(riskCodeList)
-      // 一、单个被保险人
-      // 1、1个主险（含附加险）的情况，直接显示“主险产品名称”
-      // 2、有2个及以上主险组合，建议书名称显示“保险产品组合计划”
-      // 二、有多个被保险人
-      // 都显示“家庭保障计划”
+      // 以主险为单位，一个主险，显示主险名称。 多个主险，显示“家庭综合保障计划”，跟被保人人数无关
       if(sameRisk){
-        if(this.pageShowInfo.insuredDTOs.length > 1){
-          title='家庭保障计划'
-        }else{
-          title= riskList[0].riskName
-        }
+        title= riskList[0].riskName
       }else{
-        if(this.pageShowInfo.insuredDTOs.length > 1){
-          title='家庭保障计划'
-        }else{
-          title= '保险产品组合计划'
-        }
+        title='家庭综合保障计划'
       }
       let res = await getSharingToken({ shareType: 'proposal_demonstrate' })
       if (res.result == '0') {
@@ -725,32 +702,6 @@ 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
@@ -940,17 +891,7 @@ export default {
     },
     //跳转到pdf 进入建议书后 根据建议书编码来查找相应的pdf
     async goPDF() {
-      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.$router.push({ path: '/proposal/pdf' })
       // this.$jump({
       //   flag: 'h5',
       //   extra: {

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
       }
@@ -915,44 +958,53 @@ 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周岁以上的证件有效期为长期')
             }
           }
@@ -1254,7 +1306,7 @@ export default {
       let year = date.getFullYear()
       let month = date.getMonth() + 1
       month = month.toString().padStart(2, '0')
-      let day = Number(date.getDate()) + 1
+      let day = date.getDate()
       day = day.toString().padStart(2, '0')
       return `${year}-${month}-${day}`
     },
@@ -1290,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(this.userInfo.birthday,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,9 +881,65 @@ export default {
             }
             //身份证证件类型的判断
             if (this.userInfo.idType == '1') {
-              if(this.userInfo.birthday){
-                this.userInfo.certificateValidate = countCredentialValidity.getStartDate(this.userInfo.birthday,val)
-              }
+              //获取年龄
+              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('身份证不支持此年龄段')
+              // }
             }
           }
           break
@@ -900,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(this.userInfo.birthday,this.userInfo.certificateValidate)
-            }
-            if (this.userInfo.certiexpiredate && !this.userInfo.certificateValidate) {
-              this.userInfo.certificateValidate = countCredentialValidity.getEndDate(this.userInfo.birthday,this.userInfo.certiexpiredate)
-            }
           }
           break
       }
@@ -999,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)
@@ -1032,48 +1110,75 @@ 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('您的证件已过期')
-          }
+          let val = this.userInfo.certiexpiredate 
           //年龄在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(this.userInfo.birthday,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(this.userInfo.birthday,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(this.userInfo.birthday,this.userInfo.certificateValidate)
-            }
-            if (this.userInfo.certiexpiredate && !this.userInfo.certificateValidate) {
-              this.userInfo.certificateValidate = countCredentialValidity.getEndDate(this.userInfo.birthday,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
       }
@@ -1410,47 +1469,56 @@ 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) {
+            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')) {
@@ -1836,7 +1904,7 @@ export default {
       let year = date.getFullYear()
       let month = date.getMonth() + 1
       month = month.toString().padStart(2, '0')
-      let day = Number(date.getDate()) + 1
+      let day = date.getDate()
       day = day.toString().padStart(2, '0')
       return `${year}-${month}-${day}`
     },
@@ -1935,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/List.vue

@@ -13,7 +13,16 @@
       </van-tabs>
     </van-sticky>
 
-    <van-list v-model="loading" :immediate-check="false" :finished="finished" :finished-text="finishedText" error-text="请求失败，点击重新加载" :error.sync="error" @load="loadMore" class="pb45">
+    <van-list
+      v-model="loading"
+      :immediate-check="false"
+      :finished="finished"
+      :finished-text="finishedText"
+      error-text="请求失败，点击重新加载"
+      :error.sync="error"
+      @load="loadMore"
+      class="pb45"
+    >
       <div v-if="isSuccess">
         <div v-if="saleList.length > 0">
           <div v-for="(order, index) in saleList" :key="index">
@@ -74,38 +83,57 @@
               </div>
 
               <div class="text-right mt15 ">
-                <van-button v-if="active == 'uncommit'" round @click="goDetail(order)" size="small" class="mr5" type="danger" v-no-more-click="1000">
-                  编辑
-                </van-button>
-                <van-button v-if="active == 'uncommit'" plain round @click.stop="del(order, index)" size="small" class="mr5" type="danger" v-no-more-click="1000">
-                  删除
-                </van-button>
-                <van-button @click="againPay(order)" v-if="active == 'commit' && order.orderInfoDTO.orderStatus == '19'" size="small" class="mr5" type="danger" round>
-                  重新支付
-                </van-button>
-                <van-button @click="changeCard(order)" v-if="(active == 'commit' && order.orderInfoDTO.orderStatus == '48') || (active == 'commit' && order.orderInfoDTO.orderStatus == '49')" size="small" class="mr5" type="danger" round>
-                  修改卡号
-                </van-button>
+                <van-button v-if="active == 'uncommit'" round @click="goDetail(order)" size="small" class="mr5" type="danger" v-no-more-click="1000"
+                  >编辑</van-button
+                >
+                <van-button
+                  v-if="active == 'uncommit'"
+                  plain
+                  round
+                  @click.stop="del(order, index)"
+                  size="small"
+                  class="mr5"
+                  type="danger"
+                  v-no-more-click="1000"
+                  >删除</van-button
+                >
+                <van-button
+                  @click="againPay(order)"
+                  v-if="active == 'commit' && order.orderInfoDTO.orderStatus == '19'"
+                  size="small"
+                  class="mr5"
+                  type="danger"
+                  round
+                  >重新支付</van-button
+                >
+                <van-button
+                  @click="changeCard(order)"
+                  v-if="(active == 'commit' && order.orderInfoDTO.orderStatus == '48') || (active == 'commit' && order.orderInfoDTO.orderStatus == '49')"
+                  size="small"
+                  class="mr5"
+                  type="danger"
+                  round
+                  >修改卡号</van-button
+                >
                 <template v-if="active == 'commit' && order.orderInfoDTO.orderStatus == '55'">
-                  <van-button @click="changeCard(order)" size="small" class="mr5" type="danger" round>
-                    修改卡号
-                  </van-button>
-                  <van-button @click="againPay(order)" size="small" class="mr5" type="danger" round>
-                    重新支付
-                  </van-button>
+                  <van-button @click="changeCard(order)" size="small" class="mr5" type="danger" round>修改卡号</van-button>
+                  <van-button @click="againPay(order)" size="small" class="mr5" type="danger" round>重新支付</van-button>
                 </template>
                 <template v-if="active == 'commit' && (order.orderInfoDTO.orderStatus == '02' || order.orderInfoDTO.orderStatus == '58')">
-                  <van-button @click="goPay(order)" size="small" class="mr5" type="danger" round>
-                    去支付
-                  </van-button>
+                  <van-button @click="goPay(order)" size="small" class="mr5" type="danger" round>去支付</van-button>
                 </template>
                 <!-- doubleFlag 1-否  0-是，doubleFlag为0双录时，canRevokeDouble加 orderStatus 16 -->
-                <van-button @click="revokeOrder(order)" v-if="active == 'commit' && ((canRevoke[order.orderInfoDTO.orderStatus] && (order.orderInfoDTO.doubleFlag == '1' || order.orderInfoDTO.doubleFlag == null || order.orderInfoDTO.doubleFlag == ''))|| (canRevokeDouble[order.orderInfoDTO.orderStatus] && order.orderInfoDTO.doubleFlag == '0'))" size="small" class="mr5" type="danger" round>
-                  撤单
-                </van-button>
-                <van-button @click="seePolicy(order)" v-if="active == 'commit'" size="small" type="danger" round>
-                  查看投保单
-                </van-button>
+                <van-button
+                  @click="revokeOrder(order)"
+                  v-if="active == 'commit' && ((canRevoke[order.orderInfoDTO.orderStatus] && (order.orderInfoDTO.doubleFlag == '1' || order.orderInfoDTO.doubleFlag == null || order.orderInfoDTO.doubleFlag == ''))
+                  || (canRevokeDouble[order.orderInfoDTO.orderStatus] && order.orderInfoDTO.doubleFlag == '0'))"
+                  size="small"
+                  class="mr5"
+                  type="danger"
+                  round
+                  >撤单</van-button
+                >
+                <van-button @click="seePolicy(order)" v-if="active == 'commit'" size="small" type="danger" round>查看投保单</van-button>
               </div>
             </div>
           </div>
@@ -119,7 +147,16 @@
     </van-list>
 
     <van-button type="danger" class="bottom-btn" @click="add" v-no-more-click="1000">点我新增</van-button>
-    <van-dialog class="dialog-delete" @confirm="checkCaptchaCode" @cancel="cancelCaptchaCode" :before-close="beforeClose" confirm-button-color="#fff" v-model="revokePanelShow" title="短信验证" show-cancel-button>
+    <van-dialog
+      class="dialog-delete"
+      @confirm="checkCaptchaCode"
+      @cancel="cancelCaptchaCode"
+      :before-close="beforeClose"
+      confirm-button-color="#fff"
+      v-model="revokePanelShow"
+      title="短信验证"
+      show-cancel-button
+    >
       <p class="captchaReceiver">投保人手机号: {{ captchaReceiver | phoneNumFilter }}</p>
       <van-field v-model="sms" center clearable placeholder="请输入短信验证码">
         <template #button>
@@ -501,6 +538,44 @@ export default {
       }else if(orderStatus == '63'){//风险测评保存成功, 跳到账户信息--
         url = '/sale/AccountInformation?edit=1&orderNo='+orderNo
       }
+      // switch (orderStatus) {
+      //   case '01': //已签名待客户确认, 跳到签名确认页面
+      //     url = '/sale/SignatureConfirmation?edit=1'
+      //     break
+      //   case '43': //未签名待客户确认, 跳到签名确认页面
+      //     url = '/sale/SignatureConfirmation?edit=1'
+      //     break
+      //   case '35': //投保人保存成功, 跳到被保险人页面--
+      //     url = '/sale/insuredPerson?edit=1'
+      //     break
+      //   case '36': //被保险人保存成功, 跳到已选产品列表
+      //     url = '/common/selectedProduct?edit=1'
+      //     break
+      //   case '37': //受益人保存成功, 跳到告知信息--
+      //     url = '/sale/NotifyingMessage?edit=1'
+      //     break
+      //   case '38': //账户信息保存成功, 跳到附件管理--
+      //     url = '/sale/AttachmentManagement?edit=1'
+      //     break
+      //   case '39': //险种信息保存成功, 跳到已选产品列表
+      //     url = '/common/selectedProduct?edit=1'
+      //     break
+      //   case '40': //告知信息保存成功, 跳到风险测评--
+      //      url = '/sale/answerPage?edit=1'
+      //     break
+      //   case '': //跳到投保人
+      //     url = '/sale/insuredInfo?edit=1'
+      //     break
+      //   case '44': //建议书转投保, 跳到投保人
+      //     url = '/sale/insuredInfo?edit=1'
+      //     break
+      //   case '62': //风险测评保存成功, 跳到账户信息--
+      //     //  url = '/sale/AccountInformation?edit=1'
+      //      url = '/sale/answerSuccess?edit=1'
+      //     break
+      //   default:
+      //     break
+      // }
       this.$jump({
         flag: 'h5',
         extra: {

src/views/ebiz/sale/SignatureConfirmation.vue

@@ -7,8 +7,8 @@
       <div v-if="isWeixin" class="bg-white mt10 p20 fs14 tips">
         <p>
           尊敬的
-          <span>{{ tipsName }}</span>
-          先生/女士，您好！
+          <span>{{ tipsName }}</span
+          >先生/女士，您好！
         </p>
         <p>该保单由国富人寿保险股份有限公司进行承保，具体确认信息如下：</p>
       </div>
@@ -47,9 +47,16 @@
             </div>
             <p class="start" v-if="airSign != '1'">点击【开始】，进行相关操作</p>
             <div v-if="!isInvalid" class="flex justify-content-a mt20">
-              <van-button type="danger" size="normal" class="w150" plain :disabled="changeCard ? agentSign.documentStatus == '1' : agentSignStatus == '3'" v-no-more-click="1000" @click="start_agent('3')">
-                开始
-              </van-button>
+              <van-button
+                      type="danger"
+                      size="normal"
+                      class="w150"
+                      plain
+                      :disabled="changeCard ? agentSign.documentStatus == '1' : agentSignStatus == '3'"
+                      v-no-more-click="1000"
+                      @click="start_agent('3')"
+              >开始</van-button
+              >
             </div>
             <div class="text" v-else>操作时间已失效，请联系销售人员！</div>
           </van-collapse-item>
@@ -82,13 +89,28 @@
             </div>
             <p class="start" v-if="airSign != '1'">点击【开始】或【分享】，进行相关操作</p>
             <div v-if="!isInvalid" class="flex justify-content-a mt20">
-              <van-button v-if="isShow" type="danger" size="normal" class="w150" plain v-no-more-click="1000" :disabled="changeCard ? appntSign.documentStatus == '1' : appntSignStatus == '3'" @click="share(saleInsuredPersonInfo.relationToAppnt == '1' ? '2' : '0')">
-                分享
-              </van-button>
+              <van-button
+                v-if="isShow"
+                type="danger"
+                size="normal"
+                class="w150"
+                plain
+                v-no-more-click="1000"
+                :disabled="changeCard ? appntSign.documentStatus == '1' : appntSignStatus == '3'"
+                @click="share(saleInsuredPersonInfo.relationToAppnt == '1' ? '2' : '0')"
+                >分享</van-button
+              >
               <!-- 前端测试 -->
-              <van-button type="danger" size="normal" class="w150" plain :disabled="changeCard ? appntSign.documentStatus == '1' : appntSignStatus == '3'" v-no-more-click="1000" @click="start_ocr(saleInsuredPersonInfo.relationToAppnt == '1' ? '2' : '0')">
-                开始
-              </van-button>
+              <van-button
+                type="danger"
+                size="normal"
+                class="w150"
+                plain
+                :disabled="changeCard ? appntSign.documentStatus == '1' : appntSignStatus == '3'"
+                v-no-more-click="1000"
+                @click="start_ocr(saleInsuredPersonInfo.relationToAppnt == '1' ? '2' : '0')"
+                >开始</van-button
+              >
             </div>
             <div class="text" v-else>操作时间已失效，请联系销售人员！</div>
           </van-collapse-item>
@@ -112,12 +134,20 @@
               </div>
               <p class="start" v-if="airSign != '1'">点击【开始】或【分享】，进行相关操作</p>
               <div v-if="!isInvalid" class="flex justify-content-a mt20">
-                <van-button v-if="isShow" type="danger" size="normal" class="w150" :disabled="insuredSignStatus == '3'" @click="share('1')" plain v-no-more-click="1000">
-                  分享
-                </van-button>
-                <van-button type="danger" size="normal" plain class="w150" :disabled="insuredSignStatus == '3'" @click="start_ocr('1')" v-no-more-click="1000">
-                  开始
-                </van-button>
+                <van-button
+                  v-if="isShow"
+                  type="danger"
+                  size="normal"
+                  class="w150"
+                  :disabled="insuredSignStatus == '3'"
+                  @click="share('1')"
+                  plain
+                  v-no-more-click="1000"
+                  >分享</van-button
+                >
+                <van-button type="danger" size="normal" plain class="w150" :disabled="insuredSignStatus == '3'" @click="start_ocr('1')" v-no-more-click="1000"
+                  >开始</van-button
+                >
               </div>
               <div class="text" v-else>操作时间已失效，请联系销售人员！</div>
             </van-collapse-item>
@@ -153,9 +183,16 @@
               </div>
               <p class="start" v-if="airSign != '1'">点击【开始】或【分享】，进行相关操作</p>
               <div v-if="!isInvalid" class="flex justify-content-a mt20">
-                <van-button type="danger" size="normal" style="width: 157px" plain :disabled="changeCard ? appntSign.documentStatus == '1' : appntSignStatus == '3'" v-no-more-click="1000" @click="start_ocr(saleInsuredPersonInfo.relationToAppnt == '1' ? '2' : '0')">
-                  开始
-                </van-button>
+                <van-button
+                  type="danger"
+                  size="normal"
+                  style="width: 157px"
+                  plain
+                  :disabled="changeCard ? appntSign.documentStatus == '1' : appntSignStatus == '3'"
+                  v-no-more-click="1000"
+                  @click="start_ocr(saleInsuredPersonInfo.relationToAppnt == '1' ? '2' : '0')"
+                  >开始</van-button
+                >
               </div>
               <div class="text" v-else>操作时间已失效，请联系销售人员！</div>
             </van-collapse-item>
@@ -179,9 +216,16 @@
               </div>
               <p class="start" v-if="airSign != '1'">点击【开始】或【分享】，进行相关操作</p>
               <div v-if="!isInvalid" class="flex justify-content-a mt20">
-                <van-button type="danger" size="normal" plain style="width: 157px" :disabled="insuredSignStatus == '3'" @click="start_ocr('1')" v-no-more-click="1000">
-                  开始
-                </van-button>
+                <van-button
+                  type="danger"
+                  size="normal"
+                  plain
+                  style="width: 157px"
+                  :disabled="insuredSignStatus == '3'"
+                  @click="start_ocr('1')"
+                  v-no-more-click="1000"
+                  >开始</van-button
+                >
               </div>
               <div class="text" v-else>操作时间已失效，请联系销售人员！</div>
             </van-collapse-item>
@@ -192,17 +236,27 @@
     <div v-if="!isWeixin">
       <div v-if="changeCard">
         <div class="bottom-btn bg-white" v-if="appntSign.documentStatus == '1'">
-          <van-button type="danger" v-if="relationToAppnt == '1' ? true : appntSign.documentStatus == '1' ? true : false" size="large" @click="rePayMent" v-no-more-click="1000">
-            支付
-          </van-button>
+          <van-button
+            type="danger"
+            v-if="relationToAppnt == '1' ? true : appntSign.documentStatus == '1' ? true : false"
+            size="large"
+            @click="rePayMent"
+            v-no-more-click="1000"
+            >支付</van-button
+          >
         </div>
       </div>
       <div v-else>
         <!--判断代理人自保件承诺书是否签名  或者不是自保件 投保人是否都签名-->
         <div class="bottom-btn bg-white" v-if="(agentSignStatus == '3'&& appntSignStatus == '3')||(agentSignStatus == ''&& appntSignStatus == '3')">
-          <van-button type="danger" v-if="relationToAppnt == '1' ? true : insuredSignStatus == '3' ? true : false" size="large" @click="next" v-no-more-click="1000">
-            提交
-          </van-button>
+          <van-button
+            type="danger"
+            v-if="relationToAppnt == '1' ? true : insuredSignStatus == '3' ? true : false"
+            size="large"
+            @click="next"
+            v-no-more-click="1000"
+            >提交</van-button
+          >
         </div>
       </div>
     </div>
@@ -210,7 +264,13 @@
       <!-- <video controls style="width: 100%; max-height: calc(100vh - 60px)" src="/app/video/rlsb.mp4"></video> -->
       <div class="" v-if="videoShow" style="height: calc(100vh - 60px); display: flex; align-items: center; flex-flow: column; justify-content: center">
         <!-- <van-notice-bar :scrollable="false" class="notice" style="width: 100%">为维护您的合法权益，请您务必观看防范销售误导视频。</van-notice-bar> -->
-        <video controls style="width: 100%; max-height: calc(100vh - 60px)" :src="'https://gf-dev-202005-1254138932.cos.ap-shanghai-fsi.myqcloud.com/gfapp/pub01/2021/04/28/guofulive.MP4'" ref="vid" @timeupdate="timeupdate"></video>
+        <video
+          controls
+          style="width: 100%; max-height: calc(100vh - 60px)"
+          :src="'https://gf-dev-202005-1254138932.cos.ap-shanghai-fsi.myqcloud.com/gfapp/pub01/2021/04/28/guofulive.MP4'"
+          ref="vid"
+          @timeupdate="timeupdate"
+        ></video>
       </div>
       <div class="bottom-btn bg-white">
         <van-button type="danger" size="large" @click="isVideoUrlClick()" v-no-more-click="1000">下一步</van-button>
@@ -226,10 +286,18 @@
         }}</van-button>
       </van-cell-group>
     </van-dialog>
+    <!-- <UploadImageFile
+      :typeface="idcardData.typeface && faceAuthCount.weixin < smsAuthNum"
+      :realName="idcardData.idcardName"
+      :idno="idcardData.idcardNumber"
+      @sendimage="sendimage"
+    >
+    </UploadImageFile> -->
   </div>
 </template>
 
 <script>
+// import UploadImageFile from '@/components/ebiz/sale/UploadImageFile'
 import { Field, Cell, CellGroup, Collapse, CollapseItem, Dialog, NoticeBar } from 'vant'
 import {
   underWrite,
@@ -262,7 +330,7 @@ export default {
       timeId: null, // 计时器ID
       countDown: 60, // 倒计时
       authCode: '', // 验证码
-      smsAuthNum: 2,
+      smsAuthNum: 3,
       operaFlag: null,
       encyCustomerMobile: null,
       sid: null,
@@ -344,120 +412,122 @@ export default {
     }
   },
   methods: {
-    timeupdate() {
-      console.log(this.$refs['vid'].paused)
-      if (!this.$refs['vid'].paused) {
-        this.isVideoNext = true
-      }
-    },
-    fakeFaceAuth(expect) {
-      console.log('模拟调用人脸识别')
-      return new Promise(function (resolve, reject) {
-        setTimeout(() => {
-          console.log('模拟人脸识别完成')
-          if (expect) {
-            resolve({ state: '0' })
-          } else {
-            reject({ state: '0' })
+  timeupdate() {
+    console.log(this.$refs['vid'].paused)
+    if (!this.$refs['vid'].paused) {
+      this.isVideoNext = true
+    }
+  },
+  fakeFaceAuth(expect) {
+    console.log('模拟调用人脸识别')
+    return new Promise(function (resolve, reject) {
+      setTimeout(() => {
+        console.log('模拟人脸识别完成')
+        if (expect) {
+          resolve({ state: '0' })
+        } else {
+          reject({ state: '0' })
+        }
+      }, 2000)
+    })
+  },
+  appCallBack(data) {
+    if (data.trigger == 'left_button_click') {
+      if (this.videoShow) {
+        this.$jump({
+          flag: 'navigation',
+          extra: {
+            title: '签名确认',
+            hiddenRight: '1'
           }
-        }, 2000)
-      })
-    },
-    appCallBack(data) {
-      if (data.trigger == 'left_button_click') {
-        if (this.videoShow) {
+        })
+        return (this.videoShow = false)
+      }
+      return this.$dialog
+        .confirm({
+          className: 'dialog-delete',
+          title: '提示',
+          message: '退出流程可能会丢失部分数据，是否确认退出？',
+          cancelButtonColor: '#E9332E',
+          confirmButtonColor: '#FFFFFF'
+        })
+        .then(() => {
           this.$jump({
-            flag: 'navigation',
+            flag: 'h5',
             extra: {
-              title: '签名确认',
-              hiddenRight: '1'
+              title: '电子投保单列表',
+              forbidSwipeBack: 1, //当前页面禁止右滑返回
+              url: location.origin + `/#/sale/list`
+            },
+            routerInfo: {
+              path: `/sale/list`,
+              type: '1'
             }
           })
-          return (this.videoShow = false)
-        }
-        return this.$dialog
-          .confirm({
-            className: 'dialog-delete',
-            title: '提示',
-            message: '退出流程可能会丢失部分数据，是否确认退出？',
-            cancelButtonColor: '#E9332E',
-            confirmButtonColor: '#FFFFFF'
-          })
-          .then(() => {
-            this.$jump({
-              flag: 'h5',
-              extra: {
-                title: '电子投保单列表',
-                forbidSwipeBack: 1, //当前页面禁止右滑返回
-                url: location.origin + `/#/sale/list`
-              },
-              routerInfo: {
-                path: `/sale/list`,
-                type: '1'
-              }
-            })
-          })
-          .catch(() => {
-            return
-          })
+        })
+        .catch(() => {
+          return
+        })
+    }
+  },
+  isVideoUrlClick() {
+    console.log(this.isVideoUrl)
+    if (!this.isVideoNext) {
+      this.$dialog
+        .alert({
+          className: 'dialog-alert',
+          title: '提示',
+          message: '为维护您的合法权益，请您务必认真观看防范销售误导视频。',
+          confirmButtonColor: '#ee0a24',
+          confirmButtonText: '确认'
+        })
+        .then(() => {})
+    } else {
+      this.isVideoNext = !this.isVideoNext
+      this.isVideoUrl == 'goUrl' ? this.goUrl() : this.insuredUrl()
+    }
+  },
+  // 初始化
+  async init() {
+    localStorage.doubleRecordFlag = '0' //0不是双录单 1是双录单
+    if (this.isWeixin) {
+      if (this.$route.query.airSign) {
+        sessionStorage.setItem('airSign', this.$route.query.airSign)
       }
-    },
-    isVideoUrlClick() {
-      console.log(this.isVideoUrl)
-      if (!this.isVideoNext) {
-        this.$dialog
-          .alert({
-            className: 'dialog-alert',
-            title: '提示',
-            message: '为维护您的合法权益，请您务必认真观看防范销售误导视频。',
-            confirmButtonColor: '#ee0a24',
-            confirmButtonText: '确认'
-          })
-          .then(() => {})
+      // this.$CacheUtils.setLocItem('saleInsuredInfo', this.$route.query.saleInsuredInfo)
+      // window.localStorage.setItem('saleInsuredPersonInfo', this.$route.query.saleInsuredPersonInfo)
+      window.localStorage.setItem('token', this.$route.query.token)
+      window.localStorage.setItem('orderNo', this.$route.query.orderNo)
+      // window.localStorage.setItem('relationToAppnt', this.$route.query.relationToAppnt)
+      // window.localStorage.setItem('productCode', this.$route.query.productCode)
+      if (this.$route.query.changeCard == '0') {
+        localStorage.setItem('changeCard', true)
       } else {
-        this.isVideoNext = !this.isVideoNext
-        this.isVideoUrl == 'goUrl' ? this.goUrl() : this.insuredUrl()
+        localStorage.removeItem('changeCard')
       }
-    },
-    // 初始化
-    async init() {
-      localStorage.doubleRecordFlag = '0' //0不是双录单 1是双录单
-      if (this.isWeixin) {
-        if (this.$route.query.airSign) {
-          sessionStorage.setItem('airSign', this.$route.query.airSign)
-        }
-        // this.$CacheUtils.setLocItem('saleInsuredInfo', this.$route.query.saleInsuredInfo)
-        // window.localStorage.setItem('saleInsuredPersonInfo', this.$route.query.saleInsuredPersonInfo)
-        window.localStorage.setItem('token', this.$route.query.token)
-        window.localStorage.setItem('orderNo', this.$route.query.orderNo)
-        // window.localStorage.setItem('relationToAppnt', this.$route.query.relationToAppnt)
-        // window.localStorage.setItem('productCode', this.$route.query.productCode)
-        if (this.$route.query.changeCard == '0') {
-          localStorage.setItem('changeCard', true)
-        } else {
-          localStorage.removeItem('changeCard')
-        }
-        if (this.$route.query.signInvalid) {
-          sessionStorage.setItem('signInvalid', this.$route.query.signInvalid)
-        }
-        if (this.$route.query.shareCode) {
-          sessionStorage.setItem('shareCode', this.$route.query.shareCode)
-        }
-        let signInvalid = sessionStorage.getItem('signInvalid')
-        let rs = await this.checkSignInvalid(signInvalid)
-        console.log('````````````')
-        console.log('rs: ' + rs)
-        if (rs == '1') {
-          this.isInvalid = false
-        } else {
-          this.isInvalid = true
-        }
-        this.airSign = sessionStorage.getItem('airSign')
-        this.shareCode = sessionStorage.getItem('shareCode')
-        this.changeCard = localStorage.getItem('changeCard')
-        this.relationToAppnt = this.$route.query.relationToAppnt
-        this.isShow = false
-        await this.getOrderDetail()
+      if (this.$route.query.signInvalid) {
+        sessionStorage.setItem('signInvalid', this.$route.query.signInvalid)
+      }
+      if (this.$route.query.shareCode) {
+        sessionStorage.setItem('shareCode', this.$route.query.shareCode)
+      }
+      let signInvalid = sessionStorage.getItem('signInvalid')
+      let rs = await this.checkSignInvalid(signInvalid)
+      console.log('````````````')
+      console.log('rs: ' + rs)
+      if (rs == '1') {
+        this.isInvalid = false
+      } else {
+        this.isInvalid = true
+      }
+      this.airSign = sessionStorage.getItem('airSign')
+      this.shareCode = sessionStorage.getItem('shareCode')
+      this.changeCard = localStorage.getItem('changeCard')
+      this.relationToAppnt = this.$route.query.relationToAppnt
+      this.isShow = false
+      await this.getOrderDetail()
+
+        console.log('初始化this.appntSign ==', this.appntSign)
         if (
           (this.appntSignStatus == '3' && sessionStorage.getItem('shareCode') == '0') ||
           (this.appntSignStatus == '3' && sessionStorage.getItem('shareCode') == '2')
@@ -1346,19 +1416,6 @@ export default {
     },
     // 获取消息和阅读状态
     getOrderDetail() {
-      if(!this.$route.query.orderNo || this.$route.query.orderNo == 'undefined'){
-        Dialog.confirm({
-          title: '提示',
-          message: '订单号信息缺失，跳转订单系统重新获取',
-          showCancelButton: false
-        }).then(() => {
-          this.$router.push({
-            path:'/sale/list'
-          })
-        })
-        return false
-      }
-
       let that = this
       this.$toast.loading({
         // 持续展示 toast
@@ -1570,99 +1627,89 @@ export default {
             })
           }
           resolve('success')
-        } else {
-            Dialog.confirm({
-              title: '提示',
-              message: res.resultMessage,
-              showCancelButton: false
-            }).then(() => {
-              this.$router.push({
-                path:'/sale/list'
-              })
-            })
-          }
+        }
       })
     })
   },
-    //自定义key值排序用
-    addKey(item) {
-      //ducumentCode 1投保须知 2投保单 3产品说明书 4提示书 6免除保险人责任条款说明书 7保险销售行为双录说明
-      // 8指定保单生效日 9短期险投保须知 10国富人寿自保件承诺书 11柳州保险行业寿险投保风险提示书 12个人信息使用授权
-      // documentStatus: 文档状态  0 未读  1 已读  2 未签名  3 已签名
-      // documentType:  文档类型  0  阅读文档  1  签名文档
-      // signType: 签名类型  0 投保人 1 被保人  2 本人
-      if (item.documentCode == '1') {
-        item.key = 2
-        // item.key = 4
-        item.routePath = 'insuranceInformation'
-      } else if (item.documentCode == '2') {
-        // item.key = 9
-        item.key = 11
-        item.routePath = 'SignatureOfElectronic'
-      } else if (item.documentCode == '3') {
-        // item.key = 4
-        item.key = 6
-        item.routePath = 'productTip'
-      } else if (item.documentCode == '4') {
-        // item.key = 5
-        item.key = 7
-        item.routePath = 'InsuranceTip'
-      } else if (item.documentCode == '6') {
-        // item.key = 7
-        item.key = 9
-        item.routePath = 'avoidDutyTip'
-      } else if (item.documentCode == '7') {
-        // item.key = 8
-        item.key = 10
-        item.routePath = 'doubleRecordTip'
-      } else if (item.documentCode == '8') {
-        item.key = 1
-        item.routePath = 'apointValidDoc'
-      } else if (item.documentCode == '9') {
-        // item.key = 3
-        item.key = 5
-        item.routePath = 'shortPeriodProduct'
-      }else if (item.documentCode == '10') {
-        item.key = 1
-        item.routePath = 'commitmentSelfProtect'
-      } else if (item.documentCode == '11') {
-        // item.key = 6
-        item.key = 8
-        item.routePath = 'InsuranceRiskReminder'
-      } else if (item.documentCode == '12') {
-        // item.key = 10
-        item.key = 12
-        item.routePath = 'PersonalInformation'
-      } else if (item.documentCode == '13') {
-        // item.key = 2
-        item.key = 4
-        item.routePath = 'insuranceClauses'
-      }else if (item.documentCode == '14') {//风险评估pdf
-        item.key = 3
-        item.routePath = 'AnswerTip'
-      } else if (item.documentCode == '15') {
-        item.key = 7.1
-        item.routePath = 'universalRiskNotifyingMessageTip'
-      }
+  //自定义key值排序用
+  addKey(item) {
+    //ducumentCode 1投保须知 2投保单 3产品说明书 4提示书 6免除保险人责任条款说明书 7保险销售行为双录说明
+    // 8指定保单生效日 9短期险投保须知 10国富人寿自保件承诺书 11柳州保险行业寿险投保风险提示书 12个人信息使用授权
+    // documentStatus: 文档状态  0 未读  1 已读  2 未签名  3 已签名
+    // documentType:  文档类型  0  阅读文档  1  签名文档
+    // signType: 签名类型  0 投保人 1 被保人  2 本人
+    if (item.documentCode == '1') {
+      item.key = 2
+      // item.key = 4
+      item.routePath = 'insuranceInformation'
+    } else if (item.documentCode == '2') {
+      // item.key = 9
+      item.key = 11
+      item.routePath = 'SignatureOfElectronic'
+    } else if (item.documentCode == '3') {
+      // item.key = 4
+      item.key = 6
+      item.routePath = 'productTip'
+    } else if (item.documentCode == '4') {
+      // item.key = 5
+      item.key = 7
+      item.routePath = 'InsuranceTip'
+    } else if (item.documentCode == '6') {
+      // item.key = 7
+      item.key = 9
+      item.routePath = 'avoidDutyTip'
+    } else if (item.documentCode == '7') {
+      // item.key = 8
+      item.key = 10
+      item.routePath = 'doubleRecordTip'
+    } else if (item.documentCode == '8') {
+      item.key = 1
+      item.routePath = 'apointValidDoc'
+    } else if (item.documentCode == '9') {
+      // item.key = 3
+      item.key = 5
+      item.routePath = 'shortPeriodProduct'
+    }else if (item.documentCode == '10') {
+      item.key = 1
+      item.routePath = 'commitmentSelfProtect'
+    } else if (item.documentCode == '11') {
+      // item.key = 6
+      item.key = 8
+      item.routePath = 'InsuranceRiskReminder'
+    } else if (item.documentCode == '12') {
+      // item.key = 10
+      item.key = 12
+      item.routePath = 'PersonalInformation'
+    } else if (item.documentCode == '13') {
+      // item.key = 2
+      item.key = 4
+      item.routePath = 'insuranceClauses'
+    }else if (item.documentCode == '14') {//风险评估pdf
+      item.key = 3
+      item.routePath = 'AnswerTip'
+    } else if (item.documentCode == '15') {
+      item.key = 7.1
+      item.routePath = 'universalRiskNotifyingMessageTip'
+    }
+  },
+  getSignInvalid() {
+    this.$toast.loading({
+      duration: 0, // 持续展示 toast
+
+        forbidClick: true, // 禁用背景点击
+
+        loadingType: 'spinner',
+
+        message: '加载中……'
+      })
+      let data = {}
+      getSignInvalid(data).then((res) => {
+        if (res.result == '0') {
+          this.$toast.clear()
+          this.signInvalid = res.content.sign
+        }
+      })
     },
-    getSignInvalid() {
-      this.$toast.loading({
-        duration: 0, // 持续展示 toast
-
-          forbidClick: true, // 禁用背景点击
-
-          loadingType: 'spinner',
-
-          message: '加载中……'
-        })
-        let data = {}
-        getSignInvalid(data).then((res) => {
-          if (res.result == '0') {
-            this.$toast.clear()
-            this.signInvalid = res.content.sign
-          }
-        })
-      },
     async checkSignInvalid(signInvalid) {
       let that = this
       this.$toast.loading({

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
                 }

vue.config.js

@@ -32,11 +32,13 @@ module.exports = {
   chainWebpack: config => {
     // 移除 prefetch 插件
     config.plugins.delete('prefetch')
-    // // 压缩代码
-    // config.optimization.minimize(true)
-    // // 分割代码
-    // config.optimization.splitChunks({
-    //   chunks: 'all',
+
+    // 或者
+    // 修改它的选项：
+    // config.plugin('prefetch').tap(options => {
+    //   options[0].fileBlacklist = options[0].fileBlacklist || []
+    //   options[0].fileBlacklist.push(/myasyncRoute(.)+?\.js$/)
+    //   return options
     // })
   },
   devServer: {