From 4db546feb4c96df03937c246d611d776b2bc0644 Mon Sep 17 00:00:00 2001 From: liyuetong Date: Mon, 18 Oct 2021 14:01:59 +0800 Subject: [PATCH] =?UTF-8?q?GFRS=5FA0009,GFRS=5FA0010=20=E8=BF=99=E4=B8=A4?= =?UTF-8?q?=E6=AC=BE=E6=97=B6=EF=BC=8C=E8=B4=A3=E4=BB=BB=E4=BF=9D=E9=A2=9D?= =?UTF-8?q?=E4=B8=8D=E7=9B=B8=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/ebiz/common/AddRiskList.vue | 41 +++++++++++----------- src/views/ebiz/common/CalculatePremium.vue | 19 +++++++--- 2 files changed, 36 insertions(+), 24 deletions(-) diff --git a/src/views/ebiz/common/AddRiskList.vue b/src/views/ebiz/common/AddRiskList.vue index da12d15c6..2b6e8bd7d 100644 --- a/src/views/ebiz/common/AddRiskList.vue +++ b/src/views/ebiz/common/AddRiskList.vue @@ -252,27 +252,28 @@ export default { isRemit: resultData.productTrialInfoDTO.isRemit, remitType: resultData.productTrialInfoDTO.remitType } + // 这个规则统一用后端配置的规则表达式，目前先注释掉 /******八桂D中介渠道校验短险规则*******/ - let risks = JSON.parse(localStorage.chooseProducts); - let checkRisk = true; - if(risks[0].productCode =="GFRS_M0051"||risks[0].productCode == 'GFRS_M0044') { - if(this.result.productCode=="GFRS_A0010"){ - for (let i = 1; i < risks.length; i++) { - for(let j = 0; j < risks[i].calFactorLst.length; j++){ - if (risks[i].calFactorLst[j].code=== 'insuYear') { - if (((risks[i].calFactorLst[j].insuYearFlag == 'Y' && risks[i].calFactorLst[j].insuYear > 1) || risks[i].calFactorLst[j].insuYearFlag == 'A') - &&risks[i].productCode!='GFRS_A0009') { - checkRisk=false; - } - } - } - } - if(checkRisk){ - this.$toast('当前未投保其他长险附加险，不可附加该险种！') - return true - } - } - } + // let risks = JSON.parse(localStorage.chooseProducts); + // let checkRisk = true; + // if(risks[0].productCode =="GFRS_M0051"||risks[0].productCode == 'GFRS_M0044') { + // if(this.result.productCode=="GFRS_A0010"){ + // for (let i = 1; i < risks.length; i++) { + // for(let j = 0; j < risks[i].calFactorLst.length; j++){ + // if (risks[i].calFactorLst[j].code=== 'insuYear') { + // if (((risks[i].calFactorLst[j].insuYearFlag == 'Y' && risks[i].calFactorLst[j].insuYear > 1) || risks[i].calFactorLst[j].insuYearFlag == 'A') + // &&risks[i].productCode!='GFRS_A0009') { + // checkRisk=false; + // } + // } + // } + // } + // if(checkRisk){ + // this.$toast('当前未投保其他长险附加险，不可附加该险种！') + // return true + // } + // } + // } /*"let risks = JSON.parse(localStorage.chooseProducts);", "let checkRisk = true;", "for (let i = 1; i < risks.length; i++) {", diff --git a/src/views/ebiz/common/CalculatePremium.vue b/src/views/ebiz/common/CalculatePremium.vue index b1fb4c354..d10e6652e 100644 --- a/src/views/ebiz/common/CalculatePremium.vue +++ b/src/views/ebiz/common/CalculatePremium.vue @@ -2243,11 +2243,15 @@ export default { } else { rollInResult = true } + console.log(this.trialList,'this.trialList') + console.log(this.trialList[index],'this.trialList[index]') + console.log(this.trialList[index].amt,'this.trialList[index].amt') //责任险保存参数构建 if (this.trialList[index].duty) { riskItem['dutyLst'] = this.trialList[index].duty //930折中方案，责任险分档 riskItem['amt'] = this.trialList[index].amt + } else { //国富人寿桂企保重大疾病保险产品专写 if ( @@ -2261,9 +2265,10 @@ export default { } } //保费算保额 - if (this.trialList[index].trialType == '1' || this.trialList[index].trialType == '2') { - riskItem['amt'] = this.trialList[index].amt - } + // if (this.trialList[index].trialType == '1' || this.trialList[index].trialType == '2') { + // riskItem['amt'] = this.trialList[index].amt + // } + //万能型产品保费赋值给保额 //增加判断是否是从建议书跳转过来了的 if (localStorage.isFrom != 'proposal') { @@ -2284,9 +2289,15 @@ export default { this.trialInfos[index].amt = this.trialList[0].standPrem } - if (item.productCode == 'GFRS_A0003' || item.productCode == 'GFRS_A0009'|| item.productCode == 'GFRS_A0010'|| item.productCode == 'GFRS_A0007') { + if (item.productCode == 'GFRS_A0003' || item.productCode == 'GFRS_A0007') { + // bug--鑫享年年+附加豁免投保人定寿B+附加豁免投保人重疾B，投保单号8186270000016187 + // ①豁免重疾B的保额应该等于主险的保费，该单的豁免重疾B的保额等于主险的保额不正确。 this.trialInfos[index].amt = this.trialList[index].amt } + // GFRS_A0009,GFRS_A0010 这两款时，责任保额不相加 + if(item.productCode == 'GFRS_A0009' || item.productCode == 'GFRS_A0010'){ + this.trialInfos[index].amt = this.trialList[index].duty[0].amt + } // GFRS_A0011-附加两全 属于非豁免险 但附加两全保额=主险年交保费+其他不带豁免责任的长期期交附加险年交保费 if (item.productCode == 'GFRS_A0011') { this.trialInfos[index].amt = this.trialList[0].prem