From 2ae69c6ec0bd89119797104ed369cdfbc255c3b5 Mon Sep 17 00:00:00 2001 From: dwq <15731277156@163.com> Date: Mon, 12 Jul 2021 14:24:49 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E3=80=90=E4=B8=AD=E4=BB=8B=E6=B8=A0?= =?UTF-8?q?=E9=81=93-=E5=85=AB=E6=A1=82=E6=97=A0=E5=BF=A7D=E3=80=91=20?= =?UTF-8?q?=E5=88=A4=E6=96=AD=E7=9F=AD=E9=99=A9=E9=99=84=E5=8A=A0=E9=99=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/ebiz/common/AddRiskList.vue | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/src/views/ebiz/common/AddRiskList.vue b/src/views/ebiz/common/AddRiskList.vue index 52bb386db..f50b17492 100644 --- a/src/views/ebiz/common/AddRiskList.vue +++ b/src/views/ebiz/common/AddRiskList.vue @@ -252,6 +252,19 @@ export default { isRemit: resultData.productTrialInfoDTO.isRemit, 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 productsData if (localStorage.chooseProducts) { From f72d06e77ecb7ab5c4eb73e694987edd0c8170e2 Mon Sep 17 00:00:00 2001 From: dwq <15731277156@163.com> Date: Mon, 12 Jul 2021 15:21:05 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E3=80=90=E4=B8=AD=E4=BB=8B=E6=B8=A0?= =?UTF-8?q?=E9=81=93-=E5=85=AB=E6=A1=82=E6=97=A0=E5=BF=A7D=E3=80=91=20?= =?UTF-8?q?=E7=9F=AD=E9=99=A9=E4=BF=9D=E8=B4=B9=E8=AE=A1=E7=AE=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/ebiz/common/AddRiskList.vue | 38 +++++++++++++++++----- src/views/ebiz/common/CalculatePremium.vue | 16 +++++++-- 2 files changed, 44 insertions(+), 10 deletions(-) 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); } }) From f376d854b4a27e6641cf0c1ec648abe39820cc42 Mon Sep 17 00:00:00 2001 From: dwq <15731277156@163.com> Date: Mon, 12 Jul 2021 15:50:15 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E3=80=90=E4=B8=AD=E4=BB=8B=E6=B8=A0?= =?UTF-8?q?=E9=81=93-=E5=85=AB=E6=A1=82=E6=97=A0=E5=BF=A7D=E3=80=91=20?= =?UTF-8?q?=E4=B8=AD=E4=BB=8B=E6=B8=A0=E9=81=93=E7=9F=AD=E9=99=A9=E9=99=84?= =?UTF-8?q?=E5=8A=A0=E9=99=A9=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/ebiz/common/AddRiskList.vue | 6 +++--- src/views/ebiz/common/CalculatePremium.vue | 14 +++++++------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/views/ebiz/common/AddRiskList.vue b/src/views/ebiz/common/AddRiskList.vue index cf35c64ee..6d94f673a 100644 --- a/src/views/ebiz/common/AddRiskList.vue +++ b/src/views/ebiz/common/AddRiskList.vue @@ -258,9 +258,9 @@ export default { 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') { + 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') { checkRisk=false; } } diff --git a/src/views/ebiz/common/CalculatePremium.vue b/src/views/ebiz/common/CalculatePremium.vue index c780743a7..a37d0b531 100644 --- a/src/views/ebiz/common/CalculatePremium.vue +++ b/src/views/ebiz/common/CalculatePremium.vue @@ -1560,14 +1560,14 @@ export default { //针对八桂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']; + let risks = JSON.parse(localStorage.chooseProducts); + let longRisks=['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); + 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') { + longRisks.push(risks[i].productCode); } } } @@ -1575,7 +1575,7 @@ export default { let toTrial = 0 let trials = JSON.parse(localStorage.trialList) trials.forEach(tr=>{ - if(tr.isMainRisk=='1'&&!shortRisks.includes(tr.productCode)){ + if(tr.isMainRisk=='1'&&tr.productCode!='GFRS_A0010'&&longRisks.includes(tr.productCode)){ toTrial+=Number(tr.prem); } }) From a9f3c90b4f0dc749c8cc3e529e19623295099378 Mon Sep 17 00:00:00 2001 From: dwq <15731277156@163.com> Date: Mon, 12 Jul 2021 16:28:53 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E3=80=90=E4=B8=AD=E4=BB=8B=E6=B8=A0?= =?UTF-8?q?=E9=81=93-=E5=85=AB=E6=A1=82=E6=97=A0=E5=BF=A7D=E3=80=91=20?= =?UTF-8?q?=E5=85=AB=E6=A1=82D=E6=8A=95=E4=BF=9D=E8=A7=84=E5=88=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/ebiz/common/AddRiskList.vue | 2 +- src/views/ebiz/common/CalculatePremium.vue | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/ebiz/common/AddRiskList.vue b/src/views/ebiz/common/AddRiskList.vue index 6d94f673a..7ae5798b5 100644 --- a/src/views/ebiz/common/AddRiskList.vue +++ b/src/views/ebiz/common/AddRiskList.vue @@ -255,7 +255,7 @@ export default { /******八桂D中介渠道校验短险规则*******/ let risks = JSON.parse(localStorage.chooseProducts); let checkRisk = true; - if(risks[0].productCode =="GFRS_M0051") { + if(risks[0].productCode =="GFRS_M0051"||risks[0].productCode == 'GFRS_M0044') { 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[i].calFactorLst.length; j++){ diff --git a/src/views/ebiz/common/CalculatePremium.vue b/src/views/ebiz/common/CalculatePremium.vue index a37d0b531..9b0b50a86 100644 --- a/src/views/ebiz/common/CalculatePremium.vue +++ b/src/views/ebiz/common/CalculatePremium.vue @@ -1561,7 +1561,7 @@ export default { if ( this.chooseProducts[0].mainRiskCode == 'GFRS_M0051'||this.chooseProducts[0].mainRiskCode == 'GFRS_M0044'){ if(item.productCode == 'GFRS_A0010'){ let risks = JSON.parse(localStorage.chooseProducts); - let longRisks=['GFRS_A0010']; + let longRisks=[]; //拿到短险附加险数组 for (let i = 1; i < risks.length; i++) { for(let j = 0; j < risks[i].calFactorLst.length; j++){ From 037ea283642953ede0c1d697fab3e4b852c79572 Mon Sep 17 00:00:00 2001 From: dwq <15731277156@163.com> Date: Mon, 12 Jul 2021 18:58:51 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E3=80=90=E4=B8=AD=E4=BB=8B=E6=B8=A0?= =?UTF-8?q?=E9=81=93-=E5=85=AB=E6=A1=82=E6=97=A0=E5=BF=A7D=E3=80=91=20?= =?UTF-8?q?=E7=9F=AD=E9=99=A9=E4=BA=A7=E5=93=81=E8=A7=84=E5=88=99=E5=88=A4?= =?UTF-8?q?=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/ebiz/common/AddRiskList.vue | 5 +- src/views/ebiz/common/CalculatePremium.vue | 54 ++++++++++++++++------ 2 files changed, 43 insertions(+), 16 deletions(-) diff --git a/src/views/ebiz/common/AddRiskList.vue b/src/views/ebiz/common/AddRiskList.vue index 7ae5798b5..da12d15c6 100644 --- a/src/views/ebiz/common/AddRiskList.vue +++ b/src/views/ebiz/common/AddRiskList.vue @@ -256,11 +256,12 @@ export default { 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_A0009"||this.result.productCode=="GFRS_A0010"){ + 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') { + 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; } } diff --git a/src/views/ebiz/common/CalculatePremium.vue b/src/views/ebiz/common/CalculatePremium.vue index 9b0b50a86..1fc0ec3db 100644 --- a/src/views/ebiz/common/CalculatePremium.vue +++ b/src/views/ebiz/common/CalculatePremium.vue @@ -1434,21 +1434,47 @@ export default { } else { this.chooseProducts.splice(index, 1) } - - if(this.chooseProducts.length==2&&this.chooseProducts[1].productCode=='GFRS_A0010'){ - Dialog.alert({ - title: '提示', - message: '当前未投保其他长险附加险，将删除该险种重新选择附加险！' - }).then(() => { - this.chooseProducts.splice(1, 1) + if ( this.chooseProducts[0].mainRiskCode == 'GFRS_M0051'||this.chooseProducts[0].mainRiskCode == 'GFRS_M0044'){ + let risks = this.chooseProducts; + let longRisks=[]; + //拿到长险附加险数组 + 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'&&risks[i].productCode!='GFRS_A0010') { + longRisks.push(risks[i].productCode); + } + } + } + } + if((this.chooseProducts.length==2&&this.chooseProducts[1].productCode=='GFRS_A0010') + ||(this.chooseProducts.length==3&&JSON.stringify(this.chooseProducts).includes("GFRS_A0010")&&JSON.stringify(this.chooseProducts).includes("GFRS_A0009")) + ||longRisks.length<=0){ + Dialog.alert({ + title: '提示', + message: '当前未投保其他长险附加险，将删除该险种重新选择附加险！' + }).then(() => { + this.chooseProducts.splice(1, 1) + localStorage.chooseProducts = JSON.stringify(this.chooseProducts) + this.getTrial() + }) + // this.$toast('当前未投保其他长险附加险，请删除该险种重新选择附加险！') + // this.nextStepFlag = true + } + if(this.chooseProducts.length==3&&JSON.stringify(this.chooseProducts).includes("GFRS_A0010")&&JSON.stringify(this.chooseProducts).includes("GFRS_A0009") + ||longRisks.length<=0){ + this.$toast('当前未投保其他长险附加险，请删除该险种重新选择附加险！') + this.nextStepFlag = true + this.chooseProducts.splice(1, 2) + localStorage.chooseProducts = JSON.stringify(this.chooseProducts) + this.getTrial() + } + } localStorage.chooseProducts = JSON.stringify(this.chooseProducts) this.getTrial() - }) - // this.$toast('当前未投保其他长险附加险，请删除该险种重新选择附加险！') - // this.nextStepFlag = true - } - localStorage.chooseProducts = JSON.stringify(this.chooseProducts) - this.getTrial() + }) .catch(() => {}) }, @@ -1562,7 +1588,7 @@ export default { if(item.productCode == 'GFRS_A0010'){ let risks = JSON.parse(localStorage.chooseProducts); let longRisks=[]; - //拿到短险附加险数组 + //拿到长险附加险数组 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') { From a499fc3e1359e1516da49d877fba8f5c910fcbe2 Mon Sep 17 00:00:00 2001 From: dwq <15731277156@163.com> Date: Tue, 13 Jul 2021 09:48:12 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E3=80=90=E4=B8=AD=E4=BB=8B=E6=B8=A0?= =?UTF-8?q?=E9=81=93-=E5=85=AB=E6=A1=82=E6=97=A0=E5=BF=A7D=E3=80=91=20?= =?UTF-8?q?=E5=88=A0=E9=99=A4=E9=99=84=E5=8A=A0=E9=95=BF=E9=99=A9=EF=BC=8C?= =?UTF-8?q?=E4=BF=AE=E6=94=B9-=E4=BC=9A=E6=9C=89=E5=BC=B9=E7=AA=97?= =?UTF-8?q?=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/ebiz/common/CalculatePremium.vue | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/views/ebiz/common/CalculatePremium.vue b/src/views/ebiz/common/CalculatePremium.vue index 1fc0ec3db..2d3c95fbb 100644 --- a/src/views/ebiz/common/CalculatePremium.vue +++ b/src/views/ebiz/common/CalculatePremium.vue @@ -1443,7 +1443,7 @@ export default { 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'&&risks[i].productCode!='GFRS_A0010') { + &&risks[i].productCode!='GFRS_A0010') { longRisks.push(risks[i].productCode); } } @@ -1451,7 +1451,7 @@ export default { } if((this.chooseProducts.length==2&&this.chooseProducts[1].productCode=='GFRS_A0010') ||(this.chooseProducts.length==3&&JSON.stringify(this.chooseProducts).includes("GFRS_A0010")&&JSON.stringify(this.chooseProducts).includes("GFRS_A0009")) - ||longRisks.length<=0){ + ||(longRisks.length<=0&&this.chooseProducts.length>1)){ Dialog.alert({ title: '提示', message: '当前未投保其他长险附加险，将删除该险种重新选择附加险！' @@ -1464,12 +1464,12 @@ export default { // this.nextStepFlag = true } if(this.chooseProducts.length==3&&JSON.stringify(this.chooseProducts).includes("GFRS_A0010")&&JSON.stringify(this.chooseProducts).includes("GFRS_A0009") - ||longRisks.length<=0){ + ||(longRisks.length<=0&&this.chooseProducts.length>1)){ this.$toast('当前未投保其他长险附加险，请删除该险种重新选择附加险！') this.nextStepFlag = true this.chooseProducts.splice(1, 2) - localStorage.chooseProducts = JSON.stringify(this.chooseProducts) - this.getTrial() + localStorage.chooseProducts = JSON.stringify(this.chooseProducts) + // this.getTrial() } } localStorage.chooseProducts = JSON.stringify(this.chooseProducts)