Merge branch 'dev' of http://112.124.100.131/GFRS/ebiz-h5 into dev

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

@@ -843,7 +843,7 @@ export default {
       code: 'GFRS_M0002'
     },
     {
-      shortName: '年金险',
+      shortName: '万能险',
       name: '国富人寿金管家养老年金保险产品（万能型）',
       code: 'GFRS_M0003'
     },
@@ -887,10 +887,20 @@ export default {
       name: '国富人寿国富鑫享年金保险',
       code: 'GFRS_M0011'
     },
+    {
+      shortName: '意外险',
+      name: '学生平安保险（小学、初中）',
+      code: 'GFRS_M0012'
+    },
     {
       shortName: '重疾险',
       name: '国富人寿孝心保老年特定疾病保险',
       code: 'GFRS_M0014'
+    },
+    {
+      shortName: '万能险',
+      name: '国富人寿富娃娃两全保险（万能型）',
+      code: 'GFRS_M0015'
     }
   ],
   // 职级

src/views/ebiz/claims/ApplyInfo.vue

@@ -492,15 +492,16 @@ export default {
         applyerOccuCode: '', //职业类型编码
         applyerOccuName: '', //职业类别名称
         lifeGrade: '', //寿险等级
+        applyerAddr: '', //联系地址详细地址
         healthGrade: '', //健康等级
         applyerEmail: '', // 电子邮箱
         applyerMobile: '', // 联系电话
         applyerNationatlity: 'CHN', // 国家/地区
-        applyerAddr: '', //联系地址
         applyerBankAccountName: '', // 账户户名
         applyerBankName: '', // 开户银行
         applyerBankCode: '', //银行编码
         applyerBankAccountNo: '', // 银行卡号
+        certiIsLong: '', //是否长期
         isPettyCase: '0' //小额案件
         // hospital: '', // 治疗医院
         // sort: '0', //发票类型
@@ -640,6 +641,7 @@ export default {
       this.userInfo.applyerBirthday = Detail[0][0].customerBirthday //出生日期
       this.effectiveDateType = Detail[0][0].isEndDate == '9999-01-01' //是否长期
       this.userInfo.applyerCertiEndDate = Detail[0][0].isEndDate == '9999-01-01' ? '2010-01-01' : Detail[0][0].isEndDate //截止日期
+      this.userInfo.certiIsLong = Detail[0][0].isEndDate == '9999-01-01' ? '1' : '0' //是否长期 0-否，1-是
       this.userInfo.applyerNationatlity = Detail[0][0].nationality
       this.userInfo.applyerEmail = Detail[0][0].customerEmail
       this.userInfo.applyerMobile = Detail[0][0].customerMobile
@@ -698,6 +700,7 @@ export default {
         return this.$toast(idToData(val).text)
       }
       this.effectiveDateType = false
+      this.userInfo.certiIsLong = '0'
       this.effectiveDateTypeAble = idToData(val).age <= 45
       this.userInfo.applyerSex = idToData(val).sex
     },
@@ -753,6 +756,11 @@ export default {
               this.userInfo.applyerOccuName = applicant.insuredOccuName //被保险人职业名称
               this.userInfo.applyerSex = applicant.insuredSex //被保险人性别
               this.userInfo.applyerBirthday = applicant.insuredBirthday //被保险人生日
+              this.userInfo.applyerAddr = applicant.insuredAddr //被保险人联系地址详细地址
+              this.effectiveDateType = applicant.certiTypeEndDate == '9999-09-09' //是否长期
+              this.userInfo.applyerCertiEndDate = applicant.certiTypeEndDate == '9999-09-09' ? '' : applicant.certiTypeEndDate //截止日期
+              this.userInfo.certiIsLong = applicant.certiTypeEndDate == '9999-09-09' ? '1' : '0' //是否长期 0-否，1-是
+              console.log('this.userInfo == ', this.userInfo)
             } else {
               this.$toast(res.resultMessage)
             }
@@ -771,9 +779,16 @@ export default {
         //身份证以外的证件类型可以使用长期
         if (value.id != '1') {
           this.effectiveDateTypeAble = false
+          //1-是  0-否
         } else {
-          //let age = utilsAge.getAge(this.userInfo.idNo, new Date())
+          // let age = utilsAge.getAge(this.userInfo.idNo, new Date())
-          //this.effectiveDateTypeAble = age <= 45
+          // this.effectiveDateTypeAble = age <= 45
+          this.userInfo.applyerCertiEndDate = ''
+          this.effectiveDateType = false
+          this.userInfo.certiIsLong = this.effectiveDateType ? '1' : '0'
+          if (this.userInfo.applyerCertiCode) {
+            this.effectiveDateTypeAble = idToData(this.userInfo.applyerCertiCode).age <= 45
+          }
         }
         this.userInfo.applyerCertiType = value.id
       } else if (this.pickerType == '3') {
@@ -807,6 +822,7 @@ export default {
         } else {
           // 勾选长期
           that.effectiveDateType = true
+          this.userInfo.certiIsLong = '1'
           // 长期按钮不禁用
           that.effectiveDateTypeAble = false
           // 证件截止日期不需要校验
@@ -894,9 +910,11 @@ export default {
       if (val) {
         this.userInfo.applyerCertiEndDate = ''
         this.certiexpiredateRequired = false
+        this.userInfo.certiIsLong = '1'
       } else {
         this.userInfo.applyerCertiEndDate = ''
         this.certiexpiredateRequired = true
+        this.userInfo.certiIsLong = '0'
       }
       effectiveDataTypeChange(this, val)
     },

src/views/ebiz/claims/InsuredInfo.vue

@@ -234,7 +234,8 @@ export default {
         insuredCounty: '', //新增字段被保人所在区/县
         insuredAddr: '', //被保人详细地址
         businessNo: '', //业务号码
-        insuredNo: '' //被保人编号
+        insuredNo: '', //被保人编号
+        certiIsLong: '' //是否长期
       }
     }
   },
@@ -294,10 +295,13 @@ export default {
       }
       //如果证件校验不通过,恢复默认值
       if (idToData(val).text) {
-        ;[this.userInfo.certiCode, this.userInfo.insuredSex] = ['', '0']
+        ;[this.userInfo.certiCode, this.userInfo.insuredSex, this.effectiveDateTypeAble] = ['', '0', false]
         return this.$toast(idToData(val).text)
       }
+      this.effectiveDateType = false
+      this.userInfo.certiIsLong = '0'
       this.userInfo.insuredSex = idToData(val).sex
+      this.effectiveDateTypeAble = idToData(val).age <= 45
     },
     //弹框选择
     toSelect(pickerType, valueKey) {
@@ -355,11 +359,12 @@ export default {
       this.popupShow = false
       if (this.pickerType == '2') {
         // 身份证以外的证件类型可以使用长期
-        if (value.id != '0') {
+        if (value.id != '1') {
           this.effectiveDateTypeAble = false
         } else {
-          this.effectiveDateType = ''
+          this.effectiveDateType = false
           this.userInfo.certiTypeEndDate = ''
+          this.userInfo.certiIsLong = this.effectiveDateType ? '1' : '0'
           let age = utilsAge.getAge(this.userInfo.certiCode, new Date())
           this.effectiveDateTypeAble = age <= 45
         }
@@ -373,8 +378,10 @@ export default {
       if (val) {
         this.userInfo.certiTypeEndDate = ''
         this.certiexpiredateRequired = false
+        this.userInfo.certiIsLong = '1'
       } else {
         this.certiexpiredateRequired = true
+        this.userInfo.certiIsLong = '0'
       }
       // effectiveDataTypeChange(this, val)
     },
@@ -423,6 +430,7 @@ export default {
       this.userInfo.insuredCity = Detail[0][0].city //联系市
       this.userInfo.insuredCounty = Detail[0][0].area //联系区
       this.effectiveDateType = Detail[0][0].isEndDate == '9999-01-01' //是否长期
+      this.userInfo.certiIsLong = Detail[0][0].isEndDate == '9999-01-01' ? '1' : '0' //是否长期 0-否，1-是
       this.userInfo.certiTypeEndDate = Detail[0][0].isEndDate == '9999-01-01' ? '2010-01-01' : Detail[0][0].isEndDate //截止日期
       this.userInfo.insuredOccuCode = Detail[0][0].occuCode //职业编码
       let result = this.showOccuName(Detail[0][0].occuCode)
@@ -532,7 +540,6 @@ export default {
     },
 
     save() {
-      console.log('save ==', localStorage.businessNo)
       if (localStorage.businessNo) {
         this.userInfo.businessNo = localStorage.businessNo
       }
@@ -547,6 +554,7 @@ export default {
         slaveStatus: this.slaveStatus,
         claimApplyInsuredReqDTO: this.userInfo
       }
+      console.log('save ==', data)
       apply(data).then(res => {
         console.log('res', res)
         if (res.result == 0) {

src/views/ebiz/proposal/Exhibition.vue

@@ -216,7 +216,8 @@ export default {
       amtFormat: filters.amtFormat, //保额格式化
       wxTitle: '',
       dutyLst: [],
-      mainRiskCodes: []
+      mainRiskCodes: [],
+      chooseProductCodes: [] // 已选产品列表
     }
   },
   mounted() {
@@ -381,7 +382,6 @@ export default {
         this.getWXTitle(this.insuredDTOs) //获取微信标题
         let active = this.insuredDTOs.length //默认展开项
         this.activeNames = [active]
-
         this.insuredDTOs.forEach(item => {
           if (item.riskDTOLst && item.riskDTOLst.length > 0) {
             item.riskDTOLst.forEach(ele => {
@@ -390,7 +390,6 @@ export default {
           }
         })
         localStorage.pdfShareCode = this.chooseProductCodes[0]
-        console.log('localStorage.pdfShareCodes == ', localStorage.pdfShareCodes)
       }
     },
     //获取微信分享的标题

src/views/ebiz/proposal/PDF.vue

@@ -31,7 +31,6 @@ export default {
     }
   },
   mounted() {
-    console.log('localStorage.pdfShareCode =pdf = ', localStorage.pdfShareCode)
     let riskCode = localStorage.pdfShareCode
     dataDictionary.riskType.some(item => {
       if (item.code == riskCode) {