Merge branch 'hotfix/bug_GFRS-1620【生产-电投】选八桂无忧B附加险时校验投被保人职业等级bug修复' into release/0707

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){
+        if (resultData.productTrialInfoDTO.ruleExpression) {
-          let ruleExpression = localStorage.ruleExpression ? JSON.parse(localStorage.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 initFn = new Function(...config.funPar, config.funBody.join(''))
-                  let str = initFn(resultData)
+                let str = initFn(resultData)
-                  if(str){
+                if (str) {
-                    return this.$toast(str)
+                  return this.$toast(str)
-                  }
+                }
-                break;
+                break
               case 'checkMainRisk':
-                  let checkMainRiskFn = new Function(...config.funPar, config.funBody.join(''))
+                let checkMainRiskFn = new Function(...config.funPar, config.funBody.join(''))
-                  let checkMainRiskStr = checkMainRiskFn()
+                let checkMainRiskStr = checkMainRiskFn()
-                  if(checkMainRiskStr){
+                if (checkMainRiskStr) {
-                    return this.$toast(checkMainRiskStr)
+                  return this.$toast(checkMainRiskStr)
-                  }
+                }
-                break;
+                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
           }

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)) {

src/views/ebiz/sale/SignatureConfirmation.vue

@@ -568,6 +568,7 @@ export default {
     // 人脸识别
     start_ocr(val) {
       // val  0投保人 1被保险人 2本人
+      /////
       let that = this
       if (this.isWeixin) {
         window.localStorage.setItem('sign-val', val)
@@ -713,15 +714,16 @@ export default {
         }*/
       }
       console.log('跳转页面path', path)
-      that.$jump({
+      if (path)
-        flag: 'h5',
+        that.$jump({
-        extra: {
+          flag: 'h5',
-          url: location.origin + '/#/sale/' + path
+          extra: {
-        },
+            url: location.origin + '/#/sale/' + path
-        routerInfo: {
+          },
-          path: '/sale/' + path
+          routerInfo: {
-        }
+            path: '/sale/' + path
-      })
+          }
+        })
     },
     insuredUrl() {
       let that = this