Merge remote-tracking branch 'origin/feature/FCRS-1008个险--关于金掌桂系统数据界面调整的请示' into origin/release/【20250902】个险--关于金掌桂系统数据界面调整的请示

src/views/ebiz/common/CalculatePremium.vue

@@ -841,17 +841,14 @@ export default {
             this.isEnterAddtionRiskListFunc()
           }
         }
-        if (item.mainRiskCode == 'GFRS_M0083' || item.mainRiskCode == 'GFRS_M0098' || item.mainRiskCode == 'GFRS_M0103' || item.mainRiskCode == 'GFRS_M0085') {
+        if (item.mainRiskCode == 'GFRS_M0083' || item.mainRiskCode == 'GFRS_M0098' || item.mainRiskCode == 'GFRS_M0103'|| 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_M0103' || item.mainRiskCode == 'GFRS_M0085') &&
-          this.isFrom == 'proposal'
-        ) {
+        if ((item.mainRiskCode == 'GFRS_M0083' || item.mainRiskCode == 'GFRS_M0098' || item.mainRiskCode == 'GFRS_M0103'|| item.mainRiskCode == 'GFRS_M0085') && this.isFrom == 'proposal') {
           item.calFactorLst.forEach((i) => {
             if (i.code == 'inputPrem') {
               i.minPrem = 0.01
@@ -965,14 +962,10 @@ export default {
       }
       //键盘小数点无法输入，试了一下iOS16以下没这个问题，iOS16以上有这个问题， type="number"改成type="digit"就可以输入了，
       this.$nextTick(() => {
-        try {
-          var div1 = document.getElementsByClassName('van-stepper__input')
-          //拿到的是一个数组集合，遍历修改每一个input
-          for (var x in div1) {
-            div1[x].setAttribute('type', 'digit')
-          }
-        } catch (e) {
-          console.error(e)
+        var div1 = document.getElementsByClassName('van-stepper__input')
+        //拿到的是一个数组集合，遍历修改每一个input
+        for (var x in div1) {
+          div1[x].setAttribute('type', 'digit')
         }
       })
     },
@@ -1103,11 +1096,10 @@ export default {
       }
     },
     //弹框选择
-    toSelect(productIndex, factorIndex, columns) {
+    toSelect(index, index1, columns) {
       this.columns = []
-      ;[this.popupShow, this.productIndex, this.calFactorIndex] = [true, productIndex, factorIndex]
-      let currentProduct = this.chooseProducts[productIndex]
-      let currentFactor = currentProduct.calFactorLst
+      ;[this.popupShow, this.productIndex, this.calFactorIndex] = [true, index, index1]
+      let currentFactor = this.chooseProducts[this.productIndex].calFactorLst
       let currentEle = currentFactor[this.calFactorIndex]
       let sex = this.saleInsuredPersonInfo.sex //0男 1女
       //性别男女，养老保险金领取年龄不一致
@@ -1117,37 +1109,9 @@ export default {
             this.columns.push(item)
           }
         })
-        return
+      } else {
+        this.columns = columns
       }
-      if (currentProduct.mainRiskCode === 'GFRS_M0111') {
-        // 国富人寿鑫盈嘉两全保险（分红型） 交费期间payEndYear: 1次交清和3年交 ，保险期间insuYear: 5年和6年
-        // 现要求payEndYear选择一次交清insuYear只能选5年，payEndYear选择3年交payEndYear只能选6年保险期间
-        if (currentEle.code == 'insuYear') {
-          let payEndYearFactor = currentFactor.find((factor) => factor.code == 'payEndYear')
-          if (!payEndYearFactor) {
-            return
-          }
-          let payEndYear = payEndYearFactor.showContent
-          if (!payEndYear) {
-            // 保险期间未选择, 提示选择
-            this.$toast(`请先选择${payEndYearFactor.name}`)
-            return
-          }
-          let payEndYearOption = payEndYearFactor.columns.find((item) => item.text == payEndYear)
-          let payEndYearVal = payEndYearOption.value
-          console.log('payEndYearVal--->', payEndYearVal, columns)
-          // 如果有值，则需约定可选择项
-          if (payEndYearVal) {
-            columns.forEach((item) => {
-              if ((payEndYearVal == '1000' && item.value == '5') || (payEndYearVal == '3' && item.value == '6')) {
-                this.columns.push(item)
-              }
-            })
-          }
-          return
-        }
-      }
-      this.columns = columns
     },
     //取消picker
     onCancel() {
@@ -1163,7 +1127,7 @@ export default {
       let currentEle = currentFactor[this.calFactorIndex]
       if (currentEle.code == 'insuYear') {
         if (value.value == '70') {
-          this.chooseProducts.forEach((item) => {
+          this.chooseProducts.forEach((item, index) => {
             if (item.mainRiskCode == 'GFRS_M0086') {
               item.calFactorLst.forEach((i) => {
                 if (i.code == 'inputAmt') {
@@ -1175,7 +1139,7 @@ export default {
             }
           })
         } else if (value.value == '106') {
-          this.chooseProducts.forEach((item) => {
+          this.chooseProducts.forEach((item, index) => {
             if (item.mainRiskCode == 'GFRS_M0086') {
               item.calFactorLst.forEach((i) => {
                 if (i.code == 'inputAmt') {
@@ -1188,24 +1152,17 @@ export default {
           })
         }
       }
+      // let sex = this.saleInsuredPersonInfo.sex //0男 1女
 
-      if (this.chooseProducts[this.productIndex].mainRiskCode === 'GFRS_M0111') {
-        // 国富人寿鑫盈嘉两全保险（分红型） 交费期间payEndYear: 1次交清和3年交 ，保险期间insuYear: 5年和6年
-        // 现要求payEndYear选择一次交清insuYear只能选5年，payEndYear选择3年交payEndYear只能选6年保险期间
-        if (currentEle.code == 'payEndYear') {
-          // 获取当前的值
-          let payEndYear = value.value
-          console.log('payEndYear--->', payEndYear)
-          const insuYearFactor = currentFactor.find((factor) => factor.code == 'insuYear')
-          if (insuYearFactor) {
-            console.log('insuYearFactor--->', insuYearFactor)
-            let matchInsureYearValue = payEndYear == '1000' ? '5' : payEndYear == '3' ? '6' : null
-            let matchedOption = insuYearFactor.columns.find((item) => item.value == matchInsureYearValue)
-            insuYearFactor.showContent = matchedOption ? matchedOption.text : ''
-            insuYearFactor['insuYear'] = matchedOption ? matchedOption.value : ''
-          }
-        }
-      }
+      // //特殊设置：如果需要填写的保费/保额校验规则跟缴费期间挂钩，当改变缴费期间时，将输入框的值恢复默认值1
+      // if (currentEle.code == 'payEndYear' && this.isTrial == '0') {
+      //   currentEle['columns'].forEach((item, index) => {
+      //     if (item.value == value.value) {
+      //       this.payEndYearColumnsIndex = index
+      //     }
+      //   })
+      //   this.defalutAmt = 1
+      // }
       //中介渠道，交费期间为一次性交清时，附加险GFRS_A0007，GFRS_A0009，GFRS_A0010去掉后，附加险list就为空--隐藏’附‘icon
       if (currentEle.code == 'payEndYear' && value.value == '1000') {
         this.isEnterAddtionRiskListFunc()
@@ -1218,6 +1175,7 @@ export default {
       } else {
         this.isEnterAddtionRisk = true
       }
+
       if (currentEle.showContent != value.text) {
         //通用规则校验
         if (await this.payExceedInsured(currentEle, currentFactor, value.value)) {
@@ -1243,9 +1201,18 @@ export default {
           })
           this.defalutAmt = 1
         }
-
+        // if(this.ruleExpression[productCode]){
+        //   this.errorMsg = []
+        //   this.ruleExpression[productCode].eventList.forEach(item => {
+        //     this.$emit(item,currentFactor,currentEle.code,value);
+        //   })
+        //   if(this.errorMsg.length > 0){
+        //     this.$toast(this.errorMsg[0]);
+        //     this.popupShow = false
+        //     return false
+        //   }
+        // }
         let productCode = this.chooseProducts[this.productIndex].productCode
-
         if (this.ruleExpression[productCode]) {
           this.errorMsg = []
           let currentFactor = this.chooseProducts[this.productIndex].calFactorLst
@@ -1789,22 +1756,10 @@ export default {
             }
           })
           this.chooseProducts.forEach((item, index) => {
-            if (
-              item.productCode == 'GFRS_A0010' ||
-              item.productCode == 'GFRS_A0009' ||
-              item.productCode == 'GFRS_A0013' ||
-              item.productCode == 'GFRS_A0014' ||
-              item.productCode == 'GFRS_A0015' ||
-              item.productCode == 'GFRS_A0016'
-            ) {
+            if (item.productCode == 'GFRS_A0010' || item.productCode == 'GFRS_A0009' || item.productCode == 'GFRS_A0013' || item.productCode == 'GFRS_A0014' || item.productCode == 'GFRS_A0015' || item.productCode == 'GFRS_A0016') {
               //(投保人)国富人寿附加豁免保险费重大疾病保险(B款）
               // 投被不同人：投保人豁免险单独搭配主险时，投保人豁免险，豁免主险保费，当投保人豁免险加两全（有长险附加险时），豁免主险保费加两全保费
-              if (
-                item.productCode == 'GFRS_A0009' ||
-                item.productCode == 'GFRS_A0013' ||
-                item.productCode == 'GFRS_A0015' ||
-                item.productCode == 'GFRS_A0016'
-              ) {
+              if (item.productCode == 'GFRS_A0009' || item.productCode == 'GFRS_A0013' || item.productCode == 'GFRS_A0015' || item.productCode == 'GFRS_A0016') {
                 if (this.saleInsuredPersonInfo.relationToAppnt != 1) {
                   //不同人
                   if (showPrem001) {
@@ -2227,14 +2182,14 @@ 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_M0098' || item.productCode == 'GFRS_M0103' || item.productCode == 'GFRS_M0085') {
+          if (item.productCode == 'GFRS_M0083' || item.productCode == 'GFRS_M0098' || item.productCode == 'GFRS_M0103'|| item.productCode == 'GFRS_M0085') {
             productCode = item.productCode
             hasPredictTransferPrem = item.hasPredictTransferPrem
           }
         })
       }
       if (this.isFrom != 'proposal') {
-        if (productCode == 'GFRS_M0083' || productCode == 'GFRS_M0098' || productCode == 'GFRS_M0103' || productCode == 'GFRS_M0085') {
+        if (productCode == 'GFRS_M0083' || productCode == 'GFRS_M0098' || productCode == 'GFRS_M0103'|| productCode == 'GFRS_M0085') {
           if (!that.policyNo) {
             this.disabledShow = true
             that.chooseProducts.forEach((item) => {
@@ -2435,13 +2390,14 @@ export default {
               trialFlag = false
             }
           }
-        } else if (item.productCode == 'GFRS_M0101' || item.productCode == 'GFRS_M0102') {
+        }else if (item.productCode == 'GFRS_M0101' || item.productCode == 'GFRS_M0102') {
           //  当投保人年龄≥75周岁时，需转人工核保。核心提示语，投保人年龄≥75周岁。前端提示语为：投保人年龄≥75周岁，需进一步人工审核
           let appntAge = this.saleInsuredInfo.age
-          if (appntAge >= 75) {
+          if (appntAge>=75){
             this.nextStepFlag = true
             this.$toast('投保人年龄≥75周岁，需进一步人工审核！')
           }
+
         }
       })
       if (!trialFlag) {
@@ -3018,7 +2974,7 @@ export default {
             }
           }
         }
-      } else if (productCode == 'GFRS_M0083' || productCode == 'GFRS_M0098' || productCode == 'GFRS_M0103' || productCode == 'GFRS_M0085') {
+      } else if (productCode == 'GFRS_M0083' || productCode == 'GFRS_M0098' || productCode == 'GFRS_M0103'|| productCode == 'GFRS_M0085') {
         if (this.isFrom != 'proposal') {
           if (!this.policyNo && defalutValue < 5) {
             this.$toast('单独投保，保费为大于等于50000元')
@@ -3141,7 +3097,7 @@ export default {
           return this.$toast('关联保单的格式不正确')
         }
       }
-      this.$CacheUtils.setLocItem('associatedPolicyNo', this.policyNo || null)
+      this.$CacheUtils.setLocItem('associatedPolicyNo',this.policyNo || null)
       //组装险种提交数据
       let [mainRiskCode, riskDTOLst] = ['', []]
       let rollInResult = '' //校验预计转入保费结果

src/views/ebiz/common/risk-rules.js

@@ -43,7 +43,7 @@ export default {
   },
   //投、被保险人年龄对险种的限制
   ageLimit(resultData, vm, isApplicant,riskProductCode) {
-    let age, tips,maxAge
+    let age, tips
     if (isApplicant) {
       age = this.getSaleInsuredInfo().age
       tips = '投保人年龄不适合此款险种，请选择其他险种！'
@@ -56,16 +56,7 @@ export default {
       tips = '被保险人年龄不适合此款险种，请选择其他险种！'
     }
     let minAge = resultData.productTrialInfoDTO.ageRange && resultData.productTrialInfoDTO.ageRange.minAge
-    if(riskProductCode == 'GFRS_M0111'){
-      if(this.getSaleInsuredPersonInfo().sex==0){
-        maxAge=70
-      }else {
-        maxAge=73
-      }
-    }else {
-      maxAge = resultData.productTrialInfoDTO.ageRange && resultData.productTrialInfoDTO.ageRange.maxAge
-    }
-
+    let maxAge = resultData.productTrialInfoDTO.ageRange && resultData.productTrialInfoDTO.ageRange.maxAge
     ;[age, minAge, maxAge] = [Number(age), Number(minAge), Number(maxAge)]
     if (age > maxAge || age < minAge) {
       vm.$toast(tips)

src/views/ebiz/goodStart/Organization.vue

@@ -64,9 +64,9 @@ export default {
       needGettingKey: ['name', 'ysbb', 'ysjs', 'bzbf', 'cbjs'],
       tableColumns: [
         { name: '机构', key: 'name' },
-        { name: '预收期交(万元)', key: 'ysbb' },
+        { name: '预收保费(万元)', key: 'ysbb' },
         { name: '预收件数(件)', key: 'ysjs' },
-        { name: '承保期交(万元)', key: 'bzbf' },
+        { name: '承保保费(万元)', key: 'bzbf' },
         { name: '承保件数(件)', key: 'cbjs' }
       ],
       values: [],

src/views/ebiz/goodStart/PerformanceReport.vue

@@ -5,7 +5,7 @@
         <div class="header-left">
           <van-button>
             <img :src="point" />
-            <span class="ml5 mr5">期交</span>
+            <span class="ml5 mr5">保费</span>
           </van-button>
         </div>
         <div class="header-center">

src/views/ebiz/institutionalPerform/Organization.vue

@@ -94,30 +94,30 @@ export default {
         [
           [
             { isInt: false, name: '机构', key: 'name' },
-            { isInt: false, name: '预收期交(万元)', key: 'ysbb' },
+            { isInt: false, name: '预收保费(万元)', key: 'ysbb' },
             { isInt: true, name: '预收件数(件)', key: 'ysjs' },
-            { isInt: false, name: '承保期交(万元)', key: 'bzbf' },
+            { isInt: false, name: '承保保费(万元)', key: 'bzbf' },
             { isInt: true, name: '承保件数(件)', key: 'cbjs' }
           ],
           [
             { isInt: false, name: '机构', key: 'name' },
-            { isInt: false, name: '预收期交(万元)', key: 'ysbb' },
+            { isInt: false, name: '预收保费(万元)', key: 'ysbb' },
             { isInt: true, name: '预收件数(件)', key: 'ysjs' },
-            { isInt: false, name: '承保期交(万元)', key: 'bzbf' },
+            { isInt: false, name: '承保保费(万元)', key: 'bzbf' },
             { isInt: true, name: '承保件数(件)', key: 'cbjs' },
             { isInt: false, name: '承保同比', key: 'cbtb' },
             { isInt: false, name: '承保环比', key: 'cbhb' }
           ],
           [
             { isInt: false, name: '机构', key: 'name' },
-            { isInt: false, name: '承保期交(万元)', key: 'bzbf' },
-            { isInt: false, name: '期交目标', key: 'bbmb' },
-            { isInt: false, name: '期交目标达成率', key: 'bbmbdcl' },
+            { isInt: false, name: '承保保费(万元)', key: 'bzbf' },
+            { isInt: false, name: '保费目标', key: 'bbmb' },
+            { isInt: false, name: '保费目标达成率', key: 'bbmbdcl' },
             { isInt: false, name: '差距', key: 'cj' }
           ],
           [
             { isInt: false, name: '机构', key: 'name' },
-            { isInt: false, name: '承保期交(万元)', key: 'bzbf' }
+            { isInt: false, name: '承保保费(万元)', key: 'bzbf' }
           ]
         ],
         [
@@ -131,7 +131,7 @@ export default {
         ],
         [
           { isInt: false, name: '产品', key: 'productName' },
-          { isInt: false, name: '承保期交(万元)', key: 'cbbb' },
+          { isInt: false, name: '承保保费(万元)', key: 'cbbb' },
           { isInt: true, name: '承保件数(件)', key: 'cbItems' },
           { isInt: false, name: '保费占比(%)', key: 'percent' }
         ]

src/views/ebiz/institutionalPerform/Summarizing.vue

@@ -11,7 +11,7 @@
             <th>达成</th>
           </tr>
           <tr>
-            <td class="bleft bright">预收期交</td>
+            <td class="bleft bright">预收保费</td>
             <td class="bright">{{ performance.ysbb | unitFilter(1) | blankFilter }}</td>
           </tr>
           <tr>
@@ -19,7 +19,7 @@
             <td class="bright">{{ performance.ysjs | unitFilter(2) | blankFilter }}</td>
           </tr>
           <tr>
-            <td class="bleft bright">承保期交</td>
+            <td class="bleft bright">承保保费</td>
             <td class="bright">{{ performance.bzbf | unitFilter(1) | blankFilter }}</td>
           </tr>
           <tr>
@@ -77,7 +77,7 @@
         <table class="myTable" style="min-width: 140vw;" cellspacing="0" cellpadding="0">
           <tr>
             <th class="sticky">产品名称</th>
-            <th>承保期交(万元)</th>
+            <th>承保保费(万元)</th>
             <th>承保件数(件)</th>
             <th>保费占比(%)</th>
           </tr>

src/views/ebiz/institutionalPerform/UnderOffice.vue

@@ -125,7 +125,7 @@ export default {
       dayTimeCondition: currentDate,
       // 0: 期交, 1: 人力, 2: 产品
       typeIndex: 0,
-      dataTypes: ['期交', '人力指标', '产品'],
+      dataTypes: ['保费', '人力指标', '产品'],
       active: 0,
       // 侧边栏是否显示
       isSideBarShow: false,

src/views/ebiz/product/HomeProduct.vue

@@ -157,7 +157,7 @@ export default {
       isGoodStart: '0',    // 是否开门红 0-默认
       isPersonalInsu: true, // 是否个险渠道
       isInner: false,
-      organizationTheads: ['排名', '机构', '当日预收(期交)', '月预收期交', '日承保期交', '月承保期交'],
+      organizationTheads: ['排名', '机构', '当日预收(保费)', '月预收保费', '日承保保费', '月承保保费'],
       performanceTheads: ['排名', '姓名', '营销服务部', '预收期交', '承保期交'],
       organizationData: [],
       performanceData: [],