From f60fca5aa329a7d0b2a1e84de78ba3e123117383 Mon Sep 17 00:00:00 2001
From: "li.yuetong" <li.yuetong@ebiz-digits.com>
Date: Thu, 17 Mar 2022 15:05:58 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=B8=96=E7=BA=AA=E6=97=A0=E5=BF=A7?=
 =?UTF-8?q?=E9=87=8D=E7=96=BE=E4=BA=A4=E8=B4=B9=E8=87=B360/70=E5=91=A8?=
 =?UTF-8?q?=E5=B2=81=E6=97=B6=EF=BC=8C=E4=B8=8D=E5=8F=AF=E9=99=84=E5=8A=A0?=
 =?UTF-8?q?=E4=B8=A4=E5=85=A8=E9=99=A9=E3=80=91=E9=87=8D=E6=96=B0=E8=B0=83?=
 =?UTF-8?q?=E7=94=A8=E4=BF=9D=E9=A2=9D=E5=8F=98=E5=8C=96=E5=90=8E=E7=9A=84?=
 =?UTF-8?q?=E8=A7=84=E5=88=99=EF=BC=8C=E8=A7=84=E5=88=99=E4=B8=8D=E9=80=9A?=
 =?UTF-8?q?=E8=BF=87=E7=9A=84=E8=AF=9D=EF=BC=8C=E5=B0=B1=E4=B8=8D=E7=BB=A7?=
 =?UTF-8?q?=E7=BB=AD=E6=89=A7=E8=A1=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/ebiz/common/CalculatePremium.vue | 35 +++++++++++++++++-----
 src/views/ebiz/common/MainRiskList.vue     |  4 ++-
 2 files changed, 31 insertions(+), 8 deletions(-)

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)