From c73212c477815b3e162b30e493d58535f15e1b8c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=98=B3=E5=8D=8E=E7=A5=A5?= <yang.huaxiang@ebiz-fooge.com>
Date: Mon, 16 Mar 2020 10:36:26 +0800
Subject: [PATCH] =?UTF-8?q?GFRS-729=E3=80=900326=E3=80=91=E5=9B=BD?=
 =?UTF-8?q?=E5=AF=8C=E4=BA=BA=E5=AF=BF=E5=9B=BD=E5=AF=8C=E6=B0=91=E5=AE=89?=
 =?UTF-8?q?=E9=87=8D=E5=A4=A7=E7=96=BE=E7=97=85=E4=BF=9D=E9=99=A9=EF=BC=88?=
 =?UTF-8?q?2020=E7=89=88=EF=BC=89=5F1=20=E7=AD=BE=E5=90=8D=E9=A1=B5?=
 =?UTF-8?q?=E6=8F=90=E7=A4=BA=E8=AF=AD=E4=BF=AE=E6=94=B9=E3=80=81=E5=BB=BA?=
 =?UTF-8?q?=E8=AE=AE=E4=B9=A6=E7=A4=BE=E4=BF=9D=E7=8A=B6=E6=80=81=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=20--=E6=8F=90=E4=BA=A4=E4=BA=BA=EF=BC=9A=E9=98=B3?=
 =?UTF-8?q?=E5=8D=8E=E7=A5=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/ebiz/common/CalculatePremium.vue    |  6 +++---
 src/views/ebiz/proposal/InsuredPerson.vue     |  3 ++-
 src/views/ebiz/sale/SignatureConfirmation.vue | 15 ++++++++++++---
 3 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/src/views/ebiz/common/CalculatePremium.vue b/src/views/ebiz/common/CalculatePremium.vue
index d3c955392..0e82a0c32 100644
--- a/src/views/ebiz/common/CalculatePremium.vue
+++ b/src/views/ebiz/common/CalculatePremium.vue
@@ -443,7 +443,7 @@ export default {
     //特殊处理 GFRS_M0016 GFRS_A0004 GFRS_A0005 赔付比例处理
     async dogetLimitAndGetRate() {
       const orderNo = localStorage.getItem('orderNo')
-      let detailPromise = this.isFrom === 'proposal' ? new Promise(r => r(localStorage.getItem('proposalMedical'))) : await getOrderDetail({ orderNo })
+      let detailPromise = this.isFrom === 'proposal' ? localStorage.proposalMedical : await getOrderDetail({ orderNo })
       this.chooseProducts.map(item => {
         if (!(item.mainRiskCode === 'GFRS_M0016' || item.productCode === 'GFRS_A0004' || item.productCode === 'GFRS_A0005')) {
           //其他产品删掉两个字段
@@ -459,9 +459,9 @@ export default {
         if (item.mainRiskCode === 'GFRS_M0016' || item.productCode === 'GFRS_A0004') {
           let isMedical = null
           if (this.isFrom === 'proposal') {
-            isMedical = detailPromise === '1'
+            isMedical = detailPromise == '1'
           } else {
-            isMedical = detailPromise.orderDTO.insuredDTOs[0].medical === '0'
+            isMedical = detailPromise.orderDTO.insuredDTOs[0].medical == '0'
           }
           //根据社保写死两个字段 赔付比例和免赔额
           item.calFactorLst.map(i => {
diff --git a/src/views/ebiz/proposal/InsuredPerson.vue b/src/views/ebiz/proposal/InsuredPerson.vue
index bfd32f9b7..c1b768806 100644
--- a/src/views/ebiz/proposal/InsuredPerson.vue
+++ b/src/views/ebiz/proposal/InsuredPerson.vue
@@ -225,8 +225,9 @@ export default {
     //点击下一步
     nextStep() {
       //保存有没有社保，在保费计算用到
-      localStorage.setItem('proposalMedical', this.insured.medical === '0' ? '1' : '0')
 
+      //localStorage.setItem('proposalMedical', this.insured.medical == '0' ? '1' : '0')
+      localStorage.proposalMedical = this.insured.medical == '0' ? '1' : '0'
       this.insured.age = String(this.insured.age)
       let cacheSex = JSON.parse(localStorage.proposalAppnt).sex
       let localSex = this.insured.sex
diff --git a/src/views/ebiz/sale/SignatureConfirmation.vue b/src/views/ebiz/sale/SignatureConfirmation.vue
index 431af6fb4..77cf10e71 100644
--- a/src/views/ebiz/sale/SignatureConfirmation.vue
+++ b/src/views/ebiz/sale/SignatureConfirmation.vue
@@ -450,7 +450,7 @@ export default {
             }
           }
         }
-       /* if (localStorage.productCode == 'GFRS_M0003' || localStorage.productCode == 'GFRS_M0015' || this.productCode == 'GFRS_M0017') {
+        /* if (localStorage.productCode == 'GFRS_M0003' || localStorage.productCode == 'GFRS_M0015' || this.productCode == 'GFRS_M0017') {
           if (that.appntSign[0].documentStatus == 0) {
             path = 'insuranceInformation'
           } else if (that.appntSign[1].documentStatus == 2) {
@@ -720,7 +720,16 @@ export default {
             const mainRiskCode = res.orderDTO.insuredDTOs[0].riskDTOLst[0].mainRiskCode
             // const isShowDialog = mainRiskCode === 'GFRS_M0005' || mainRiskCode === 'GFRS_M0016'
             const isShowDialog = mainRiskCode === 'GFRS_M0016'
-            if (isShowDialog) {
+            if (
+              !!res.orderDTO.productDTO &&
+              !!res.orderDTO.productDTO.special &&
+              !!res.orderDTO.productDTO.special.content &&
+              res.orderDTO.productDTO.special.content !== ''
+            ) {
+              const message = res.orderDTO.productDTO.special.content
+              Dialog({ message })
+            }
+            /* if (isShowDialog) {
               //记录每次弹框的订单号。再次进入页面，订单号改变才会弹窗。
               let lastOrderNo = localStorage.lastOrderNo
               if (lastOrderNo !== data.orderNo) {
@@ -740,7 +749,7 @@ export default {
                 const message = res.orderDTO.productDTO.special.content
                 Dialog({ message })
               }
-            }
+            }*/
             localStorage.setItem('lastOrderNo', data.orderNo)
 
             this.$toast.clear()