From c053cb3a540a0b84d515672eeeb6968ac11285f5 Mon Sep 17 00:00:00 2001
From: "li.yuetong" <li.yuetong@ebiz-digits.com>
Date: Thu, 20 Oct 2022 14:10:14 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E6=8A=8A=E5=BB=BA=E8=AE=AE=E4=B9=A6?=
 =?UTF-8?q?=E7=9A=84=E8=AE=A2=E5=8D=95=E5=8F=B7=E4=BC=A0=E7=94=B5=E5=AD=90?=
 =?UTF-8?q?=E6=8A=95=E4=BF=9D=E4=BA=86,=20=E5=BB=BA=E8=AE=AE=E4=B9=A6?=
 =?UTF-8?q?=E5=92=8C=E7=94=B5=E6=8A=95=E8=AE=A2=E5=8D=95=E5=8F=B7=E9=83=BD?=
 =?UTF-8?q?=E7=94=A8=E7=9A=84orderNo=E6=B7=B7=E4=BA=86=E3=80=91=E9=80=89?=
 =?UTF-8?q?=E6=8B=A9=E4=BA=A7=E5=93=81=E5=92=8C=E8=AF=95=E7=AE=97=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2localstorage=E5=AD=98=E5=82=A8=E7=9A=84orderNo?=
 =?UTF-8?q?=E6=94=B9=E4=B8=BAproposalNo?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/ebiz/common/CalculatePremium.vue | 5 +++--
 src/views/ebiz/common/SelectedProduct.vue  | 9 +++++----
 src/views/ebiz/proposal/List.vue           | 3 ++-
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/src/views/ebiz/common/CalculatePremium.vue b/src/views/ebiz/common/CalculatePremium.vue
index 8aff27ea9..2db587264 100644
--- a/src/views/ebiz/common/CalculatePremium.vue
+++ b/src/views/ebiz/common/CalculatePremium.vue
@@ -2557,11 +2557,12 @@ export default {
 
       //建议书需要添加全部投保人信息，电投只需要投保人ID
       let insuredDTOItem = Object.assign(this.saleInsuredPersonInfo, { riskDTOLst: riskDTOLst })
+      let orderNo = localStorage.isFrom == 'proposal'?this.$CacheUtils.getLocItem('proposalNo'):this.$CacheUtils.getLocItem('orderNo')
       let params = {
         orderType: 'RISK_ORDER',
         orderDTO: {
           orderInfoDTO: {
-            orderNo: this.$CacheUtils.getLocItem('orderNo'),
+            orderNo: orderNo,
             productChannel:this.isCrossChannel
           },
           // appntDTO: {},
@@ -2624,7 +2625,7 @@ export default {
             }
           })
         }else if (localStorage.isFrom == 'proposal'){
-          let proposalOrderNo = this.$CacheUtils.getLocItem('orderNo') || ''
+          let proposalOrderNo = this.$CacheUtils.getLocItem('proposalNo') || ''
           let url = `/common/selectedProduct?proposalOrderNo=${proposalOrderNo}`
           if (resultData.content.id) {
             this.saleInsuredPersonInfo.insuredId = resultData.content.id;
diff --git a/src/views/ebiz/common/SelectedProduct.vue b/src/views/ebiz/common/SelectedProduct.vue
index dd6f5c5b0..34befaf60 100644
--- a/src/views/ebiz/common/SelectedProduct.vue
+++ b/src/views/ebiz/common/SelectedProduct.vue
@@ -252,10 +252,11 @@ export default {
           message: '加载中……'
         })
         if (this.$route.query.proposalOrderNo) {
-          this.$CacheUtils.setLocItem('orderNo',this.$route.query.proposalOrderNo)
+          this.$CacheUtils.setLocItem('proposalNo',this.$route.query.proposalOrderNo)
           this.proposalOrderNo = this.$route.query.proposalOrderNo
         }
-        let pOrderNo = this.proposalOrderNo?this.proposalOrderNo:this.$CacheUtils.getLocItem('orderNo')
+        let pOrderNo = this.proposalOrderNo?this.proposalOrderNo:this.$CacheUtils.getLocItem('proposalNo')
+        console.log(pOrderNo,'pOrderNo')
         resultData = await getDetail({
           orderNo: pOrderNo,
           isMerge: '1',
@@ -407,8 +408,8 @@ export default {
       }
       if (localStorage.isFrom == 'proposal') {
         let url = `/proposal/chooseInsuredPerson`
-        if (this.$route.query.proposalOrderNo || this.$CacheUtils.getLocItem('orderNo')) {
-          let proposalOrderNo = this.$route.query.proposalOrderNo || this.$CacheUtils.getLocItem('orderNo')
+        if (this.$route.query.proposalOrderNo || this.$CacheUtils.getLocItem('proposalNo')) {
+          let proposalOrderNo = this.$route.query.proposalOrderNo || this.$CacheUtils.getLocItem('proposalNo')
           url = `/proposal/chooseInsuredPerson?proposalOrderNo=${proposalOrderNo}`
         }
         let page = this.$route.query.proposalEdit == '1' ? '-1' : '-2'
diff --git a/src/views/ebiz/proposal/List.vue b/src/views/ebiz/proposal/List.vue
index 1c2ef3610..ffcf0d8f0 100644
--- a/src/views/ebiz/proposal/List.vue
+++ b/src/views/ebiz/proposal/List.vue
@@ -118,6 +118,7 @@ export default {
   created() {
     this.$CacheUtils.removeLocItem('proposalNo')
     this.$CacheUtils.removeLocItem('canMoveOn')
+    this.$CacheUtils.removeLocItem('orderNo')
     funcPermCheck({}).then(res => {
       this.isCheck = res.result
     })
@@ -317,7 +318,7 @@ export default {
       toInsurance(params).then(res => {
         if (res.result == '0') {
           localStorage.chooseProductCodes = ''
-          this.$CacheUtils.setLocItem('proposalNo', res.content.orderNo)
+          this.$CacheUtils.setLocItem('orderNo', res.content.orderNo)
           this.$jump({
             flag: 'h5',
             extra: {