diff --git a/src/views/ebiz/common/AddRiskList.vue b/src/views/ebiz/common/AddRiskList.vue index f50b17492..cf35c64ee 100644 --- a/src/views/ebiz/common/AddRiskList.vue +++ b/src/views/ebiz/common/AddRiskList.vue @@ -253,18 +253,40 @@ export default { remitType: resultData.productTrialInfoDTO.remitType } /******八桂D中介渠道校验短险规则*******/ - let mainRisk = JSON.parse(localStorage.chooseProducts)[0]; - let mainRiskCode = mainRisk.productCode; - if(mainRiskCode =="GFRS_M0051") { - for (let i = 0; i < calFactorLst.length; i++) { - if (calFactorLst[i].code === 'insuYear') { - if ((calFactorLst[i].insuYearFlag == 'Y' && calFactorLst[i].insuYear > 1) || calFactorLst[i].insuYearFlag == 'A') { - this.$toast('当前未投保其他长险附加险,不可附加该险种!') - return true + let risks = JSON.parse(localStorage.chooseProducts); + let checkRisk = true; + if(risks[0].productCode =="GFRS_M0051") { + if(this.result.productCode=="GFRS_A0009"||this.result.productCode=="GFRS_A0010"){ + for (let i = 1; i < risks.length; i++) { + for(let j = 0; j < risks.calFactorLst.length; j++){ + if (risks.calFactorLst[j].code === 'insuYear') { + if ((risks.calFactorLst[j].insuYearFlag == 'Y' && risks.calFactorLst[j].insuYear > 1) || risks.calFactorLst[j].insuYearFlag == 'A') { + 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++) {", + "for(let j = 0; j < risks.calFactorLst.length; j++){", + "if (risks.calFactorLst[j].code === \"insuYear\") {", + "if ((risks.calFactorLst[j].insuYearFlag == \"Y\" && risks.calFactorLst[j].insuYear > 1) || risks.calFactorLst[j].insuYearFlag == \"A\") {", + "checkRisk=false;", + "}", + "}", + "}", + "}", + "if(checkRisk){", + "return \"当前未投保其他长险附加险,不可附加该险种!\";", + "}",*/ + //构建险种数组 let productsData if (localStorage.chooseProducts) { diff --git a/src/views/ebiz/common/CalculatePremium.vue b/src/views/ebiz/common/CalculatePremium.vue index d7fac32bf..c780743a7 100644 --- a/src/views/ebiz/common/CalculatePremium.vue +++ b/src/views/ebiz/common/CalculatePremium.vue @@ -1557,13 +1557,25 @@ export default { trialInfo.duty = result } }) - //针对八桂D产品 计算被保人重疾B附加险保额 ==其他附加险的保额 + //针对八桂D产品 计算被保人重疾B附加险保额 ==其他长险附加险的保额 if ( this.chooseProducts[0].mainRiskCode == 'GFRS_M0051'||this.chooseProducts[0].mainRiskCode == 'GFRS_M0044'){ if(item.productCode == 'GFRS_A0010'){ + let risks = this.chooseProducts; + let shortRisks=['GFRS_A0010']; + //拿到短险附加险数组 + for (let i = 1; i < risks.length; i++) { + for(let j = 0; j < risks.calFactorLst.length; j++){ + if (risks.calFactorLst[j].code === 'insuYear') { + if ((risks.calFactorLst[j].insuYearFlag == 'Y' && risks.calFactorLst[j].insuYear > 1) || risks.calFactorLst[j].insuYearFlag == 'A') { + shortRisks.push(risks[i].productCode); + } + } + } + } let toTrial = 0 let trials = JSON.parse(localStorage.trialList) trials.forEach(tr=>{ - if(tr.isMainRisk=='1'&&tr.productCode!='GFRS_A0010'){ + if(tr.isMainRisk=='1'&&!shortRisks.includes(tr.productCode)){ toTrial+=Number(tr.prem); } })