From df963a6ea04f2b8c189dd6cff7a44d48bb61ff14 Mon Sep 17 00:00:00 2001 From: yuweiqi Date: Thu, 6 Feb 2020 18:27:44 +0800 Subject: [PATCH 1/6] =?UTF-8?q?[FIX]=E5=BB=BA=E8=AE=AE=E4=B9=A6=E7=94=9F?= =?UTF-8?q?=E6=88=90pdf=E5=BE=AE=E4=BF=A1=E5=88=86=E4=BA=AB=E6=97=A0?= =?UTF-8?q?=E6=A0=87=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/ebiz/proposal/Exhibition.vue | 5 ++--- src/views/ebiz/proposal/PDF.vue | 1 - 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/views/ebiz/proposal/Exhibition.vue b/src/views/ebiz/proposal/Exhibition.vue index 54f5bd2c1..5591f2245 100644 --- a/src/views/ebiz/proposal/Exhibition.vue +++ b/src/views/ebiz/proposal/Exhibition.vue @@ -216,7 +216,8 @@ export default { amtFormat: filters.amtFormat, //保额格式化 wxTitle: '', dutyLst: [], - mainRiskCodes: [] + mainRiskCodes: [], + chooseProductCodes: [] // 已选产品列表 } }, mounted() { @@ -380,7 +381,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 => { @@ -389,7 +389,6 @@ export default { } }) localStorage.pdfShareCode = this.chooseProductCodes[0] - console.log('localStorage.pdfShareCodes == ', localStorage.pdfShareCodes) } }, //获取微信分享的标题 diff --git a/src/views/ebiz/proposal/PDF.vue b/src/views/ebiz/proposal/PDF.vue index 068203bda..2115e5a63 100644 --- a/src/views/ebiz/proposal/PDF.vue +++ b/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) { From 5af927c7c2edab8d811ebec3d88fcf2c933a1eb6 Mon Sep 17 00:00:00 2001 From: yuweiqi Date: Fri, 7 Feb 2020 09:29:01 +0800 Subject: [PATCH 2/6] =?UTF-8?q?[FIX]=E6=9B=B4=E6=96=B0=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E5=AD=97=E5=85=B8=EF=BC=9A=E4=BA=A7=E5=93=81=E7=BC=96=E7=A0=81?= =?UTF-8?q?-=E4=BA=A7=E5=93=81=E7=B1=BB=E5=9E=8B-=E4=BA=A7=E5=93=81?= =?UTF-8?q?=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/js/utils/data-dictionary.js | 30 ++++++++++++++++++++++---- 1 file changed, 26 insertions(+), 4 deletions(-) diff --git a/src/assets/js/utils/data-dictionary.js b/src/assets/js/utils/data-dictionary.js index 650e7d6b7..773832d0f 100644 --- a/src/assets/js/utils/data-dictionary.js +++ b/src/assets/js/utils/data-dictionary.js @@ -755,7 +755,7 @@ export default { code: 'GFRS_M0002' }, { - shortName: '年金险', + shortName: '万能险', name: '国富人寿金管家养老年金保险产品（万能型）', code: 'GFRS_M0003' }, @@ -799,10 +799,20 @@ export default { name: '国富人寿国富鑫享年金保险', code: 'GFRS_M0011' }, + { + shortName: '意外险', + name: '学生平安保险（小学、初中）', + code: 'GFRS_M0012' + }, { shortName: '重疾险', name: '国富人寿孝心保老年特定疾病保险', code: 'GFRS_M0014' + }, + { + shortName: '万能险', + name: '国富人寿富娃娃两全保险（万能型）', + code: 'GFRS_M0015' } ], // 职级 @@ -1313,9 +1323,21 @@ export default { { id: 'EAM', text: '资深部经理' }, { id: 'AD', text: '营业总监' } ], - relationType: [{ id: '0', text: '配偶' }, { id: '1', text: '子女' }, { id: '2', text: '父母' }], - guarantRelationType: [{ id: '0', text: '亲属' }, { id: '1', text: '朋友' }, { id: '2', text: '同事' }, { id: '3', text: '其他' }], - classification: [{ id: '0', text: '司内' }, { id: '1', text: '司外' }], + relationType: [ + { id: '0', text: '配偶' }, + { id: '1', text: '子女' }, + { id: '2', text: '父母' } + ], + guarantRelationType: [ + { id: '0', text: '亲属' }, + { id: '1', text: '朋友' }, + { id: '2', text: '同事' }, + { id: '3', text: '其他' } + ], + classification: [ + { id: '0', text: '司内' }, + { id: '1', text: '司外' } + ], //入司国籍/地区 rsnativeplace: [ { id: 'AGO', text: '安哥拉' }, From 38a74d22ce170271b66e2c44e6c11fa07a3dab9b Mon Sep 17 00:00:00 2001 From: yuweiqi Date: Fri, 7 Feb 2020 09:50:38 +0800 Subject: [PATCH 3/6] =?UTF-8?q?[FIX]=E7=90=86=E8=B5=94=E7=94=B3=E8=AF=B7-?= =?UTF-8?q?=E7=94=B3=E8=AF=B7=E4=BF=A1=E6=81=AF-=E8=8B=A5=E4=B8=BA?= =?UTF-8?q?=E6=9C=AC=E4=BA=BA=EF=BC=8C=E5=B8=A6=E5=85=A5=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=B8=A6=E5=85=A5=E8=81=94=E7=B3=BB=E5=9C=B0?= =?UTF-8?q?=E5=9D=80=E8=AF=A6=E7=BB=86=E5=9C=B0=E5=9D=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/ebiz/claims/ApplyInfo.vue | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/views/ebiz/claims/ApplyInfo.vue b/src/views/ebiz/claims/ApplyInfo.vue index abe148fe8..e34f7aa1c 100644 --- a/src/views/ebiz/claims/ApplyInfo.vue +++ b/src/views/ebiz/claims/ApplyInfo.vue @@ -492,6 +492,7 @@ export default { applyerOccuCode: '', //职业类型编码 applyerOccuName: '', //职业类别名称 lifeGrade: '', //寿险等级 + applyerAddr: '', //联系地址详细地址 healthGrade: '', //健康等级 applyerEmail: '', // 电子邮箱 applyerMobile: '', // 联系电话 @@ -753,6 +754,7 @@ export default { this.userInfo.applyerOccuName = applicant.insuredOccuName //被保险人职业名称 this.userInfo.applyerSex = applicant.insuredSex //被保险人性别 this.userInfo.applyerBirthday = applicant.insuredBirthday //被保险人生日 + this.userInfo.applyerAddr = applicant.insuredAddr //被保险人联系地址详细地址 } else { this.$toast(res.resultMessage) } From b1fcbb4dd54eed47b8849c9a0988297d1f354109 Mon Sep 17 00:00:00 2001 From: yuweiqi Date: Fri, 7 Feb 2020 11:29:16 +0800 Subject: [PATCH 4/6] =?UTF-8?q?[FIX]=E7=90=86=E8=B5=94=E7=94=B3=E8=AF=B7-?= =?UTF-8?q?=E8=A2=AB=E4=BF=9D=E4=BA=BA=E4=BF=A1=E6=81=AF-=E5=A6=82?= =?UTF-8?q?=E6=9E=9C=E8=AF=81=E4=BB=B6=E7=B1=BB=E5=9E=8B=E9=80=89=E6=8B=A9?= =?UTF-8?q?=E4=B8=BA=E8=BA=AB=E4=BB=BD=E8=AF=81=EF=BC=8C=E9=95=BF=E6=9C=9F?= =?UTF-8?q?=E6=8C=89=E9=92=AE=E7=A6=81=E7=94=A8bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/ebiz/claims/InsuredInfo.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/ebiz/claims/InsuredInfo.vue b/src/views/ebiz/claims/InsuredInfo.vue index 9249cd263..d975c4211 100644 --- a/src/views/ebiz/claims/InsuredInfo.vue +++ b/src/views/ebiz/claims/InsuredInfo.vue @@ -355,7 +355,7 @@ export default { this.popupShow = false if (this.pickerType == '2') { // 身份证以外的证件类型可以使用长期 - if (value.id != '0') { + if (value.id != '1') { this.effectiveDateTypeAble = false } else { this.effectiveDateType = '' From 7ee02bc537002e8a280186a92101d95ce2f043df Mon Sep 17 00:00:00 2001 From: yuweiqi Date: Fri, 7 Feb 2020 14:32:16 +0800 Subject: [PATCH 5/6] =?UTF-8?q?[FIX]=E7=90=86=E8=B5=94=E7=94=B3=E8=AF=B7-?= =?UTF-8?q?=E8=A2=AB=E4=BF=9D=E4=BA=BA=E4=BF=A1=E6=81=AF=E3=80=81=E7=94=B3?= =?UTF-8?q?=E8=AF=B7=E4=BF=A1=E6=81=AF=20=E9=A1=B5=E9=9D=A2=E8=AF=81?= =?UTF-8?q?=E4=BB=B6=E6=98=AF=E5=90=A6=E9=95=BF=E6=9C=9F-=E7=BB=99?= =?UTF-8?q?=E5=90=8E=E5=8F=B0=E4=BC=A0=E5=8F=82=E6=9B=B4=E6=94=B9=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0certiIsLong=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/ebiz/claims/ApplyInfo.vue | 18 +++++++++++++++--- src/views/ebiz/claims/InsuredInfo.vue | 16 ++++++++++++---- 2 files changed, 27 insertions(+), 7 deletions(-) diff --git a/src/views/ebiz/claims/ApplyInfo.vue b/src/views/ebiz/claims/ApplyInfo.vue index e34f7aa1c..93ce0887b 100644 --- a/src/views/ebiz/claims/ApplyInfo.vue +++ b/src/views/ebiz/claims/ApplyInfo.vue @@ -497,11 +497,11 @@ export default { applyerEmail: '', // 电子邮箱 applyerMobile: '', // 联系电话 applyerNationatlity: 'CHN', // 国家/地区 - applyerAddr: '', //联系地址 applyerBankAccountName: '', // 账户户名 applyerBankName: '', // 开户银行 applyerBankCode: '', //银行编码 applyerBankAccountNo: '', // 银行卡号 + certiIsLong: '', //是否长期 isPettyCase: '0' //小额案件 // hospital: '', // 治疗医院 // sort: '0', //发票类型 @@ -641,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 @@ -699,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 }, @@ -773,9 +775,16 @@ export default { //身份证以外的证件类型可以使用长期 if (value.id != '1') { this.effectiveDateTypeAble = false + //1-是 0-否 } else { - //let age = utilsAge.getAge(this.userInfo.idNo, new Date()) - //this.effectiveDateTypeAble = age <= 45 + // let age = utilsAge.getAge(this.userInfo.idNo, new Date()) + // 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') { @@ -809,6 +818,7 @@ export default { } else { // 勾选长期 that.effectiveDateType = true + this.userInfo.certiIsLong = '1' // 长期按钮不禁用 that.effectiveDateTypeAble = false // 证件截止日期不需要校验 @@ -896,9 +906,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) }, diff --git a/src/views/ebiz/claims/InsuredInfo.vue b/src/views/ebiz/claims/InsuredInfo.vue index d975c4211..e612b5fdf 100644 --- a/src/views/ebiz/claims/InsuredInfo.vue +++ b/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) { @@ -358,8 +362,9 @@ export default { 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) { From 1107ea37a941aaffdaa2a486051b71e815a61935 Mon Sep 17 00:00:00 2001 From: yuweiqi Date: Fri, 7 Feb 2020 15:26:59 +0800 Subject: [PATCH 6/6] =?UTF-8?q?[FIX]=E7=90=86=E8=B5=94=E7=94=B3=E8=AF=B7-?= =?UTF-8?q?=E7=94=B3=E8=AF=B7=E4=BF=A1=E6=81=AF-=E9=80=89=E6=8B=A9?= =?UTF-8?q?=E6=9C=AC=E4=BA=BA-=E8=AF=81=E4=BB=B6=E6=88=AA=E6=AD=A2?= =?UTF-8?q?=E6=97=A5=E6=9C=9F=E4=BF=A1=E6=81=AF=E5=B8=A6=E5=85=A5bug?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/ebiz/claims/ApplyInfo.vue | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/views/ebiz/claims/ApplyInfo.vue b/src/views/ebiz/claims/ApplyInfo.vue index 93ce0887b..6a6b87e7b 100644 --- a/src/views/ebiz/claims/ApplyInfo.vue +++ b/src/views/ebiz/claims/ApplyInfo.vue @@ -757,6 +757,10 @@ export default { 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) }