[FIX]电投优化-页面跳转初始页面查询保单信息

src/components/ebiz/sale/IndexBar.vue

@@ -45,11 +45,12 @@ export default {
         { pageNo: 2, pageItem: '被保人信息', urlStr: '/sale/insuredPerson', tabClass: '' },
         { pageNo: 3, pageItem: '选择产品', urlStr: '/common/selectedProduct', tabClass: '' },
         { pageNo: 4, pageItem: '受益人信息', urlStr: '/sale/beneficiary', tabClass: '' },
-        { pageNo: 5, pageItem: '告知信息', urlStr: '/sale/NotifyingMessage', tabClass: '' },
+        { pageNo: 5, pageItem: '告知信息', urlStr: '/sale/notifyingMessage', tabClass: '' },
-        { pageNo: 6, pageItem: '账户信息', urlStr: '/sale/AccountInformation', tabClass: '' },
+        { pageNo: 6, pageItem: '账户信息', urlStr: '/sale/accountInformation', tabClass: '' },
-        { pageNo: 7, pageItem: '附件上传', urlStr: '/sale/AttachmentManagement', tabClass: '' },
+        { pageNo: 7, pageItem: '附件上传', urlStr: '/sale/attachmentManagement', tabClass: '' },
-        { pageNo: 8, pageItem: '签名确认', urlStr: '/sale/SignatureConfirmation', tabClass: '' }
+        { pageNo: 8, pageItem: '签名确认', urlStr: '/sale/signatureConfirmation', tabClass: '' }
       ],
+      //localStorage.salePageFlag: 1-投保人信息 2-被保人信息 3-选择产品 4-受益人信息 5-告知信息 6-账户信息 7-附件上传 8-签名确认
       salePageFlag: Number(localStorage.salePageFlag)
     }
   },
@@ -59,6 +60,7 @@ export default {
   methods: {
     changePage(pageIndex) {
       let url = ''
+      //由 localStorage.salePageFlag 来控制是否可跳到指定页面
       if (this.salePageFlag < pageIndex) return
       switch (pageIndex) {
         case 1: //跳到投保人页面
@@ -74,16 +76,16 @@ export default {
           url = `/sale/beneficiary?edit=1&salePageFlag=${pageIndex}`
           break
         case 5: //跳到告知信息页面
-          url = `/sale/NotifyingMessage?edit=1&salePageFlag=${pageIndex}`
+          url = `/sale/notifyingMessage?edit=1&salePageFlag=${pageIndex}`
           break
         case 6: //跳到账户信息页面
-          url = `/sale/AccountInformation?edit=1&salePageFlag=${pageIndex}`
+          url = `/sale/accountInformation?edit=1&salePageFlag=${pageIndex}`
           break
         case 7: //跳到附件上传页面
-          url = `/sale/AttachmentManagement?edit=1&salePageFlag=${pageIndex}`
+          url = `/sale/attachmentManagement?edit=1&salePageFlag=${pageIndex}`
           break
         case 8: //跳到签名确认页面
-          url = `/sale/SignatureConfirmation?edit=1&salePageFlag=${pageIndex}`
+          url = `/sale/signatureConfirmation?edit=1&salePageFlag=${pageIndex}`
           break
         default:
           break

src/views/ebiz/common/CalculatePremium.vue

@@ -924,8 +924,12 @@ export default {
           trialInfo['payEndYear'] = '1000'
           trialInfo['payEndYearFlag'] = 'Y'
           // 福宝宝和万能险传A
-          if (item.mainRiskCode != 'GFRS_M0006' && item.mainRiskCode != 'GFRS_M0017'
+          if (
-                  && item.mainRiskCode != 'GFRS_M0003' && item.mainRiskCode != 'GFRS_M0013') {
+            item.mainRiskCode != 'GFRS_M0006' &&
+            item.mainRiskCode != 'GFRS_M0017' &&
+            item.mainRiskCode != 'GFRS_M0003' &&
+            item.mainRiskCode != 'GFRS_M0013'
+          ) {
             trialInfo['insuYearFlag'] = 'Y'
           }
         }
@@ -1151,9 +1155,11 @@ export default {
           //万能型产品保费赋值给保额
           //增加判断是否是从建议书跳转过来了的
           if (localStorage.isFrom != 'proposal') {
-            if (this.trialList[index].productCode == 'GFRS_M0003'
+            if (
-                    || this.trialList[index].productCode == 'GFRS_M0015'
+              this.trialList[index].productCode == 'GFRS_M0003' ||
-                    || this.trialList[index].productCode == 'GFRS_M0017') {
+              this.trialList[index].productCode == 'GFRS_M0015' ||
+              this.trialList[index].productCode == 'GFRS_M0017'
+            ) {
               riskItem['amt'] = this.trialList[index].prem
             }
           }
@@ -1195,6 +1201,10 @@ export default {
       }
 
       if (resultData.result == 0) {
+        //电投
+        if (localStorage.isFrom == 'sale' && resultData.deleteFlag == '0') {
+          localStorage.salePageFlag = '4'
+        }
         //建议书
         if (localStorage.isFrom == 'proposal' && resultData.content.id) {
           this.saleInsuredPersonInfo.insuredId = resultData.content.id

src/views/ebiz/common/SelectedProduct.vue

@@ -57,7 +57,8 @@ export default {
       chooseProducts: [],
       total: 0,
       nextStepFlag: true,
-      isShow: true
+      isShow: true,
+      salePageFlag: '3'
     }
   },
   components: {
@@ -70,6 +71,18 @@ export default {
   mounted() {
     document.body.style.backgroundColor = '#fff'
     this.getProductList()
+    if (!this.$route.query.edit) {
+      //如果不是编辑/导航条跳转进来的
+      localStorage.setItem('salePageFlag', this.salePageFlag)
+    } else if (this.$route.query.edit && !this.$route.query.salePageFlag) {
+      //如果从保单列表点击编辑按钮进入
+      this.salePageFlag = '3'
+      localStorage.setItem('salePageFlag', this.salePageFlag)
+    } else if (this.$route.query.salePageFlag) {
+      //如果是从导航栏点击进入
+      this.salePageFlag = localStorage.salePageFlag
+    }
+
     // localStorage.orderNo = '19090510425500178912'
     // localStorage.saleInsuredPersonInfo = JSON.stringify({
     //   birthday: '2015-08-31',
@@ -215,6 +228,11 @@ export default {
     },
     //下一步
     nextStep() {
+      localStorage.salePageFlag = '8' //当前后台接口及前端代码不完善，仅调试观察现象使用，调试完成后删除
+      console.log('this.chooseProducts', this.chooseProducts)
+      if (this.chooseProducts.length == 0) {
+        return this.$toast('请添加产品')
+      }
       //930折中方案，豁免险选择
       let oldAddRiskCodes = JSON.parse(localStorage.oldAddRiskCodes)
       if (oldAddRiskCodes.includes('DCRS_A0001')) {

src/views/ebiz/sale/AccountInformation.vue

@@ -1,5 +1,6 @@
 <template>
   <div class="accountInformation-container">
+    <index-bar></index-bar>
     <div class="aaountInfomation-content" v-if="!isScan">
       <van-radio-group v-model="radio" class="flex pl30 pr30 pt15 pb15 justify-content-s bg-white mt10">
         <van-radio name="0" class="fs14" @click="clickRadio(saleInsuredInfo.name)" v-if="!changeCard">{{ `投保人：${saleInsuredInfo.name}` }}</van-radio>

src/views/ebiz/sale/AttachmentManagement.vue

@@ -1,5 +1,6 @@
 <template>
   <div>
+    <index-bar></index-bar>
     <div v-if="changeCard">
       <div class="flex p10 align-items-c bg-white mt10">
         <span>投保人附件</span>

src/views/ebiz/sale/Beneficiary.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="beneficiary-container">
-    <div style="background: rgb(245, 245, 245);" class="pt5 pb5">
+    <div style="background: rgb(245, 245, 245);" class="pt3 pb5">
       <index-bar></index-bar>
     </div>
     <div h10></div>
@@ -75,7 +75,8 @@ export default {
         // }
       ], // 指定受益人列表
       bnfFlag: '0', // 受益人类型
-      bnfType: '0' // 0 身故受益人 1 身前受益人
+      bnfType: '0', // 0 身故受益人 1 身前受益人
+      salePageFlag: '4'
     }
   },
   created() {
@@ -86,14 +87,25 @@ export default {
       this.type = '2'
       console.log(this.beneficiaries)
     }
-    //如果是从编辑进来
+    //如果是从编辑/导航进来
     if (this.$route.query.edit) {
       getOrderDetail({ orderNo: localStorage.orderNo }).then(res => {
         if (res.result == 0) {
           this.$utils.intLocalStorage(res)
         }
       })
+    } else {
+      localStorage.setItem('salePageFlag', this.salePageFlag)
     }
+    if (this.$route.query.edit && !this.$route.query.salePageFlag) {
+      //如果从保单列表点击编辑按钮进入
+      this.salePageFlag = '4'
+      localStorage.setItem('salePageFlag', this.salePageFlag)
+    } else if (this.$route.query.salePageFlag) {
+      //如果是从导航栏点击进入
+      this.salePageFlag = localStorage.salePageFlag
+    }
+
     this.insuredPerson = JSON.parse(localStorage.saleInsuredPersonInfo).name
   },
   mounted() {
@@ -137,7 +149,7 @@ export default {
           insuredDTOs: [
             {
               insuredId: JSON.parse(localStorage.saleInsuredPersonInfo).insuredId,
-              bnfDTOs: this.beneficiaries
+              bnfDTOs: this.bnfFlag == '0' ? [] : this.beneficiaries
             }
           ],
           paymentDTO: {},

src/views/ebiz/sale/InsuredInfo.vue

@@ -478,7 +478,7 @@ export default {
   },
   created() {
     // document.body.style.backgroundColor = '#F5F5F5'
-    //如果是编辑进来
+    //如果是编辑/导航进来
     this.isElecCont = '0'
     if (this.$route.query.edit) {
       getOrderDetail({ orderNo: localStorage.orderNo }).then(res => {

src/views/ebiz/sale/InsuredPerson.vue

@@ -568,7 +568,7 @@ export default {
     }
   },
   created() {
-    //如果是编辑进来
+    //如果是编辑/导航进来
     // if (this.$route.query.edit) {
     if (localStorage.orderNo) {
       getOrderDetail({ orderNo: localStorage.orderNo }).then(res => {

src/views/ebiz/sale/NotifyingMessage.vue

@@ -1,7 +1,8 @@
 <template>
   <div class="notifyingMessage-container">
     <div class="pb50">
-      <div class="pt20 pb20 pr10 bg-white flex justify-content-s align-items-c allFalse">
+      <index-bar></index-bar>
+      <div class="mt10 pt20 pb20 pr10 bg-white flex justify-content-s align-items-c allFalse">
         <span class="pl10">告知项目</span>
         <div @click="allFalse" class="pr10">
           <van-button type="danger" size="small">一键全否</van-button>
@@ -110,6 +111,7 @@
 import { Collapse, CollapseItem, RadioGroup, Radio, Field, CellGroup, Icon } from 'vant'
 import { information, saveInformation, getOrderDetail } from '@/api/ebiz/sale/sale'
 import utilsAge from '@/assets/js/utils/age'
+import IndexBar from '@/components/ebiz/sale/IndexBar'
 export default {
   data() {
     return {
@@ -151,7 +153,8 @@ export default {
         '10': '投保人财务告知',
         '9': '被保人健康告知',
         '11': '被保人财务告知'
-      }
+      },
+      salePageFlag: '5'
     }
   },
   created() {
@@ -160,7 +163,7 @@ export default {
       if (res.result == 0) {
         //投被保人关系
         this.isExistAdditionalRisk = res.orderDTO.insuredDTOs[0].riskDTOLst.length > 1 ? true : false
-        console.log('this.is ====',this.isExistAdditionalRisk)
+        console.log('this.is ====', this.isExistAdditionalRisk)
         this.relationToAppnt = res.orderDTO.insuredDTOs[0].relationToAppnt
         this.$utils.intLocalStorage(res)
         this.saleInsuredInfo = JSON.parse(window.localStorage.getItem('saleInsuredInfo'))
@@ -181,6 +184,19 @@ export default {
     this.productCodes = JSON.parse(localStorage.chooseProductCodes)
     //this.information()
   },
+  mounted() {
+    if (!this.$route.query.edit) {
+      //如果不是编辑/导航条跳转进来的
+      localStorage.setItem('salePageFlag', this.salePageFlag)
+    } else if (this.$route.query.edit && !this.$route.query.salePageFlag) {
+      //如果从保单列表点击编辑按钮进入
+      this.salePageFlag = '5'
+      localStorage.setItem('salePageFlag', this.salePageFlag)
+    } else if (this.$route.query.salePageFlag) {
+      //如果是从导航栏点击进入
+      this.salePageFlag = localStorage.salePageFlag
+    }
+  },
   methods: {
     // 一键全否
     allFalse() {
@@ -578,7 +594,8 @@ export default {
     [Radio.name]: Radio,
     [Field.name]: Field,
     [CellGroup.name]: CellGroup,
-    [Icon.name]: Icon
+    [Icon.name]: Icon,
+    [IndexBar.name]: IndexBar
   }
 }
 </script>

src/views/ebiz/sale/SignatureConfirmation.vue

@@ -1,6 +1,7 @@
 <template>
   <div class="signature-container">
     <div class="signature-content pb40">
+      <index-bar></index-bar>
       <div v-if="isWeixin" class="bg-white mt10 p20 fs14 tips">
         <p>
           尊敬的
@@ -886,7 +887,6 @@ export default {
     [CollapseItem.name]: CollapseItem,
     [Dialog.name]: Dialog,
     [IndexBar.name]: IndexBar
-
   },
   beforeRouteLeave(to, from, next) {
     document.body.style.backgroundColor = ''