From 1a61367991e58dc3d72a6eb598f3c1caf135b63f Mon Sep 17 00:00:00 2001
From: xuxingjun <xu.xingjun@ebiz-digits.com>
Date: Fri, 13 Dec 2024 14:30:38 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=20=E5=9B=BD=E5=AF=8C?=
 =?UTF-8?q?=E4=BA=BA=E5=AF=BF=E9=91=AB=E7=AE=A1=E5=AE=B6C=E6=AC=BE?=
 =?UTF-8?q?=E7=BB=88=E8=BA=AB=E5=AF=BF=E9=99=A9=EF=BC=88=E4=B8=87=E8=83=BD?=
 =?UTF-8?q?=E5=9E=8B=EF=BC=89=E4=BA=A7=E5=93=81=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/ebiz/common/CalculatePremium.vue | 15 +++++++--------
 src/views/ebiz/common/MainRiskList.vue     | 11 ++++++-----
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/views/ebiz/common/CalculatePremium.vue b/src/views/ebiz/common/CalculatePremium.vue
index 0da9b20b6..9dcf7d9c8 100644
--- a/src/views/ebiz/common/CalculatePremium.vue
+++ b/src/views/ebiz/common/CalculatePremium.vue
@@ -37,7 +37,7 @@
                 :show-plus="false"
                 :show-minus="false"
                 class="ml30"
-                :disabled="item.productCode == 'GFRS_M0083' && isFrom != 'proposal'"
+                :disabled="item.productCode == 'GFRS_M0083' || item.productCode == 'GFRS_M0098' && isFrom != 'proposal'"
                 @change="
                   stepperChange(
                     item.calFactorLst[riskFactorIndex].displayAmount,
@@ -180,7 +180,7 @@
           </div>
           <!-- 类型为5的字段，单元格只展示文本 -->
           <div class="border-bottom pv10" v-if="riskFactor.type == 5">
-            <van-field v-model="riskFactor.showContent" readonly :label="riskFactor.name" />
+            <van-field v-model="riskFactor.showContent" disabled readonly :label="riskFactor.name" />
           </div>
         </div>
       </div>
@@ -348,7 +348,7 @@
       </div>
       <div
         class="flex justify-content-s pv10 border-bottom prem"
-        v-if="item.productCode != 'GFRS_M0080' && item.productCode != 'GFRS_M0083' && item.productCode != 'GFRS_M0085'"
+        v-if="item.productCode != 'GFRS_M0080' && item.productCode != 'GFRS_M0083' && item.productCode != 'GFRS_M0098' && item.productCode != 'GFRS_M0085'"
       >
         <!-- trialType 0-保额算保费，1-保费算保额 -->
         <!-- isTrial是否需存在特殊配置(规则) 0-是 1-否-->
@@ -831,7 +831,7 @@ export default {
             this.isEnterAddtionRiskListFunc()
           }
         }
-        if ((item.mainRiskCode == 'GFRS_M0083' || item.mainRiskCode == 'GFRS_M0085') && this.isFrom == 'proposal') {
+        if ((item.mainRiskCode == 'GFRS_M0083' || item.mainRiskCode == 'GFRS_M0098' || item.mainRiskCode == 'GFRS_M0085') && this.isFrom == 'proposal') {
           item.calFactorLst.forEach((i) => {
             if (i.code == 'inputPrem') {
               i.minPrem = 0.01
@@ -1106,7 +1106,6 @@ export default {
       // let productCode = this.chooseProducts[this.productIndex].productCode
       let currentFactor = this.chooseProducts[this.productIndex].calFactorLst
       let currentEle = currentFactor[this.calFactorIndex]
-      console.log(currentEle.code)
       if (currentEle.code == 'insuYear') {
         if (value.value == '70') {
           this.chooseProducts.forEach((item, index) => {
@@ -2156,13 +2155,13 @@ export default {
       let thisproductInfo = JSON.parse(window.localStorage.getItem('chooseProducts'))
       if (thisproductInfo && thisproductInfo.length != 0) {
         thisproductInfo.forEach((item) => {
-          if (item.productCode == 'GFRS_M0083' || item.productCode == 'GFRS_M0085') {
+          if (item.productCode == 'GFRS_M0083' || item.productCode == 'GFRS_M0098' || item.productCode == 'GFRS_M0085') {
             productCode = item.productCode
           }
         })
       }
       if (this.isFrom != 'proposal') {
-        if (productCode == 'GFRS_M0083' || productCode == 'GFRS_M0085') {
+        if (productCode == 'GFRS_M0083' || productCode == 'GFRS_M0098'  || productCode == 'GFRS_M0085') {
           if (!that.policyNo) {
             that.chooseProducts.forEach((item) => {
               item.calFactorLst.forEach((ii) => {
@@ -2935,7 +2934,7 @@ export default {
             }
           }
         }
-      } else if (productCode == 'GFRS_M0083' || productCode == 'GFRS_M0085') {
+      } else if (productCode == 'GFRS_M0083' || productCode == 'GFRS_M0098' || productCode == 'GFRS_M0085') {
         if (this.isFrom != 'proposal') {
           if (!this.policyNo && defalutValue < 5) {
             this.$toast('单独投保，保费为大于等于50000元')
diff --git a/src/views/ebiz/common/MainRiskList.vue b/src/views/ebiz/common/MainRiskList.vue
index 068f382cc..e8dcf044c 100644
--- a/src/views/ebiz/common/MainRiskList.vue
+++ b/src/views/ebiz/common/MainRiskList.vue
@@ -197,7 +197,7 @@ export default {
         // ------------------------专为惠企写死--end---------------//
         //如果是选择产品, 进入电子投保, 在主险列表能默认选中我在产品列表选择的产品
         if (this.list.length > 0) {
-          console.log(localStorage.productCodeChooseFromList)
+          // console.log(localStorage.productCodeChooseFromList)
           this.result = this.list.find((v) => {
             return v.riskProductCode == localStorage.productCodeChooseFromList
           })
@@ -274,7 +274,7 @@ export default {
         // ------------------------专为惠企写死--end---------------//
         // 如果是选择产品, 进入电子投保, 在主险列表能默认选中我在产品列表选择的产品
         if (this.list.length > 0) {
-          console.log(localStorage.productCodeChooseFromList)
+          // console.log(localStorage.productCodeChooseFromList)
           this.result = this.list.find((v) => {
             return v.riskProductCode == localStorage.productCodeChooseFromList
           })
@@ -440,7 +440,6 @@ export default {
           return this.$toast('该投保人工作单位不能投保该产品')
         }
         /********end 主险选择限制 end******/
-
         //保存附加险
         localStorage.addtionRiskLst = JSON.stringify(resultData.productTrialInfoDTO.addtionRiskLst)
         localStorage.isAutoPay = resultData.isAutoPay
@@ -449,6 +448,8 @@ export default {
         localStorage.isRelated = resultData.isRelated
 
         let calFactorLst = this.getFactorList(resultData)
+        
+        // return
         let productTrialYearDTOS = resultData.productTrialInfoDTO.productTrialYearDTOS != null ? resultData.productTrialInfoDTO.productTrialYearDTOS : null
         let hasAddtionRisk = resultData.productTrialInfoDTO.addtionRiskLst != null && resultData.productTrialInfoDTO.addtionRiskLst.length ? true : false
         let currentProductInfo =
@@ -504,9 +505,9 @@ export default {
     //构建险种因子列表
     getFactorList(resultData) {
       let productTrialInfoDTO = resultData.productTrialInfoDTO
-      console.log(productTrialInfoDTO, 'wode')
+      // console.log(productTrialInfoDTO, 'wode')
       let calFactorLst = resultData.productTrialInfoDTO.calFactorLst
-      console.log('calFactorLst', calFactorLst)
+      // console.log('calFactorLst', calFactorLst)
 
       calFactorLst.forEach((item) => {
         item['isMainRisk'] = 0