From c241dc0e3fe1937f3bcdef26aa2ce76044166734 Mon Sep 17 00:00:00 2001 From: "li.jieyu@ebiz-digits.com" Date: Fri, 18 Mar 2022 22:29:18 +0800 Subject: [PATCH 1/3] =?UTF-8?q?Revert=20"=E3=80=90=E4=B8=96=E7=BA=AA?= =?UTF-8?q?=E6=97=A0=E5=BF=A7=E9=87=8D=E7=96=BE=E4=BA=A4=E8=B4=B9=E8=87=B3?= =?UTF-8?q?60/70=E5=91=A8=E5=B2=81=E6=97=B6=EF=BC=8C=E4=B8=8D=E5=8F=AF?= =?UTF-8?q?=E9=99=84=E5=8A=A0=E4=B8=A4=E5=85=A8=E9=99=A9=E3=80=91=E9=87=91?= =?UTF-8?q?=E6=8E=8C=E6=9F=9C=E7=99=BE=E4=B8=87=E5=8C=BB=E7=96=97=E8=AE=A1?= =?UTF-8?q?=E5=88=92=E4=B8=80=E5=92=8C=E8=AE=A1=E5=88=92=E4=BA=8C=E9=83=BD?= =?UTF-8?q?=E6=98=AF=E6=98=BE=E7=A4=BA=E5=90=8C=E6=A0=B7=E7=9A=84=E4=BF=9D?= =?UTF-8?q?=E8=B4=B9"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit fef4b61d --- src/views/ebiz/common/CalculatePremium.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/ebiz/common/CalculatePremium.vue b/src/views/ebiz/common/CalculatePremium.vue index 47ffbc02f..db5a4f87e 100644 --- a/src/views/ebiz/common/CalculatePremium.vue +++ b/src/views/ebiz/common/CalculatePremium.vue @@ -984,7 +984,7 @@ export default { let riskFactor,riskFactorIndex let productIndex = 0 //写死主险 this.chooseProducts[0].calFactorLst.forEach((item,index) => { - if(item.code == 'inputAmt' || item.code == 'amt'){ + if(item.code == 'inputAmt'){ riskFactor = item riskFactorIndex = index } @@ -1045,7 +1045,7 @@ export default { } let riskFactor,riskFactorIndex this.chooseProducts[0].calFactorLst.forEach((item,index) => { - if(item.code == 'inputAmt' || item.code == 'amt'){ + if(item.code == 'inputAmt'){ riskFactor = item riskFactorIndex = index } From bfcdf15cd31bb885d795dc78fa3738a0e6e0669d Mon Sep 17 00:00:00 2001 From: "li.jieyu@ebiz-digits.com" Date: Fri, 18 Mar 2022 22:29:44 +0800 Subject: [PATCH 2/3] =?UTF-8?q?Revert=20"=E3=80=90=E4=B8=96=E7=BA=AA?= =?UTF-8?q?=E6=97=A0=E5=BF=A7=E9=87=8D=E7=96=BE=E4=BA=A4=E8=B4=B9=E8=87=B3?= =?UTF-8?q?60/70=E5=91=A8=E5=B2=81=E6=97=B6=EF=BC=8C=E4=B8=8D=E5=8F=AF?= =?UTF-8?q?=E9=99=84=E5=8A=A0=E4=B8=A4=E5=85=A8=E9=99=A9=E3=80=91=E9=87=8D?= =?UTF-8?q?=E6=96=B0=E8=B0=83=E7=94=A8=E4=BF=9D=E9=A2=9D=E5=8F=98=E5=8C=96?= =?UTF-8?q?=E5=90=8E=E7=9A=84=E8=A7=84=E5=88=99=EF=BC=8C=E8=A7=84=E5=88=99?= =?UTF-8?q?=E4=B8=8D=E9=80=9A=E8=BF=87=E7=9A=84=E8=AF=9D=EF=BC=8C=E5=B0=B1?= =?UTF-8?q?=E4=B8=8D=E7=BB=A7=E7=BB=AD=E6=89=A7=E8=A1=8C"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit f60fca5a --- src/views/ebiz/common/CalculatePremium.vue | 35 +++++----------------- src/views/ebiz/common/MainRiskList.vue | 4 +-- 2 files changed, 8 insertions(+), 31 deletions(-) diff --git a/src/views/ebiz/common/CalculatePremium.vue b/src/views/ebiz/common/CalculatePremium.vue index db5a4f87e..8fe46ed50 100644 --- a/src/views/ebiz/common/CalculatePremium.vue +++ b/src/views/ebiz/common/CalculatePremium.vue @@ -980,31 +980,9 @@ export default { if (currentEle.hasFlag) { currentEle[name + 'Flag'] = value.flag } - - let riskFactor,riskFactorIndex - let productIndex = 0 //写死主险 - this.chooseProducts[0].calFactorLst.forEach((item,index) => { - if(item.code == 'inputAmt'){ - riskFactor = item - riskFactorIndex = index - } - }) - - //重新调用保额变化后的规则，规则不通过的话，就不继续执行 - let isContinue = this.stepperChange( - riskFactor.displayAmount, - productIndex, - riskFactorIndex, - riskFactor.minAmt || riskFactor.minPrem, - riskFactor.maxAmt || riskFactor.maxPrem, - riskFactor - ) - - if(isContinue != false){ - // this.hiddenPayEndYear(currentEle) - //特殊规则：设置豁免险 - this.getTrial() - } + // this.hiddenPayEndYear(currentEle) + //特殊规则：设置豁免险 + this.getTrial() } }, //交费期间为一次性交清时，清空豁免险GFRS_A0007，GFRS_A0009，GFRS_A0010并更新localStorage @@ -1051,7 +1029,7 @@ export default { } }) - //重新调用保额变化后的规则，规则不通过的话，就不继续执行 + //重新调用保额变化后的规则TODO let isContinue = this.stepperChange( riskFactor.displayAmount, productIndex, @@ -1060,8 +1038,10 @@ export default { riskFactor.maxAmt || riskFactor.maxPrem, riskFactor ) - + + console.log(isContinue,'isContinue') if(isContinue != false){ + console.log("验证责任") this.valiAndSend(dutyItem, productIndex) } }, @@ -2364,7 +2344,6 @@ export default { } } else { if (Number(defalutValue) < Number(min) || Number(defalutValue) > Number(max)) { - // 54 this.$toast(showHint) this.nextStepFlag = true } else { diff --git a/src/views/ebiz/common/MainRiskList.vue b/src/views/ebiz/common/MainRiskList.vue index e53c11b90..f3e4cac62 100644 --- a/src/views/ebiz/common/MainRiskList.vue +++ b/src/views/ebiz/common/MainRiskList.vue @@ -484,9 +484,7 @@ export default { //按年龄选择 if (productTrialInfoDTO[item.code] != null) { productTrialInfoDTO[item.code].forEach(factor => { - if(JSON.parse(this.$CacheUtils.getLocItem('saleInsuredPersonInfo')).age >= factor.minAge && JSON.parse(this.$CacheUtils.getLocItem('saleInsuredPersonInfo')).age <= factor.maxAge){ - item = Object.assign(item, factor) - } + item = Object.assign(item, factor) }) if (item.code == 'inputPrem') { item['inputPrem'] = Number(item.minPrem) * Number(item.moneyUnit) From 4c4bc41da13d2827189dc5e80b04e48890583452 Mon Sep 17 00:00:00 2001 From: "li.jieyu@ebiz-digits.com" Date: Fri, 18 Mar 2022 22:30:05 +0800 Subject: [PATCH 3/3] =?UTF-8?q?Revert=20"=E6=97=A0=E5=BF=A7=E9=87=8D?= =?UTF-8?q?=E7=96=BE=E8=B6=85=E8=BF=87=E6=9C=80=E4=BD=8E=E5=9F=BA=E6=9C=AC?= =?UTF-8?q?=E4=BF=9D=E9=99=A9=E9=87=91=E9=A2=9D=E4=B8=BA50000=E5=85=83?= =?UTF-8?q?=E6=95=B4=E6=95=B0=E5=80=8D=EF=BC=8C=E7=B3=BB=E7=BB=9F=E6=98=AF?= =?UTF-8?q?=E6=9C=89=E6=8F=90=E7=A4=BA=E4=BA=86=EF=BC=8C=E4=BD=86=E6=98=AF?= =?UTF-8?q?=E6=B2=A1=E6=9C=89=E8=BF=9B=E8=A1=8C=E9=98=BB=E6=96=AD"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 61aa280f --- src/views/ebiz/common/CalculatePremium.vue | 41 +--------------------- 1 file changed, 1 insertion(+), 40 deletions(-) diff --git a/src/views/ebiz/common/CalculatePremium.vue b/src/views/ebiz/common/CalculatePremium.vue index 8fe46ed50..d67298e49 100644 --- a/src/views/ebiz/common/CalculatePremium.vue +++ b/src/views/ebiz/common/CalculatePremium.vue @@ -1021,29 +1021,7 @@ export default { }) } } - let riskFactor,riskFactorIndex - this.chooseProducts[0].calFactorLst.forEach((item,index) => { - if(item.code == 'inputAmt'){ - riskFactor = item - riskFactorIndex = index - } - }) - - //重新调用保额变化后的规则TODO - let isContinue = this.stepperChange( - riskFactor.displayAmount, - productIndex, - riskFactorIndex, - riskFactor.minAmt || riskFactor.minPrem, - riskFactor.maxAmt || riskFactor.maxPrem, - riskFactor - ) - - console.log(isContinue,'isContinue') - if(isContinue != false){ - console.log("验证责任") - this.valiAndSend(dutyItem, productIndex) - } + this.valiAndSend(dutyItem, productIndex) }, valiAndSend(dutyItem, productIndex) { //验证责任 @@ -2141,13 +2119,11 @@ export default { if (Number(defalutValue) < Number(riskFactor.rules[1].minPrem) || Number(defalutValue) > Number(riskFactor.rules[1].maxPrem)) { this.$toast('56周岁-60周岁最低基本保险金额为'+ (Number(riskFactor.rules[1].minPrem) * 10000) +'元。超过最低基本保险金额为10000元整数倍。') this.nextStepFlag = true - return false } else { if ((Number(defalutValue) * 10000) % (Number(currentEle.limit) * 10000) != 0) { // this.defalutAmt = currentEle.rules[productIndex].displayAmount this.$toast('56周岁-60周岁最低基本保险金额为'+ (Number(riskFactor.rules[1].minPrem) * 10000) +'元。超过最低基本保险金额为10000元整数倍。') this.nextStepFlag = true - return false } else { this.mainRiskInfluenceAddRisk() currentEle['amt'] = Number(defalutValue) * Number(currentEle.moneyUnit) @@ -2160,13 +2136,11 @@ export default { if (Number(defalutValue) < Number(riskFactor.rules[0].minPrem) || Number(defalutValue) > Number(riskFactor.rules[0].maxPrem)) { this.$toast('0周岁-55周岁最低基本保险金额为'+ (Number(riskFactor.rules[0].minPrem) * 10000) +'元。超过最低基本保险金额为10000元整数倍。') this.nextStepFlag = true - return false } else { if ((Number(defalutValue) * 10000) % (Number(currentEle.limit) * 10000) != 0) { // this.defalutAmt = currentEle.rules[productIndex].displayAmount this.$toast('0周岁-55周岁最低基本保险金额为'+ (Number(riskFactor.rules[0].minPrem) * 10000) +'元。超过最低基本保险金额为10000元整数倍。') this.nextStepFlag = true - return false } else { this.mainRiskInfluenceAddRisk() currentEle['amt'] = Number(defalutValue) * Number(currentEle.moneyUnit) @@ -2183,13 +2157,11 @@ export default { if (Number(defalutValue) < Number(riskFactor.rules[1].minPrem) || Number(defalutValue) > Number(riskFactor.rules[1].maxPrem)) { this.$toast('年龄在41周岁至60周岁被保险人，投保本险种时，最低基本保险金额为50000元。超过最低基本保险金额为10000元整数倍。') this.nextStepFlag = true - return false } else { if ((Number(defalutValue) * 10000) % (Number(currentEle.limit) * 10000) != 0) { // this.defalutAmt = currentEle.rules[productIndex].displayAmount this.$toast('年龄在41周岁至60周岁被保险人，投保本险种时，最低基本保险金额为50000元。超过最低基本保险金额为10000元整数倍。') this.nextStepFlag = true - return false } else { this.mainRiskInfluenceAddRisk() currentEle['amt'] = Number(defalutValue) * Number(currentEle.moneyUnit) @@ -2201,13 +2173,11 @@ export default { if (Number(defalutValue) < Number(riskFactor.rules[0].minPrem) || Number(defalutValue) > Number(riskFactor.rules[0].maxPrem)) { this.$toast('年龄在0-40周岁被保险人，投保本险种时，最低基本保险金额为100000元，超过最低基本保险金额为10000元整数倍。') this.nextStepFlag = true - return false } else { if ((Number(defalutValue) * 10000) % (Number(currentEle.limit) * 10000) != 0) { // this.defalutAmt = currentEle.rules[productIndex].displayAmount this.$toast('年龄在0-40周岁被保险人，投保本险种时，最低基本保险金额为100000元，超过最低基本保险金额为10000元整数倍。') this.nextStepFlag = true - return false } else { this.mainRiskInfluenceAddRisk() currentEle['amt'] = Number(defalutValue) * Number(currentEle.moneyUnit) @@ -2225,13 +2195,11 @@ export default { if (Number(defalutValue) < Number(riskFactor.rules[1].minPrem) || Number(defalutValue) > Number(riskFactor.rules[1].maxPrem)) { this.$toast('51周岁-60周岁最低基本保险金额为'+ (Number(riskFactor.rules[1].minPrem) * 10000) +'元。超过最低基本保险金额为'+ (Number(riskFactor.rules[1].limit) * 10000) +'元整数倍。') this.nextStepFlag = true - return false } else { if ((Number(defalutValue) * 10000) % (Number(currentEle.limit) * 10000) != 0) { // this.defalutAmt = currentEle.rules[productIndex].displayAmount this.$toast('51周岁-60周岁最低基本保险金额为'+ (Number(riskFactor.rules[1].minPrem) * 10000) +'元。超过最低基本保险金额为'+ (Number(riskFactor.rules[1].limit) * 10000) +'元整数倍。') this.nextStepFlag = true - return false } else { this.mainRiskInfluenceAddRisk() currentEle['amt'] = Number(defalutValue) * Number(currentEle.moneyUnit) @@ -2244,12 +2212,10 @@ export default { if (Number(defalutValue) < Number(riskFactor.rules[0].minPrem) || Number(defalutValue) > Number(riskFactor.rules[0].maxPrem)) { this.$toast('0周岁-50周岁最低基本保险金额为'+ (Number(riskFactor.rules[0].minPrem) * 10000) +'元。超过最低基本保险金额为'+ (Number(riskFactor.rules[0].limit) * 10000) +'元整数倍。') this.nextStepFlag = true - return false } else { if ((Number(defalutValue) * 10000) % (Number(currentEle.limit) * 10000) != 0) { this.$toast('0周岁-50周岁最低基本保险金额为'+ (Number(riskFactor.rules[0].minPrem) * 10000) +'元。超过最低基本保险金额为'+ (Number(riskFactor.rules[0].limit) * 10000) +'元整数倍。') this.nextStepFlag = true - return false } else { this.mainRiskInfluenceAddRisk() currentEle['amt'] = Number(defalutValue) * Number(currentEle.moneyUnit) @@ -2265,13 +2231,11 @@ export default { if (Number(defalutValue) < Number(riskFactor.rules[1].minPrem) || Number(defalutValue) > Number(riskFactor.rules[1].maxPrem)) { this.$toast('56周岁-60周岁最低基本保险金额为'+ (Number(riskFactor.rules[1].minPrem) * 10000) +'元。超过最低基本保险金额为'+ (Number(riskFactor.rules[1].limit) * 10000) +'元整数倍。') this.nextStepFlag = true - return false } else { if ((Number(defalutValue) * 10000) % (Number(currentEle.limit) * 10000) != 0) { // this.defalutAmt = currentEle.rules[productIndex].displayAmount this.$toast('56周岁-60周岁最低基本保险金额为'+ (Number(riskFactor.rules[1].minPrem) * 10000) +'元。超过最低基本保险金额为'+ (Number(riskFactor.rules[1].limit) * 10000) +'元整数倍。') this.nextStepFlag = true - return false } else { this.mainRiskInfluenceAddRisk() currentEle['amt'] = Number(defalutValue) * Number(currentEle.moneyUnit) @@ -2281,16 +2245,13 @@ export default { //年龄在0-50周岁被保险人，投保本险种时，最低基本保险金额为50000元，超过最低基本保险金额为10000元整数倍。 } else if (this.saleInsuredPersonInfo.age >= 0 && this.saleInsuredPersonInfo.age <= 55) { //使用rules规则里的第一条控制保额份数 - // debugger if (Number(defalutValue) < Number(riskFactor.rules[0].minPrem) || Number(defalutValue) > Number(riskFactor.rules[0].maxPrem)) { this.$toast('0周岁-55周岁最低基本保险金额为'+ (Number(riskFactor.rules[0].minPrem) * 10000) +'元。超过最低基本保险金额为'+ (Number(riskFactor.rules[0].limit) * 10000) +'元整数倍。') this.nextStepFlag = true - return false } else { if ((Number(defalutValue) * 10000) % (Number(currentEle.limit) * 10000) != 0) { this.$toast('0周岁-55周岁最低基本保险金额为'+ (Number(riskFactor.rules[0].minPrem) * 10000) +'元。超过最低基本保险金额为'+ (Number(riskFactor.rules[0].limit) * 10000) +'元整数倍。') this.nextStepFlag = true - return false } else { this.mainRiskInfluenceAddRisk() currentEle['amt'] = Number(defalutValue) * Number(currentEle.moneyUnit)