From d7184a4ac14df7935776b4792a12da1d52a6067f Mon Sep 17 00:00:00 2001 From: "li.yuetong" Date: Thu, 8 Sep 2022 16:19:28 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=B8=AA=E9=99=A9-=E5=9B=BD=E5=AF=8C?= =?UTF-8?q?=E4=BA=BA=E5=AF=BF=E5=AF=8C=E8=B4=B5=E5=B9=B4=E5=B9=B4=E7=BB=88?= =?UTF-8?q?=E8=BA=AB=E5=AF=BF=E9=99=A9=E3=80=91=E5=9B=BD=E5=AF=8C=E4=BA=BA?= =?UTF-8?q?=E5=AF=BF=E5=AF=8C=E8=B4=B5=E5=B9=B4=E5=B9=B4=E7=BB=88=E8=BA=AB?= =?UTF-8?q?=E5=AF=BF=E9=99=A9=E5=92=8C=E5=9B=BD=E5=AF=8C=E4=BA=BA=E5=AF=BF?= =?UTF-8?q?=E9=91=AB=E4=BA=AB=E5=B9=B4=E5=B9=B4=E7=BB=88=E8=BA=AB=E5=AF=BF?= =?UTF-8?q?=E9=99=A9=EF=BC=88B=E6=AC=BE=EF=BC=89=EF=BC=8C=E4=B8=80?= =?UTF-8?q?=E6=AC=A1=E6=80=A7=E4=BA=A4=E6=B8=85,=20=E9=80=89=E6=8B=A95,10,?= =?UTF-8?q?15,20=20=E5=B9=B4=E4=BA=A4=E6=97=B6,=20=E4=BF=9D=E8=B4=B9?= =?UTF-8?q?=E8=AF=95=E7=AE=97=E6=9C=89=E9=97=AE=E9=A2=98=EF=BC=8C=E6=89=80?= =?UTF-8?q?=E6=9C=89=E8=B0=83=E4=B8=80=E4=B8=8B=E6=89=A7=E8=A1=8C=E9=A1=BA?= =?UTF-8?q?=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/js/utils/data-dictionary.js | 2 +- src/views/ebiz/common/CalculatePremium.vue | 36 ++++++++++++++-------- 2 files changed, 24 insertions(+), 14 deletions(-) diff --git a/src/assets/js/utils/data-dictionary.js b/src/assets/js/utils/data-dictionary.js index f4991ed8e..8c7a428be 100644 --- a/src/assets/js/utils/data-dictionary.js +++ b/src/assets/js/utils/data-dictionary.js @@ -3706,7 +3706,7 @@ export default { label: '元' }, { - code: 'AccidentalDeathAndDisabilityInsurance', + code: 'HighSpeedTrainAccidentDeathOrTotalDisabilityInsurance', label: '元' } ], diff --git a/src/views/ebiz/common/CalculatePremium.vue b/src/views/ebiz/common/CalculatePremium.vue index 332e2a78d..4d22fb5ce 100644 --- a/src/views/ebiz/common/CalculatePremium.vue +++ b/src/views/ebiz/common/CalculatePremium.vue @@ -896,7 +896,7 @@ export default { this.popupShow = false }, //确认选择字段 - onConfirm(value) { + async onConfirm(value) { this.columns = [] this.popupShow = false // let productCode = this.chooseProducts[this.productIndex].productCode @@ -904,15 +904,15 @@ export default { let currentEle = currentFactor[this.calFactorIndex] // let sex = this.saleInsuredPersonInfo.sex //0男 1女 - //特殊设置：如果需要填写的保费/保额校验规则跟缴费期间挂钩，当改变缴费期间时，将输入框的值恢复默认值1 - if (currentEle.code == 'payEndYear' && this.isTrial == '0') { - currentEle['columns'].forEach((item, index) => { - if (item.value == value.value) { - this.payEndYearColumnsIndex = index - } - }) - this.defalutAmt = 1 - } + // //特殊设置：如果需要填写的保费/保额校验规则跟缴费期间挂钩，当改变缴费期间时，将输入框的值恢复默认值1 + // if (currentEle.code == 'payEndYear' && this.isTrial == '0') { + // currentEle['columns'].forEach((item, index) => { + // if (item.value == value.value) { + // this.payEndYearColumnsIndex = index + // } + // }) + // this.defalutAmt = 1 + // } //中介渠道，交费期间为一次性交清时，附加险GFRS_A0007，GFRS_A0009，GFRS_A0010去掉后，附加险list就为空--隐藏’附‘icon if (currentEle.code == 'payEndYear' && value.value == '1000') { this.isEnterAddtionRiskListFunc() @@ -928,19 +928,29 @@ export default { if (currentEle.showContent != value.text) { //通用规则校验 - if (this.payExceedInsured(currentEle, currentFactor, value.value)) { + if (await this.payExceedInsured(currentEle, currentFactor, value.value)) { this.popupShow = false return false } - if (currentEle.code == 'payEndYear' && this.ageInfluencePayEndYear(value.value, currentEle)) { + if (currentEle.code == 'payEndYear' && await this.ageInfluencePayEndYear(value.value, currentEle)) { this.popupShow = false return false } - if (currentEle.code == 'insuYear' && this.ageInfluenceInsuYear(value.value, currentEle)) { + if (currentEle.code == 'insuYear' && await this.ageInfluenceInsuYear(value.value, currentEle)) { this.popupShow = false return false } + //特殊设置：如果需要填写的保费/保额校验规则跟缴费期间挂钩，当改变缴费期间时，将输入框的值恢复默认值1 + //国富人寿富贵年年终身寿险和国富人寿鑫享年年终身寿险（B款），一次性交清, 选择5,10,15,20 年交时, 保费试算有问题，所有调一下执行顺序 + if (currentEle.code == 'payEndYear' && this.isTrial == '0') { + currentEle['columns'].forEach((item, index) => { + if (item.value == value.value) { + this.payEndYearColumnsIndex = index + } + }) + this.defalutAmt = 1 + } // if(this.ruleExpression[productCode]){ // this.errorMsg = [] // this.ruleExpression[productCode].eventList.forEach(item => {