Merge branch 'dev' of http://112.124.100.131/GFRS/ebiz-h5 into dev

2025-12-10 16:16:45 +08:00 · 2022-03-18 23:36:27 +08:00
parent 0d6e892a3b 4c4bc41da1
commit d229dbbdc1
2 changed files with 5 additions and 67 deletions
--- 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' || item.code == 'amt'){
-            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
@@ -1043,27 +1021,7 @@ export default {
          })
        }
      }
-      let riskFactor,riskFactorIndex
-      this.chooseProducts[0].calFactorLst.forEach((item,index) => {
-        if(item.code == 'inputAmt' || item.code == 'amt'){
-          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.valiAndSend(dutyItem, productIndex)
-      }
+      this.valiAndSend(dutyItem, productIndex)
    },
    valiAndSend(dutyItem, productIndex) {
      //验证责任
@@ -2161,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)
@@ -2180,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)
@@ -2203,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)
@@ -2221,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)
@@ -2245,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)
@@ -2264,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)
@@ -2285,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)
@@ -2301,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)
@@ -2364,7 +2305,6 @@ export default {
        }
      } else {
        if (Number(defalutValue) < Number(min) || Number(defalutValue) > Number(max)) {
-          // 54
          this.$toast(showHint)
          this.nextStepFlag = true
        } else {
--- 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)