feature/【20250429】富贵相伴养老年金保险&&富锦养老年金保险加被保人30天年龄校验

src/assets/js/utils/data-dictionary.js

@@ -3947,6 +3947,35 @@ export default {
     {
       code: "GFRS_M0094__cashValue",
       label: "元"
+    },
+    {
+      //养老年金开始领取年龄
+      code: 'pensionAge',
+      label: '岁'
+    },
+    {
+      code: 'AppntCriticalDiseaseExemptionPremiumD',
+      label: '元'
+    },
+    {
+      code: 'AppntModerateOrMinorDiseaseExemptionPremiumD',
+      label: '元'
+    },
+    {
+      code: 'AppntDeathOrTotalDiseaseExemptionPremiumD',
+      label: '元'
+    },
+    {
+      code: 'InsuredCriticalDiseaseExemptionPremiumD',
+      label: '元'
+    },
+    {
+      code: 'InsuredModerateOrMinorDiseaseExemptionPremiumD',
+      label: '元'
+    },
+    {
+      code: 'InsuredDeathOrTotalDiseaseExemptionPremiumD',
+      label: '元'
     }
   ],
   // 卡单与短期险重新投保选择职业类别时，两个模块职业类型数据的排序不同，创建这个数据字典，用于在选择职业类别时，作为一个参数传入组件，

src/views/ebiz/billingDetail/billingDetail.vue

@@ -834,8 +834,8 @@ export default {
         let m = time.getMonth() + 1 < 10 ? '0' + (time.getMonth() + 1) : time.getMonth() + 1
         console.log(y, m)
         this.monthValue = y + '-' + m
-        this.dialogForm.startDate = y + '-' + m + '-' + '01' // "2024-09-01",
-        this.dialogForm.endDate = y + '-' + m + '-' + '30'//"2024-09-30",
+        this.dialogForm.startDate = y + '-' + m + '-' + '01' // "2024-08-01",
+        this.dialogForm.endDate = y + '-' + m + '-' + '31'//"2024-08-31",
       })
       this.overlayShow = false
     },

src/views/ebiz/common/AddRiskList.vue

@@ -82,7 +82,8 @@ export default {
             if (
               currentMainRiskInfo.mainRiskPayEndYearFlag == 'Y' &&
               currentMainRiskInfo.mainRiskPayEndYear == '1000' &&
-              (item.productCode == 'GFRS_A0007' || item.productCode == 'GFRS_A0009'|| item.productCode == 'GFRS_A0010'|| item.productCode == 'GFRS_A0013' || item.productCode == 'GFRS_A0014')
+              (item.productCode == 'GFRS_A0007' || item.productCode == 'GFRS_A0009'|| item.productCode == 'GFRS_A0010'|| item.productCode == 'GFRS_A0013' || item.productCode == 'GFRS_A0014'
+                  || item.productCode == 'GFRS_A0015' || item.productCode == 'GFRS_A0016')
             ) {
               item.isHidden = 1
             }

src/views/ebiz/common/CalculatePremium.vue

@@ -348,7 +348,13 @@
       </div>
       <div
         class="flex justify-content-s pv10 border-bottom prem"
-        v-if="item.productCode != 'GFRS_M0100' &&item.productCode != 'GFRS_M0080' && item.productCode != 'GFRS_M0083' && item.productCode != 'GFRS_M0098' && item.productCode != 'GFRS_M0085'"
+        v-if="
+          item.productCode != 'GFRS_M0100' &&
+          item.productCode != 'GFRS_M0080' &&
+          item.productCode != 'GFRS_M0083' &&
+          item.productCode != 'GFRS_M0098' &&
+          item.productCode != 'GFRS_M0085'
+        "
       >
         <!-- trialType 0-保额算保费，1-保费算保额 -->
         <!-- isTrial是否需存在特殊配置(规则) 0-是 1-否-->
@@ -392,20 +398,22 @@
             <img class="w20 h20 p10 v-middle" :src="require('@/assets/images/sale/approved' + item.status + '.png')" alt="" />
           </div>
         </div>
-        <div class="flex justify-content-s align-items-c fs12" v-for='item in  riskAmntList'>
+        <div class="flex justify-content-s align-items-c fs12" v-for="item in riskAmntList">
           <div>
             <img class="w20 h20 p10 v-middle" :src="require('@/assets/images/sale/coin.png')" alt="" />
-            <span class="v-middle">{{ item.accuRiskDesc  }}：</span>
+            <span class="v-middle">{{ item.accuRiskDesc }}：</span>
           </div>
           <div>
-                         <span class="w20 h20 p10 v-middle">{{item.accuRiskAmnt}}</span>
-<!--            <img class="w20 h20 p10 v-middle" :src="require('@/assets/images/sale/approved' + item.status + '.png')" alt="" />-->
+            <span class="w20 h20 p10 v-middle">{{ item.accuRiskAmnt }}</span>
+            <!--            <img class="w20 h20 p10 v-middle" :src="require('@/assets/images/sale/approved' + item.status + '.png')" alt="" />-->
           </div>
         </div>
         <div style="padding: 25px 0px 10px 10px; font-size: 10px; color: #999">
-          <p style="line-height: 20px"><span style="width: 40px; display: inline-block">说明：</span><br/>
-          1.绿色✔表示 未触发规则、红色×表示 触发规则;<br/>
-          2.已累计本次投保的风险保额;<br/>3.展示的风险保额为常见风险类别。</p>
+          <p style="line-height: 20px">
+            <span style="width: 40px; display: inline-block">说明：</span><br />
+            1.绿色✔表示 未触发规则、红色×表示 触发规则;<br />
+            2.已累计本次投保的风险保额;<br />3.展示的风险保额为常见风险类别。
+          </p>
         </div>
       </div>
     </van-dialog>
@@ -609,7 +617,7 @@ export default {
       richChildrenFlag: false,
       isCrossChannel: '0', //是否交叉渠道 1-是 0-否
       trialResultsShow: false, //核保试算结果
-      riskAmntList:[],//累计寿险风险保额（元）、累计重大疾病风险保额（元）、累计意外伤害风险保额（元）、意外住院津贴日额（元）、一般住院津贴日额（元）、特定疾病住院津贴日额（元）
+      riskAmntList: [], //累计寿险风险保额（元）、累计重大疾病风险保额（元）、累计意外伤害风险保额（元）、意外住院津贴日额（元）、一般住院津贴日额（元）、特定疾病住院津贴日额（元）
       verifyResultList: [] //核保试算返回数据结构
     }
   },
@@ -835,7 +843,7 @@ export default {
         if (item.mainRiskCode == 'GFRS_M0083' || item.mainRiskCode == 'GFRS_M0098' || item.mainRiskCode == 'GFRS_M0085') {
           this.disabledShow = true
         }
-        if(item.hasPredictTransferPrem == '1') {
+        if (item.hasPredictTransferPrem == '1') {
           this.disabledShow = false
         }
 
@@ -1042,7 +1050,9 @@ export default {
         this.chooseProducts[productIndex].productCode === 'GFRS_A0009' ||
         this.chooseProducts[productIndex].productCode === 'GFRS_A0014' ||
         this.chooseProducts[productIndex].productCode === 'GFRS_A0013' ||
-        this.chooseProducts[productIndex].productCode === 'GFRS_A0010'
+        this.chooseProducts[productIndex].productCode === 'GFRS_A0010' ||
+        this.chooseProducts[productIndex].productCode === 'GFRS_A0015' ||
+        this.chooseProducts[productIndex].productCode === 'GFRS_A0016'
       ) {
         setTimeout(() => {
           this.getTrial()
@@ -1245,7 +1255,9 @@ export default {
           item01.productCode != 'GFRS_A0010' &&
           item01.productCode != 'GFRS_A0012' &&
           item01.productCode != 'GFRS_A0013' &&
-          item01.productCode != 'GFRS_A0014'
+          item01.productCode != 'GFRS_A0014' &&
+          item01.productCode != 'GFRS_A0015' &&
+          item01.productCode != 'GFRS_A0016'
         ) {
           chooseProductsNew.push(item01)
         }
@@ -1559,7 +1571,9 @@ export default {
             item.productCode != 'GFRS_A0010' &&
             item.productCode != 'GFRS_A0012' &&
             item.productCode != 'GFRS_A0013' &&
-            item.productCode != 'GFRS_A0014'
+            item.productCode != 'GFRS_A0014' &&
+            item.productCode != 'GFRS_A0015' &&
+            item.productCode != 'GFRS_A0016'
           ) {
             list.push(item)
           }
@@ -1741,10 +1755,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') {
+            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') {
+              if (item.productCode == 'GFRS_A0009' || item.productCode == 'GFRS_A0013' || item.productCode == 'GFRS_A0015' || item.productCode == 'GFRS_A0016') {
                 if (this.saleInsuredPersonInfo.relationToAppnt != 1) {
                   //不同人
                   if (showPrem001) {
@@ -1814,10 +1828,11 @@ export default {
         }
       }
 
-      //2、豁免险跟主险联动，豁免险缴费期间和保险期间同主险的缴费期间
+      //2、豁免险跟主险联动，豁免险缴费期间和保险期间同主险的缴费期间 -1 (附加险D款时提出的需求)
       let remitIndex = this.getRemitIndex()
       //if (!remitIndex) return
       for (let itemRemitIndex of remitIndex) {
+        console.log('mainRiskInfo---->', mainRiskInfo)
         this.chooseProducts[itemRemitIndex].calFactorLst.forEach((item) => {
           if (item.code == 'payIntv') {
             for (let key in mainRiskInfo.payIntv) {
@@ -1827,13 +1842,13 @@ export default {
           if (item.code == 'payEndYear') {
             item.hasFlag = '1'
             item.payEndYearFlag = 'Y'
-            item.payEndYear = Number(mainRiskInfo.payEndYear.payEndYear)
+            item.payEndYear = Number(mainRiskInfo.payEndYear.payEndYear) - 1
             item.showContent = item.payEndYear + '年交'
           }
           if (item.code == 'insuYear') {
             item.hasFlag = '1'
             item.insuYearFlag = 'Y'
-            item.insuYear = Number(mainRiskInfo.payEndYear.payEndYear)
+            item.insuYear = Number(mainRiskInfo.payEndYear.payEndYear) - 1
             item.showContent = item.insuYear + '年'
           }
           if (item.code == 'amt') {
@@ -1848,7 +1863,9 @@ export default {
             this.chooseProducts[itemRemitIndex].productCode == 'GFRS_A0009' ||
             this.chooseProducts[itemRemitIndex].productCode == 'GFRS_A0010' ||
             this.chooseProducts[itemRemitIndex].productCode == 'GFRS_A0013' ||
-            this.chooseProducts[itemRemitIndex].productCode == 'GFRS_A0014'
+            this.chooseProducts[itemRemitIndex].productCode == 'GFRS_A0014' ||
+            this.chooseProducts[itemRemitIndex].productCode == 'GFRS_A0015' ||
+            this.chooseProducts[itemRemitIndex].productCode == 'GFRS_A0016'
           ) {
             //此附加险的缴费期间=主险缴费期间；保险期间=主险保险期间
             if (item.code == 'insuYear') {
@@ -1875,7 +1892,7 @@ export default {
                     })
                     this.chooseProducts[0].productTrialYearDTOS.forEach((item, index) => {
                       //因交费方式为一次性交清时，不会有豁免险，所以这里不判断一次性交清的情况
-                      if (payEndYearVal == item.yearWay + '年交') {
+                      if (payEndYearVal == Number(item.yearWay) - 1 + '年交') {
                         v.amt = item.displayAmount * item.moneyUnit
                       }
                     })
@@ -2171,7 +2188,7 @@ export default {
         })
       }
       if (this.isFrom != 'proposal') {
-        if (productCode == 'GFRS_M0083' || productCode == 'GFRS_M0098'  || productCode == 'GFRS_M0085') {
+        if (productCode == 'GFRS_M0083' || productCode == 'GFRS_M0098' || productCode == 'GFRS_M0085') {
           if (!that.policyNo) {
             this.disabledShow = true
             that.chooseProducts.forEach((item) => {
@@ -2195,7 +2212,7 @@ export default {
           }
         }
       }
-      if(hasPredictTransferPrem == '1') { 
+      if (hasPredictTransferPrem == '1') {
         this.disabledShow = false
       }
       this.nextStepFlag = true
@@ -2454,7 +2471,6 @@ export default {
                   dutyCode: dutyItem.duty,
                   dutyName: dutyItem.dutyName
                 })
-                
               }
             })
             trialInfo.duty = result
@@ -3133,7 +3149,7 @@ export default {
               this.trialList[index].productCode == 'GFRS_M0057' ||
               this.trialList[index].productCode == 'GFRS_M0086' ||
               this.trialList[index].productCode == 'GFRS_M0092' ||
-                this.trialList[index].productCode == 'GFRS_M0096'
+              this.trialList[index].productCode == 'GFRS_M0096'
             ) {
               riskItem['dutyLst'] = this.trialInfos[index].duty
             }
@@ -3174,7 +3190,9 @@ export default {
             item.productCode == 'GFRS_A0010' ||
             item.productCode == 'GFRS_A0013' ||
             item.productCode == 'GFRS_A0014' ||
-            item.productCode == 'GFRS_M0077'
+            item.productCode == 'GFRS_M0077' ||
+            item.productCode == 'GFRS_A0015' ||
+            item.productCode == 'GFRS_A0016'
           ) {
             this.trialInfos[index].amt = this.trialList[index].duty[0].amt
           }

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

@@ -48,7 +48,7 @@ export default {
       age = this.getSaleInsuredInfo().age
       tips = '投保人年龄不适合此款险种，请选择其他险种！'
     } else {
-      if(riskProductCode == 'GFRS_M0061'){
+      if(riskProductCode == 'GFRS_M0061' || riskProductCode == 'GFRS_M0102' || riskProductCode == 'GFRS_M0101'){
         age = this.getSaleInsuredPersonInfo().birthday?utilsAge.getAge29(this.getSaleInsuredPersonInfo().birthday, new Date()):this.getSaleInsuredPersonInfo().insuredAge
       }else{
         age = this.getSaleInsuredPersonInfo().birthday?utilsAge.getAgeByValue(this.getSaleInsuredPersonInfo().birthday, new Date()):this.getSaleInsuredPersonInfo().insuredAge