Merge branch 'feature/FCRS-875国富人寿鑫管家C款终身寿险（万能型）' into origin/release/【20241230】鑫管家C

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'"
+                :disable-input="disabledShow"
                 @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-否-->
@@ -574,6 +574,7 @@ export default {
       cvalidateFlag: false,
       cvalidateStr: '', //活动生效日
       chooseProducts: [],
+      disabledShow: false,
       productIndex: '',
       calFactorIndex: '',
       premiumData: [], //试算
@@ -831,7 +832,14 @@ 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.disabledShow = true
+        }
+        if(item.hasPredictTransferPrem == '1') {
+          this.disabledShow = false
+        }
+
+        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 +1114,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) => {
@@ -2153,17 +2160,20 @@ export default {
     async getTrial() {
       let that = this
       let productCode = ''
+      let hasPredictTransferPrem = ''
       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
+            hasPredictTransferPrem = item.hasPredictTransferPrem
           }
         })
       }
       if (this.isFrom != 'proposal') {
-        if (productCode == 'GFRS_M0083' || productCode == 'GFRS_M0085') {
+        if (productCode == 'GFRS_M0083' || productCode == 'GFRS_M0098'  || productCode == 'GFRS_M0085') {
           if (!that.policyNo) {
+            this.disabledShow = true
             that.chooseProducts.forEach((item) => {
               item.calFactorLst.forEach((ii) => {
                 if (ii.type == 1) {
@@ -2173,6 +2183,7 @@ export default {
               })
             })
           } else {
+            this.disabledShow = false
             that.chooseProducts.forEach((item) => {
               item.calFactorLst.forEach((ii) => {
                 if (ii.type == 1) {
@@ -2184,6 +2195,9 @@ export default {
           }
         }
       }
+      if(hasPredictTransferPrem == '1') { 
+        this.disabledShow = false
+      }
       this.nextStepFlag = true
       this.$toast.clear()
       this.$toast.loading({
@@ -2935,7 +2949,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元')

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

src/views/ebiz/proposal/ProposalInfo.vue

@@ -795,7 +795,7 @@ export default {
         that.pageShowInfo.insuredDTOs.forEach((item) => {
           item.riskDTOLst.forEach((item01) => {
             if (item01.isMainRisk == '0') {
-              if (item01.mainRiskCode == 'GFRS_M0080' || item01.mainRiskCode == 'GFRS_M0083' || item01.mainRiskCode == 'GFRS_M0085') {
+              if (item01.mainRiskCode == 'GFRS_M0080' || item01.mainRiskCode == 'GFRS_M0083' || item01.mainRiskCode == 'GFRS_M0085' || item01.mainRiskCode == 'GFRS_M0098') {
                 that.ispremshow = false
               }
               mainRiskNameList.push(item01.riskName)