Merge branch 'release/1226' into dev

# Conflicts: # src/views/ebiz/common/CalculatePremium.vue # src/views/ebiz/sale/AddBeneficiaryInfo.vue
2025-12-21 06:36:45 +08:00 · 2019-12-26 13:34:16 +08:00
parent 87b95db41f 0fbf38ecef
commit 51d0d03d0e
7 changed files with 59 additions and 32 deletions
--- a/src/views/ebiz/common/CalculatePremium.vue
+++ b/src/views/ebiz/common/CalculatePremium.vue
@@ -171,8 +171,8 @@ export default {
      influenceAddRiskCodes: [],
      influences: [],
      nextStepFlag: false,
-      isRelated: localStorage.isRelated === '0',
-      policyNo: '', //关联保单号
+      isRelated: localStorage.isRelated === '0',//关联保单号
+      policyNo: '', 
      // 份数
      mult: '',
      isFrom: '',
@@ -212,7 +212,6 @@ export default {
        if (item.mainRiskCode == 'GFRS_M0006') {
          item.isHidden = true
        }
-        // debugger
        if(item.mainRiskCode != 'GFRS_M0008') {
            item.calFactorLst.map(i => {
              this.defalutAmt = i.displayAmount
@@ -679,7 +678,7 @@ export default {
          trialInfo['payEndYear'] = '1000'
          trialInfo['payEndYearFlag'] = 'Y'
          // 福宝宝和万能险传A
-          if (item.mainRiskCode != 'GFRS_M0006' && item.mainRiskCode != 'GFRS_M0003') {
+          if (item.mainRiskCode != 'GFRS_M0006' && item.mainRiskCode != 'GFRS_M0003' && item.mainRiskCode != 'GFRS_M0013') {
            trialInfo['insuYearFlag'] = 'Y'
          }
        }
--- a/src/views/ebiz/common/MainRiskList.vue
+++ b/src/views/ebiz/common/MainRiskList.vue
@@ -81,6 +81,7 @@ export default {
    },
    //下一步
    nextStep() {
+      console.log(this.result)
      if (!this.result) {
        this.$toast('请选择产品')
        return
--- a/src/views/ebiz/common/SelectedProduct.vue
+++ b/src/views/ebiz/common/SelectedProduct.vue
@@ -1,26 +1,24 @@
 <template>
  <div style="background: #f5f5f5" class="select-product-container pt20">
-    <div v-for="(item, index) in chooseProducts" :key="index" class="mb20 bg-white mh15 pv15 pr15 pl10 radius5">
+    <div
+      v-for="(item, index) in chooseProducts"
+      :key="index"
+      class="mb20 bg-white mh15 pv15 pr15 pl10 radius5"
+    >
      <div class="flex mv10 align-items-c">
        <div class="fs14 w45">
          <van-tag plain type="danger">主险</van-tag>
        </div>
-        <div class="fs15 c-gray-dark ">
-          {{ item.riskName }}
-        </div>
+        <div class="fs15 c-gray-dark">{{ item.riskName }}</div>
      </div>
      <div class="pl45 flex mv10" v-for="(addtion, addIndex) in item.addtion" :key="addIndex">
        <div class="w50">
          <van-tag mark color="#DDF2EF" text-color="#E9332E">附加</van-tag>
        </div>
-        <div class="fs13">
-          {{ addtion.riskName }}
-        </div>
+        <div class="fs13">{{ addtion.riskName }}</div>
      </div>
      <div class="flex fs15 justify-content-s align-items-b pb5">
-        <div class="c-gray-darker fwb">
-          首期保费（元）
-        </div>
+        <div class="c-gray-darker fwb">首期保费（元）</div>
        <div class="yellow fwb">{{ item.prem.toFixed(2) | moneyFormat }}</div>
      </div>

@@ -30,7 +28,11 @@
      </div>
    </div>
    <div class="pt30 bg-white pb50">
-      <div class="text-center m20 pv15 border-dotted c-gray-base bg-white" @click="addProduct">
+      <div
+        class="text-center m20 pv15 border-dotted c-gray-base bg-white"
+        @click="addProduct"
+        v-if="isShow == true"
+      >
        <span class="v-middle mr10" style="font-size:32px">+</span>添加产品
      </div>
    </div>
@@ -38,8 +40,8 @@
    <div>
      <van-submit-bar button-text="下一步" @submit="nextStep" :disabled="nextStepFlag">
        <div class="fs15 ml15 fwb" style="flex:1" slot="default">
-          合计：<span class=" yellow  mr5">￥{{ (total / 100).toFixed(2) | moneyFormat }}</span
-          >元
+          合计：
+          <span class="yellow mr5">￥{{ (total / 100).toFixed(2) | moneyFormat }}</span>元
        </div>
      </van-submit-bar>
    </div>
@@ -58,7 +60,8 @@ export default {
    return {
      chooseProducts: [],
      total: 0,
-      nextStepFlag: true
+      nextStepFlag: true,
+      isShow: true
    }
  },
  components: {
@@ -95,6 +98,8 @@ export default {
      let isProposal = localStorage.isFrom == 'proposal' ? true : false
      if (isProposal) {
        let saleInsuredPersonInfo = localStorage.saleInsuredPersonInfo && JSON.parse(localStorage.saleInsuredPersonInfo)
+        console.log(saleInsuredPersonInfo)
+
        let insuredId
        if (saleInsuredPersonInfo && saleInsuredPersonInfo.insuredId) {
          insuredId = saleInsuredPersonInfo.insuredId
@@ -127,7 +132,18 @@ export default {
        this.$utils.intLocalStorage(resultData, isProposal)

        this.chooseProducts = formatAllRisk(riskDTOLst)
-
+        console.log(this.chooseProducts)
+        if (!isProposal) {
+          if (this.chooseProducts.length == 0) {
+            this.isShow = true
+          } else {
+            if (this.chooseProducts[0].riskCode == 'GFRS_M0011') {
+              this.isShow = true
+            } else {
+              this.isShow = false
+            }
+          }
+        }
        if (riskDTOLst.length > 0) {
          this.nextStepFlag = false
        }
@@ -146,6 +162,7 @@ export default {
      })
        .then(() => {
          this.delProduct(index)
+          this.isShow = true
        })
        .catch(() => {
          this.$toast('删除失败！')
--- a/src/views/ebiz/proposal/Exhibition.vue
+++ b/src/views/ebiz/proposal/Exhibition.vue
@@ -64,7 +64,7 @@
          <div class="flex text-center bg-green-base mt2  c-gray-darker   table">
            <div class="flex justify-content-c align-items-c ">{{ main.riskName }}</div>
            <div class="flex justify-content-c align-items-c ">
-              {{ main.amt | amtFormat }}
+              {{ main.amt ? amtFormat(main.amt) :''  }}
            </div>
            <div class="flex justify-content-c align-items-c ">{{ main.insureName }}</div>
            <div class="flex justify-content-c align-items-c ">{{ main.payName }}</div>
@@ -299,6 +299,7 @@ export default {
          this.formatLocal(res)
        })
      }
+      console.log(this.mainRiskCodes)
    },
    //app回调
    appCallBack(data) {
@@ -403,6 +404,10 @@ export default {

    //转投保
    insure() {
+      console.log(JSON.parse(localStorage.mainRiskCodes).length)
+      if(JSON.parse(localStorage.mainRiskCodes).length == '2') {
+        return Toast.fail('暂不支持组合产品转投保')
+      }
      let params = {
        proposalInfoDTO: {
          proposalNo: localStorage.orderNo
--- a/src/views/ebiz/proposal/List.vue
+++ b/src/views/ebiz/proposal/List.vue
@@ -138,7 +138,7 @@ export default {
          list = formatRiskList(list, 'insuredDTOs', 'riskDTOLst') //格式化数据为本地显示结果

          this.proposalList = this.proposalList.concat(list)
-          console.log(this.proposalList.length)
+          console.log(this.proposalList)
          if (this.proposalList.length == 0) {
            this.isSuccess = false
          }
@@ -243,6 +243,10 @@ export default {
    },
    //转投保
    toInsurance(item) {
+      console.log(item.insuredDTOs[0].mainRisk.length)
+      if(item.insuredDTOs[0].mainRisk.length == '2') {
+        return Toast.fail('暂不支持组合产品转投保')
+      }
      let params = {
        proposalInfoDTO: {
          proposalNo: item.orderInfoDTO.orderNo
--- a/src/views/ebiz/sale/AddBeneficiaryInfo.vue
+++ b/src/views/ebiz/sale/AddBeneficiaryInfo.vue
@@ -930,8 +930,8 @@ export default {
        this.idLimit = true
        this.userInfo.occupationCode = insuredDetail.occupationCode //职业类别编码
        this.userInfo.occupationName = insuredDetail.occupationName //职业类别名称
-        this.userInfo.mobile = insuredDetail.mobile //联系电话
-        this.userInfo.email = insuredDetail.email //电子邮箱
+        // this.userInfo.mobile = insuredDetail.mobile //联系电话
+        // this.userInfo.email = insuredDetail.email //电子邮箱
      } else {
        this.isInsured = false
        this.userInfo.relationToInsured = ''
@@ -949,8 +949,8 @@ export default {
        this.idLimit = false
        this.userInfo.occupationCode = '' //职业类别编码
        this.userInfo.occupationName = '' //职业类别名称
-        this.userInfo.mobile = '' //联系电话
-        this.userInfo.email = '' //电子邮箱
+        // this.userInfo.mobile = '' //联系电话
+        // this.userInfo.email = '' //电子邮箱
      }
    },
    //长期状态改变时
@@ -961,7 +961,6 @@ export default {
        this.isRequired = false
        this.idLimit = true
        this.certiexpiredateRequired = false
-        this.idLimit = true
      } else {
        this.certiexpiredateRequired = true
        this.isRequired = true
--- a/src/views/ebiz/sale/List.vue
+++ b/src/views/ebiz/sale/List.vue
@@ -341,9 +341,11 @@ export default {
    //投保单详情
    goDetail(order) {
      window.localStorage.setItem('detailJump', '')
+      if (order.insuredDTOs[0]) {
        if (order.insuredDTOs[0].riskDTOLst[0]) {
          localStorage.setItem('productCode', order.insuredDTOs[0].riskDTOLst[0].mainRiskCode)
        }
+      }
      let orderStatus = order.orderInfoDTO.orderStatus
      let orderNo = order.orderInfoDTO.orderNo
      let url = ''