From 63f6cc6215c7a39a7de7cba989f29e10235e982d Mon Sep 17 00:00:00 2001
From: yuweiqi <yu.weiqi@ebiz-fooge.com>
Date: Fri, 6 Mar 2020 15:32:51 +0800
Subject: [PATCH] =?UTF-8?q?[FIX]=E7=94=B5=E6=8A=95-=E9=80=89=E6=8B=A9?=
 =?UTF-8?q?=E9=99=A9=E7=A7=8D=E6=97=B6=E6=A0=A1=E9=AA=8C=E8=81=8C=E4=B8=9A?=
 =?UTF-8?q?=E5=AF=BF=E9=99=A9=E7=AD=89=E7=BA=A7=E9=81=97=E7=95=99bug?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D=EF=BC=88=E5=9B=BD=E5=AF=8C=E4=BA=BA=E5=AF=BF?=
 =?UTF-8?q?=E7=A6=8F=E5=AE=9D=E5=AE=9D=E6=95=99=E8=82=B2=E5=B9=B4=E9=87=91?=
 =?UTF-8?q?=E4=BF=9D=E9=99=A9=20=E3=80=81=E5=9B=BD=E5=AF=8C=E4=BA=BA?=
 =?UTF-8?q?=E5=AF=BF=E9=99=84=E5=8A=A0=E6=8A=95=E4=BF=9D=E4=BA=BA=E8=B1=81?=
 =?UTF-8?q?=E5=85=8D=E4=BF=9D=E9=99=A9=E8=B4=B9=E5=AE=9A=E6=9C=9F=E5=AF=BF?=
 =?UTF-8?q?=E9=99=A9=E3=80=81=E5=9B=BD=E5=AF=8C=E4=BA=BA=E5=AF=BF=E9=99=84?=
 =?UTF-8?q?=E5=8A=A0=E8=B1=81=E5=85=8D=E4=BF=9D=E9=99=A9=E8=B4=B9=E9=87=8D?=
 =?UTF-8?q?=E5=A4=A7=E7=96=BE=E7=97=85=E4=BF=9D=E9=99=A9=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/ebiz/common/AddRiskList.vue  | 13 ++++++++++---
 src/views/ebiz/common/MainRiskList.vue | 19 ++++++++++++-------
 2 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/src/views/ebiz/common/AddRiskList.vue b/src/views/ebiz/common/AddRiskList.vue
index 78d04e9a9..4fe77efbd 100644
--- a/src/views/ebiz/common/AddRiskList.vue
+++ b/src/views/ebiz/common/AddRiskList.vue
@@ -95,18 +95,25 @@ export default {
         if (riskRules.healthGradeLimit(resultData, this)) {
           return
         }
-        if (riskRules.lifeGradeLimit(resultData, this)) {
-          return
-        }
+        // if (riskRules.lifeGradeLimit(resultData, this)) {
+        //   return
+        // }
 
         if (this.remitLimit(resultData)) {
           return
         }
 
+        //validateAppntFlag 0-职业寿险等级需校验主合同的投保人；1-职业寿险等级无需校验主合同的投保人
         if (resultData.productInsuredDTO.validateAppntFlag == '0') {
+          //校验主合同投保人寿险职业等级
           if (riskRules.lifeGradeLimitForBaby(resultData, this)) {
             return
           }
+        } else {
+          //校验主合同的被保人寿险职业等级
+          if (riskRules.lifeGradeLimit(resultData, this)) {
+            return
+          }
         }
 
         /********end 附加险选择限制 end******/
diff --git a/src/views/ebiz/common/MainRiskList.vue b/src/views/ebiz/common/MainRiskList.vue
index d105bde18..f9c0149e6 100644
--- a/src/views/ebiz/common/MainRiskList.vue
+++ b/src/views/ebiz/common/MainRiskList.vue
@@ -9,10 +9,8 @@
           </p>
           <van-radio checked-color="red" slot="right-icon" :name="item" />
         </van-cell>
-        <van-cell>
-        </van-cell>
-        <van-cell>
-        </van-cell>
+        <van-cell> </van-cell>
+        <van-cell> </van-cell>
       </van-cell-group>
     </van-radio-group>
 
@@ -126,13 +124,20 @@ export default {
         if (riskRules.healthGradeLimit(resultData, this)) {
           return
         }
-        if (riskRules.lifeGradeLimit(resultData, this)) {
-          return
-        }
+        // if (riskRules.lifeGradeLimit(resultData, this)) {
+        //   return
+        // }
+        //validateAppntFlag 0-职业寿险等级需校验主合同的投保人；1-职业寿险等级无需校验主合同的投保人
         if (resultData.productInsuredDTO.validateAppntFlag == '0') {
+          //校验主合同投保人寿险职业等级
           if (riskRules.lifeGradeLimitForBaby(resultData, this)) {
             return
           }
+        } else {
+          //校验主合同被保人寿险职业等级
+          if (riskRules.lifeGradeLimit(resultData, this)) {
+            return
+          }
         }
         /********end 主险选择限制 end******/