Merge branch 'feature/GFRS-2215【待完成】重新投保' into dev

src/components/ebiz/insureAgain/ProgressBar.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: PangXingYue
  * @Date: 2021-03-23 17:07:03
- * @LastEditTime: 2021-03-25 19:03:38
+ * @LastEditTime: 2021-03-31 21:02:31
  * @LastEditors: PangXingYue
  * @Description: 
  * @FilePath: \ebiz-h5\src\components\ebiz\insureAgain\ProgressBar.vue
@@ -23,6 +23,7 @@
 
 <script>
 import { Image as VanImage } from 'vant'
+import CacheUtils from '@/assets/js/utils/cacheUtils'
 export default {
   name: 'ProgressBar',
   components: {
@@ -46,22 +47,27 @@ export default {
   },
   methods: {    
     changeProgressBar(index) {
+           //由 localStorage.salePageFlag 来控制是否可跳到指定页面
+     if (localStorage.active == '3' && index != 3) {
+       this.$toast('已到达签名确认流程，不可以回到前面的流程')
+     }
+     if (Number(CacheUtils.getLocItem('active')) < Number(index)) return
      var url;      
      switch (index) {
        case 0:
-         url = 'InsureInformation';
+         url = 'InsureInformation?salePageFlag=ProgressBar';
          break;
        case 1:
-         url = 'ProductInformation';
+         url = 'ProductInformation?salePageFlag=ProgressBar';
          break;
        case 2:
-         url = 'Notification';
+         url = 'Notification?salePageFlag=ProgressBar';
          break;
        case 3:
-         url = 'SignatureConfirmation';
+         url = 'SignatureConfirmation?salePageFlag=ProgressBar';
          break;
        default:
-         url = 'InsureInformation';
+         url = 'InsureInformation?salePageFlag=ProgressBar';
          break;
      }   
       this.$jump({

src/views/ebiz/insureAgain/InsureInformation.vue

@@ -204,6 +204,9 @@ export default {
       }
     },
     async getReAppntPolicy() {
+      if (!this.$route.query.salePageFlag) {
+        CacheUtils.setLocItem('active', this.active)
+      }
       var res = JSON.parse(CacheUtils.getLocItem('orderDetailData'))
       if (!res) {
         console.log('==================orderDetailData不存在=========================')

src/views/ebiz/insureAgain/Notification.vue

@@ -41,7 +41,7 @@
               </div>
               <!-- 第一题 -->
               <div v-for="(item, index) in im.impartItemDTOS" :key="index">
-                <div class="mt10 pb2" v-if="item.impartCode != '2b'">
+                <div class="mt10 pb2" v-if="item.impartCode != '2b' && item.impartCode != '1a' && item.impartCode != '1b'">
                   <div class="mb20 ml20">
                     <span>{{ item.impartCode + '.' + item.impartContent }}</span>
                   </div>
@@ -188,9 +188,8 @@ export default {
     ProgressBar,
     ReadingAgreement
   },
-  created() {       
+  created() {               
-       let res = JSON.parse(CacheUtils.getLocItem('orderDetailData'));
+       let res = JSON.parse(CacheUtils.getLocItem('orderDetailData'));       
-       console.log(res);
         //投被保险人关系
         // this.isExistAdditionalRisk = res.orderDTO.insuredDTOs[0].riskDTOLst.length > 1 ? true : false        
         this.relationToAppnt = res.orderDTO.insuredDTOs[0].relationToAppnt
@@ -198,9 +197,9 @@ export default {
         this.saleInsuredInfo = res.orderDTO.appntDTO
         this.saleInsuredPersonInfo = res.orderDTO.insuredDTOs[0]
         // 获取投保人信息
-        this.$CacheUtils.setLocItem('saleInsuredInfo', JSON.stringify(this.saleInsuredInfo))
+        CacheUtils.setLocItem('saleInsuredInfo', JSON.stringify(this.saleInsuredInfo))
         // 获取被保险人信息recmd
-        this.$CacheUtils.setLocItem('saleInsuredPersonInfo', JSON.stringify(this.saleInsuredPersonInfo))        
+        CacheUtils.setLocItem('saleInsuredPersonInfo', JSON.stringify(this.saleInsuredPersonInfo))        
         //如果返回参数存在曾经提交的告知信息，获取曾经提交的告知信息
         let insuredFinanceImpartDTO = this.insuredFinanceImpartDTO = res.orderDTO.appntDTO.financeImpartDTO || {} //投保人财务告知集合
         let insuredImpartDTO = this.insuredImpartDTO = res.orderDTO.appntDTO.impartDTO || {} //投保人健康告知集合
@@ -212,15 +211,16 @@ export default {
           (insuredPersionFinanceImpartDTO && insuredPersionFinanceImpartDTO.impartItemDTOS) ||
           (insuredPersionImpartDTO && insuredPersionImpartDTO.impartItemDTOS)
         ) {
-          if (insuredFinanceImpartDTO && insuredFinanceImpartDTO.impartItemDTOS) {
+          
-            this.impartDTOS.push({ impartItemDTOS: insuredFinanceImpartDTO.impartItemDTOS, impartType: insuredFinanceImpartDTO.impartType })
+          if ((insuredPersionFinanceImpartDTO && insuredPersionFinanceImpartDTO.impartItemDTOS) && this.relationToAppnt == '1'){
-          }else if((insuredPersionFinanceImpartDTO && insuredPersionFinanceImpartDTO.impartItemDTOS) && this.relationToAppnt == '1'){
             this.impartDTOS.push({ impartItemDTOS: insuredPersionFinanceImpartDTO.impartItemDTOS, impartType: insuredPersionFinanceImpartDTO.impartType })
+          } else if (insuredFinanceImpartDTO && insuredFinanceImpartDTO.impartItemDTOS) {
+            this.impartDTOS.push({ impartItemDTOS: insuredFinanceImpartDTO.impartItemDTOS, impartType: insuredFinanceImpartDTO.impartType })
           }
-          if (insuredImpartDTO && insuredImpartDTO.impartItemDTOS) {
+          if ((insuredPersionImpartDTO && insuredPersionImpartDTO.impartItemDTOS) && this.relationToAppnt == '1'){
-            this.impartDTOS.push({ impartItemDTOS: insuredImpartDTO.impartItemDTOS, impartType: insuredImpartDTO.impartType })
-          }else if ((insuredPersionImpartDTO && insuredPersionImpartDTO.impartItemDTOS) && this.relationToAppnt == '1'){
             this.impartDTOS.push({ impartItemDTOS: insuredPersionImpartDTO.impartItemDTOS, impartType: insuredPersionImpartDTO.impartType })
+          } else if (insuredImpartDTO && insuredImpartDTO.impartItemDTOS) {
+            this.impartDTOS.push({ impartItemDTOS: insuredImpartDTO.impartItemDTOS, impartType: insuredImpartDTO.impartType })
           }
           if(this.relationToAppnt != '1'){
             if (insuredPersionFinanceImpartDTO && insuredPersionFinanceImpartDTO.impartItemDTOS) {
@@ -242,10 +242,14 @@ export default {
               if (i.impartAnswer == '0') {
                 i.show = true
               } else {
-                i.questions[0].answer = ''
+                if (i.questions && i.questions.length>0) {
+                  i.questions[0].answer = ''
+                }                
               }
             })
           })
+
+          console.log(this.impartDTOS, '==============this.impartDTOS=============')
         }         
         //投被同人取到年纪和性别去判断是是否显示内容
         this.saleInsuredAge = utilsAge.getAge(this.saleInsuredInfo.birthday, new Date())
@@ -258,6 +262,9 @@ export default {
         
   },
   mounted() {
+    if (!this.$route.query.salePageFlag) {
+      CacheUtils.setLocItem('active', this.active)
+    }    
     setTimeout(() => {
       EWebBridge.webCallAppInJs('webview_left_button', {
         img: this.$assetsUrl + 'images/del-close-btn@3x.png',

src/views/ebiz/insureAgain/ProductInformation.vue

@@ -122,7 +122,7 @@ export default {
       orderAccountDTO: []
     }
   },
-  created() {   
+  created() {         
       let res = JSON.parse(CacheUtils.getLocItem('orderDetailData'))
       this.appntDTO = res.orderDTO.appntDTO
       this.insuredDTOs = res.orderDTO.insuredDTOs[0]
@@ -168,6 +168,11 @@ export default {
         }
       })                 
   },
+  mounted() {
+     if (!this.$route.query.salePageFlag) {
+        CacheUtils.setLocItem('active', this.active)
+     }   
+  },
   methods: {
     appCallBack(data) {
       if (data.trigger == 'left_button_click') {

src/views/ebiz/insureAgain/SignatureConfirmation.vue

@@ -1456,7 +1456,10 @@ export default {
   },
   mounted() {
     //若进入签名页，则不允许回到签名页前面的页面
-    localStorage.setItem('salePageFlag', this.salePageFlag)
+    // localStorage.setItem('salePageFlag', this.salePageFlag)
+    if (!this.$route.query.salePageFlag) {
+      CacheUtils.setLocItem('active', this.active)
+    }    
     let that = this
     document.title = this.changeCard ? '修改银行卡号确认' : '签名确认'
     // 初始化