From a989f37d4da092968caeaed37e30d73d1be51a34 Mon Sep 17 00:00:00 2001
From: "li.kai" <anbbukn2@foxmail.com>
Date: Fri, 3 Jul 2020 10:31:31 +0800
Subject: [PATCH] =?UTF-8?q?[FIX]=20=E3=80=90=E7=94=9F=E4=BA=A7-=E7=94=B5?=
 =?UTF-8?q?=E6=8A=95=E3=80=91=E4=BF=AE=E5=A4=8D=E5=85=AB=E6=A1=82=E9=99=84?=
 =?UTF-8?q?=E5=8A=A0=E9=99=A9=E8=81=8C=E4=B8=9A=E7=AD=89=E7=BA=A7=E6=A0=A1?=
 =?UTF-8?q?=E9=AA=8C=E5=BC=82=E5=B8=B8=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/ebiz/common/AddRiskList.vue | 39 ++++++++++++++-------------
 src/views/ebiz/common/risk-rules.js   |  7 +++--
 2 files changed, 25 insertions(+), 21 deletions(-)

diff --git a/src/views/ebiz/common/AddRiskList.vue b/src/views/ebiz/common/AddRiskList.vue
index 371d01141..b202e6fd9 100644
--- a/src/views/ebiz/common/AddRiskList.vue
+++ b/src/views/ebiz/common/AddRiskList.vue
@@ -76,30 +76,30 @@ export default {
         localStorage.isAutoPay = localStorage.isAutoPay == '0' ? '0' : resultData.isAutoPay //自动垫交
         localStorage.isRenew = localStorage.isRenew == '0' ? '0' : resultData.isRenew //自动续保
         localStorage.isForceRenew = localStorage.isForceRenew == '0' ? '0' : resultData.isForceRenew //自动续保默认是否选中 0-是 1-否
-        if(resultData.productTrialInfoDTO.ruleExpression){
-          let ruleExpression = localStorage.ruleExpression ? JSON.parse(localStorage.ruleExpression) : {};
+        if (resultData.productTrialInfoDTO.ruleExpression) {
+          let ruleExpression = localStorage.ruleExpression ? JSON.parse(localStorage.ruleExpression) : {}
           ruleExpression[resultData.productCode] = resultData.productTrialInfoDTO.ruleExpression
           localStorage.ruleExpression = JSON.stringify(ruleExpression)
-          
-          for(let item of ruleExpression[resultData.productCode]){
+
+          for (let item of ruleExpression[resultData.productCode]) {
             let config = JSON.parse(item.ruleExpression)
-            switch (config.eventType){
+            switch (config.eventType) {
               case 'loadFormat':
-                  let initFn = new Function(...config.funPar, config.funBody.join(''))
-                  let str = initFn(resultData)
-                  if(str){
-                    return this.$toast(str)
-                  }
-                break;
+                let initFn = new Function(...config.funPar, config.funBody.join(''))
+                let str = initFn(resultData)
+                if (str) {
+                  return this.$toast(str)
+                }
+                break
               case 'checkMainRisk':
-                  let checkMainRiskFn = new Function(...config.funPar, config.funBody.join(''))
-                  let checkMainRiskStr = checkMainRiskFn()
-                  if(checkMainRiskStr){
-                    return this.$toast(checkMainRiskStr)
-                  }
-                break;
+                let checkMainRiskFn = new Function(...config.funPar, config.funBody.join(''))
+                let checkMainRiskStr = checkMainRiskFn()
+                if (checkMainRiskStr) {
+                  return this.$toast(checkMainRiskStr)
+                }
+                break
               default:
-                break;
+                break
             }
             // if(config.eventType == 'loadFormat'){
             //     let initFn = new Function(...config.funPar, config.funBody.join(''))
@@ -158,7 +158,7 @@ export default {
         //     }
         //     break;
         // }
-        
+
         /********start 附加险选择限制 start******/
         //豁免险与其他附加险年龄险种
         if (resultData.productTrialInfoDTO.isRemit == '0' && resultData.productTrialInfoDTO.remitType == '0') {
@@ -194,6 +194,7 @@ export default {
           }
         } else {
           //校验主合同的被保险人寿险职业等级
+          console.log(1111, resultData)
           if (riskRules.lifeGradeLimit(resultData, this)) {
             return
           }
diff --git a/src/views/ebiz/common/risk-rules.js b/src/views/ebiz/common/risk-rules.js
index a8ed5b6b1..d5be05b12 100644
--- a/src/views/ebiz/common/risk-rules.js
+++ b/src/views/ebiz/common/risk-rules.js
@@ -43,9 +43,12 @@ export default {
     }
     return false
   },
-  //寿险等级对附加险的影响
+  //寿险等级对附加险的影响 标识
   lifeGradeLimit(resultData, vm) {
-    let cuttentLifeGrade = this.getSaleInsuredPersonInfo().lifeGrade
+    let cuttentLifeGrade
+    if (resultData.productTrialInfoDTO.isRemit === '0' && resultData.productTrialInfoDTO.remitType === '0')
+      cuttentLifeGrade = this.getSaleInsuredInfo().lifeGrade
+    else cuttentLifeGrade = this.getSaleInsuredPersonInfo().lifeGrade
     let lifeGrade = resultData.productInsuredDTO.lifeGrade
     if (lifeGrade == 0) return false
     if (Number(cuttentLifeGrade) > Number(lifeGrade)) {