diff --git a/src/views/ebiz/common/CalculatePremium.vue b/src/views/ebiz/common/CalculatePremium.vue index 8fe46ed50..db5a4f87e 100644 --- a/src/views/ebiz/common/CalculatePremium.vue +++ b/src/views/ebiz/common/CalculatePremium.vue @@ -980,9 +980,31 @@ export default { if (currentEle.hasFlag) { currentEle[name + 'Flag'] = value.flag } - // this.hiddenPayEndYear(currentEle) - //特殊规则:设置豁免险 - this.getTrial() + + 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() + } } }, //交费期间为一次性交清时,清空豁免险GFRS_A0007,GFRS_A0009,GFRS_A0010并更新localStorage @@ -1029,7 +1051,7 @@ export default { } }) - //重新调用保额变化后的规则TODO + //重新调用保额变化后的规则,规则不通过的话,就不继续执行 let isContinue = this.stepperChange( riskFactor.displayAmount, productIndex, @@ -1038,10 +1060,8 @@ export default { riskFactor.maxAmt || riskFactor.maxPrem, riskFactor ) - - console.log(isContinue,'isContinue') + if(isContinue != false){ - console.log("验证责任") this.valiAndSend(dutyItem, productIndex) } }, @@ -2344,6 +2364,7 @@ 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 f3e4cac62..e53c11b90 100644 --- a/src/views/ebiz/common/MainRiskList.vue +++ b/src/views/ebiz/common/MainRiskList.vue @@ -484,7 +484,9 @@ export default { //按年龄选择 if (productTrialInfoDTO[item.code] != null) { productTrialInfoDTO[item.code].forEach(factor => { - item = Object.assign(item, 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) + } }) if (item.code == 'inputPrem') { item['inputPrem'] = Number(item.minPrem) * Number(item.moneyUnit)