Merge branch 'feature/GFRS-1237【0525】国富人寿桂企保重大疾病保险' into release/0528

# Conflicts:
#	src/api/ebiz/sale/sale.js
#	src/assets/js/utils/data-dictionary.js
#	src/views/ebiz/common/CalculatePremium.vue

src/views/ebiz/common/CalculatePremium.vue

@@ -63,13 +63,16 @@
               @click="toSelect(index, riskFactorIndex, riskFactor.columns)"
             />
           </div>
+          <!-- 桂企产品——GFRS_M0024——不显示责任保费及（万元），只显示责任名称及勾选框 -->
           <div class="border-bottom" v-if="riskFactor.type == 3">
             <div class="pv12 border-bd">{{ riskFactor.name }}</div>
             <div class="duty">
               <div class="flex justify-content-s border-bd pv10 align-items-c" v-for="(dutyItem, dutyItemIndex) in riskFactor.rules" :key="dutyItemIndex">
-                <span class="fs14 w100">{{ dutyItem.dutyName }}({{ dutyItem.suffix }})</span>
+                <span v-if="item.productCode != 'GFRS_M0024'" class="fs14 w100">{{ dutyItem.dutyName }}({{ dutyItem.suffix }})</span>
+                <span v-else class="fs14 w100">{{ dutyItem.dutyName }}</span>
                 <div class="flex relative">
                   <van-stepper
+                    v-if="item.productCode != 'GFRS_M0024'"
                     v-model="dutyItem.defaultDutyAmt"
                     :min="dutyItem.minDutyAmt"
                     :max="dutyItem.maxDutyAmt"
@@ -1047,7 +1050,7 @@ export default {
       //2、豁免险跟主险联动，豁免险缴费期间和保险期间同主险的缴费期间
       let remitIndex = this.getRemitIndex()
       //if (!remitIndex) return
-      for(let itemRemitIndex of remitIndex){
+      for (let itemRemitIndex of remitIndex) {
         this.chooseProducts[itemRemitIndex].calFactorLst.forEach(item => {
           if (item.code == 'payIntv') {
             for (let key in mainRiskInfo.payIntv) {
@@ -1294,7 +1297,6 @@ export default {
           medical: JSON.parse(localStorage.getItem('saleInsuredPersonInfo')).medical
         })
         params.trialInfos.push(trialInfo)
-        
       })
       this.trialInfos = params.trialInfos
       return params
@@ -1512,6 +1514,11 @@ export default {
             riskItem['dutyLst'] = this.trialList[index].duty
             //930折中方案，责任险分档
             riskItem['amt'] = this.trialList[index].amt
+          } else {
+            //国富人寿桂企保重大疾病保险产品专写
+            if (this.trialList[index].productCode == 'GFRS_M0024') {
+              riskItem['dutyLst'] = this.trialInfos[index].duty
+            }
           }
           //保费算保额
           console.log('this.trialList', this.trialList[index].trialType)
@@ -1545,7 +1552,6 @@ export default {
           }
 
           // console.log(riskItem)
-          console.log(this.trialInfos[index])
           riskItem = Object.assign(riskItem, this.trialInfos[index])
           // console.log(riskItem)
           riskDTOLst.push(riskItem)
@@ -1554,6 +1560,14 @@ export default {
       if (!rollInResult) {
         return
       }
+
+      //国富人寿桂企保重大疾病保险产品专写
+      this.trialInfos.map((v, i) => {
+        if (v.productCode == 'GFRS_M0024') {
+          delete riskDTOLst[i].duty
+        }
+      })
+
       // console.log('riskDTOLst', riskDTOLst)
       //建议书需要添加全部投保人信息，电投只需要投保人ID
       let insuredDTOItem = Object.assign(this.saleInsuredPersonInfo, { riskDTOLst: riskDTOLst })