From 172b279e7669e7b5f8c3e92ea3212da77a1c3b85 Mon Sep 17 00:00:00 2001 From: "ding.zhou" Date: Thu, 20 Feb 2020 16:17:46 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E9=9C=80=E6=B1=82=EF=BC=9AGFRS-623=20?= =?UTF-8?q?=E5=9B=BD=E5=AF=8C=E4=BA=BA=E5=AF=BF=E9=91=AB=E7=AE=A1=E5=AE=B6?= =?UTF-8?q?=E7=BB=88=E8=BA=AB=E5=AF=BF=E9=99=A9=EF=BC=88=E4=B8=87=E8=83=BD?= =?UTF-8?q?=E5=9E=8B=EF=BC=89=20=E5=8F=98=E6=9B=B4=EF=BC=9A=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E6=96=B0=E4=BA=A7=E5=93=81=E7=9B=B8=E5=85=B3=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=E5=8F=8A=E4=B8=BB=E9=99=A9=E5=88=97=E8=A1=A8=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E6=9C=80=E5=90=8E=E4=B8=80=E8=A1=8C=E4=B8=8D=E5=B1=95?= =?UTF-8?q?=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/js/utils/data-dictionary.js | 5 +++++ src/views/ebiz/common/CalculatePremium.vue | 8 +++++--- src/views/ebiz/common/MainRiskList.vue | 4 ++++ src/views/ebiz/sale/InsuranceInformation.vue | 5 +++-- src/views/ebiz/sale/SignatureConfirmation.vue | 2 +- src/views/ebiz/sale/SignatureOfElectronic.vue | 2 +- 6 files changed, 19 insertions(+), 7 deletions(-) diff --git a/src/assets/js/utils/data-dictionary.js b/src/assets/js/utils/data-dictionary.js index 773832d0f..64a5fe868 100644 --- a/src/assets/js/utils/data-dictionary.js +++ b/src/assets/js/utils/data-dictionary.js @@ -813,6 +813,11 @@ export default { shortName: '万能险', name: '国富人寿富娃娃两全保险（万能型）', code: 'GFRS_M0015' + }, + { + shortName: '万能险', + name: '国富人寿鑫管家终身寿险（万能型）', + code: 'GFRS_M0017' } ], // 职级 diff --git a/src/views/ebiz/common/CalculatePremium.vue b/src/views/ebiz/common/CalculatePremium.vue index 13e722ae6..2302427af 100644 --- a/src/views/ebiz/common/CalculatePremium.vue +++ b/src/views/ebiz/common/CalculatePremium.vue @@ -789,11 +789,11 @@ export default { console.log('trialInfo == ', trialInfo) //通用规则1：交费方式为一次交情，无交费期限 if (trialInfo['payIntv'] == '0') { - console.log(11111) trialInfo['payEndYear'] = '1000' trialInfo['payEndYearFlag'] = 'Y' // 福宝宝和万能险传A - if (item.mainRiskCode != 'GFRS_M0006' && item.mainRiskCode != 'GFRS_M0003' && item.mainRiskCode != 'GFRS_M0013') { + if (item.mainRiskCode != 'GFRS_M0006' && item.mainRiskCode != 'GFRS_M0017' + && item.mainRiskCode != 'GFRS_M0003' && item.mainRiskCode != 'GFRS_M0013') { trialInfo['insuYearFlag'] = 'Y' } } @@ -1003,7 +1003,9 @@ export default { //万能型产品保费赋值给保额 //增加判断是否是从建议书跳转过来了的 if (localStorage.isFrom != 'proposal') { - if (this.trialList[index].productCode == 'GFRS_M0003' || this.trialList[index].productCode == 'GFRS_M0015') { + if (this.trialList[index].productCode == 'GFRS_M0003' + || this.trialList[index].productCode == 'GFRS_M0015' + || this.trialList[index].productCode == 'GFRS_M0017') { riskItem['amt'] = this.trialList[index].prem } } diff --git a/src/views/ebiz/common/MainRiskList.vue b/src/views/ebiz/common/MainRiskList.vue index c20e35b6e..d105bde18 100644 --- a/src/views/ebiz/common/MainRiskList.vue +++ b/src/views/ebiz/common/MainRiskList.vue @@ -9,6 +9,10 @@

+ + + + diff --git a/src/views/ebiz/sale/InsuranceInformation.vue b/src/views/ebiz/sale/InsuranceInformation.vue index 4449f739a..f30f42bf5 100644 --- a/src/views/ebiz/sale/InsuranceInformation.vue +++ b/src/views/ebiz/sale/InsuranceInformation.vue @@ -273,7 +273,8 @@ export default { } }) } else { - url = this.productCode == 'GFRS_M0003' || this.productCode == 'GFRS_M0015' ? 'productTip' : 'insuranceTip' + url = this.productCode == 'GFRS_M0003' || this.productCode == 'GFRS_M0015' || this.productCode == 'GFRS_M0017' + ? 'productTip' : 'insuranceTip' this.$jump({ flag: 'h5', extra: { @@ -406,7 +407,7 @@ export default { if (that.changeCard) { url = 'SignatureConfirmation' } else { - url = this.productCode == 'GFRS_M0003' || this.productCode == 'GFRS_M0015' ? 'productTip' : 'insuranceTip' + url = this.productCode == 'GFRS_M0003' || this.productCode == 'GFRS_M0015' || this.productCode == 'GFRS_M0017' ? 'productTip' : 'insuranceTip' } this.$jump({ flag: 'h5', diff --git a/src/views/ebiz/sale/SignatureConfirmation.vue b/src/views/ebiz/sale/SignatureConfirmation.vue index 6368d1abd..0099c10b8 100644 --- a/src/views/ebiz/sale/SignatureConfirmation.vue +++ b/src/views/ebiz/sale/SignatureConfirmation.vue @@ -437,7 +437,7 @@ export default { if (that.changeCard) { path = 'insuranceInformation' } else { - if (localStorage.productCode == 'GFRS_M0003' || localStorage.productCode == 'GFRS_M0015') { + if (localStorage.productCode == 'GFRS_M0003' || localStorage.productCode == 'GFRS_M0015' || this.productCode == 'GFRS_M0017') { if (that.appntSign[0].documentStatus == 0) { path = 'insuranceInformation' } else if (that.appntSign[1].documentStatus == 2) { diff --git a/src/views/ebiz/sale/SignatureOfElectronic.vue b/src/views/ebiz/sale/SignatureOfElectronic.vue index cfa0a0f9a..769671df3 100644 --- a/src/views/ebiz/sale/SignatureOfElectronic.vue +++ b/src/views/ebiz/sale/SignatureOfElectronic.vue @@ -752,7 +752,7 @@ export default { let comment = window.localStorage.getItem('productCode') // if (comment == 'GFRS_M0003') { - if (comment == 'GFRS_M0003' || comment == 'GFRS_M0015') { + if (comment == 'GFRS_M0003' || comment == 'GFRS_M0015' || comment == 'GFRS_M0017') { this.isComment = true } From 44bdcff02e31a7328bdca4b14034098ddf36f6dc Mon Sep 17 00:00:00 2001 From: "ding.zhou" Date: Thu, 20 Feb 2020 16:22:57 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E9=9C=80=E6=B1=82=EF=BC=9AGFRS-623=20?= =?UTF-8?q?=E5=9B=BD=E5=AF=8C=E4=BA=BA=E5=AF=BF=E9=91=AB=E7=AE=A1=E5=AE=B6?= =?UTF-8?q?=E7=BB=88=E8=BA=AB=E5=AF=BF=E9=99=A9=EF=BC=88=E4=B8=87=E8=83=BD?= =?UTF-8?q?=E5=9E=8B=EF=BC=89=20=E5=8F=98=E6=9B=B4=EF=BC=9A=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E6=96=B0=E4=BA=A7=E5=93=81=E7=9B=B8=E5=85=B3=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=E5=8F=8A=E4=B8=BB=E9=99=A9=E5=88=97=E8=A1=A8=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E6=9C=80=E5=90=8E=E4=B8=80=E8=A1=8C=E4=B8=8D=E5=B1=95?= =?UTF-8?q?=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/js/utils/data-dictionary.js | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/assets/js/utils/data-dictionary.js b/src/assets/js/utils/data-dictionary.js index 64a5fe868..029fc2c5a 100644 --- a/src/assets/js/utils/data-dictionary.js +++ b/src/assets/js/utils/data-dictionary.js @@ -814,11 +814,16 @@ export default { name: '国富人寿富娃娃两全保险（万能型）', code: 'GFRS_M0015' }, + { + shortName: '意外险', + name: '国富人寿综合意外伤害保险(2020版)', + code: 'GFRS_M0016' + }, { shortName: '万能险', name: '国富人寿鑫管家终身寿险（万能型）', code: 'GFRS_M0017' - } + }, ], // 职级 applGrade: [ From d5e09a70d8c924e69a44d3b543c9cbc9280bb6c6 Mon Sep 17 00:00:00 2001 From: "ding.zhou" Date: Sun, 23 Feb 2020 17:31:15 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E9=9C=80=E6=B1=82=EF=BC=9AGFRS-623=20?= =?UTF-8?q?=E5=9B=BD=E5=AF=8C=E4=BA=BA=E5=AF=BF=E9=91=AB=E7=AE=A1=E5=AE=B6?= =?UTF-8?q?=E7=BB=88=E8=BA=AB=E5=AF=BF=E9=99=A9=EF=BC=88=E4=B8=87=E8=83=BD?= =?UTF-8?q?=E5=9E=8B=EF=BC=89=20=E5=8F=98=E6=9B=B4=EF=BC=9A=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D=E5=91=8A=E7=9F=A5=20=E4=BA=BA=E5=90=8D=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E9=94=99=E8=AF=AF=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 22 ---------------------- src/views/ebiz/sale/NotifyingMessage.vue | 2 +- 2 files changed, 1 insertion(+), 23 deletions(-) delete mode 100644 .gitignore diff --git a/.gitignore b/.gitignore deleted file mode 100644 index f9e78f3b4..000000000 --- a/.gitignore +++ /dev/null @@ -1,22 +0,0 @@ -.DS_Store -node_modules -/dist - -# local env files -.env.local -.env.*.local - -# Log files -npm-debug.log* -yarn-debug.log* -yarn-error.log* - -# Editor directories and files -.idea -.vscode -*.suo -*.ntvs* -*.njsproj -*.sln -*.sw? -.history/ diff --git a/src/views/ebiz/sale/NotifyingMessage.vue b/src/views/ebiz/sale/NotifyingMessage.vue index 96f4ed587..e4377d92d 100644 --- a/src/views/ebiz/sale/NotifyingMessage.vue +++ b/src/views/ebiz/sale/NotifyingMessage.vue @@ -15,7 +15,7 @@ {{ impartTypeNumber[im.impartType] }} {{ - im.impartType == 0 || im.impartType == 2 || im.impartType == 4 || im.impartType == 6 || im.impartType == 9 || im.impartType == 11 + im.impartType == 0 || im.impartType == 2 || im.impartType == 4 || im.impartType == 6 || im.impartType == 8 || im.impartType == 10 ? saleInsuredInfo.name : saleInsuredPersonInfo.name }} From 2048d81d116c02b20bb9db84df6a2b75ae283d29 Mon Sep 17 00:00:00 2001 From: "ding.zhou" Date: Tue, 25 Feb 2020 14:52:32 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E9=9C=80=E6=B1=82=EF=BC=9AGFRS-623=20?= =?UTF-8?q?=E5=9B=BD=E5=AF=8C=E4=BA=BA=E5=AF=BF=E9=91=AB=E7=AE=A1=E5=AE=B6?= =?UTF-8?q?=E7=BB=88=E8=BA=AB=E5=AF=BF=E9=99=A9=EF=BC=88=E4=B8=87=E8=83=BD?= =?UTF-8?q?=E5=9E=8B=EF=BC=89=20=E5=8F=98=E6=9B=B4=EF=BC=9A=E8=AF=A6?= =?UTF-8?q?=E6=83=85=E9=A1=B5=E9=9D=A2=E4=BF=9D=E9=A2=9D=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/ebiz/sale/Detail.vue | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/views/ebiz/sale/Detail.vue b/src/views/ebiz/sale/Detail.vue index e4c40172f..024f41697 100644 --- a/src/views/ebiz/sale/Detail.vue +++ b/src/views/ebiz/sale/Detail.vue @@ -63,7 +63,8 @@ - + + @@ -75,7 +76,8 @@ - + +