Merge branch 'feature/【保全】' into dev

src/views/ebiz/preserve/bc/BeneficiaryInfo.vue

@@ -145,7 +145,7 @@ export default {
     },
     //下一步
     nextStep() {
-      if (this.type == 2 && this.beneficiaries.length == 1) {
+      if (this.type == 2 && this.beneficiaries.length < 1) {
         this.$toast('受益人列表不能为空')
         return
       }
@@ -153,7 +153,7 @@ export default {
       this.beneficiaries.forEach(item => {
         beneRatio += Number(item.bnfLot)
       })
-      if (beneRatio != 100 && !(this.beneficiaries.length == 1 && this.beneficiaries[0].isLegal == '1')) {
+      if (beneRatio != 100 && this.type == 2) {
         return (this.dialogShow = true)
       }
       let feachData = {

src/views/ebiz/preserve/bc/ImageUpload.vue

@@ -198,8 +198,7 @@ export default {
             flag: 'h5',
             extra: {
               url: location.origin + '/#/preserve/common/handleResult?entry=BC',
-              pullRefresh: '1',
+              pullRefresh: '1'
-              backToFirst: '1'
             },
             routerInfo: {
               path: '/preserve/common/handleResult?entry=BC'

src/views/ebiz/preserve/ct/ImageUpload.vue

@@ -245,8 +245,7 @@ export default {
             flag: 'h5',
             extra: {
               url: location.origin + '/#/preserve/common/handleResult?entry=CT',
-              pullRefresh: '1',
+              pullRefresh: '1'
-              backToFirst: '1'
             },
             routerInfo: {
               path: '/preserve/common/handleResult?entry=CT'

src/views/ebiz/preserve/ct/SurrenderConfirmation.vue

@@ -38,9 +38,9 @@
         <div :class="{ red: changeInfo.bankProvince }" slot="default">{{ bankProvince }}</div>
       </van-cell>
       <van-cell title="退保原因">
-        <div :class="{ red: changeInfo.reason }" slot="default">{{ ebizSurrender.reason }}</div>
+        <div :class="{ red: changeInfo.reason }" slot="default">{{ ebizSurrender.reason | idToText('surrenderReasonList') }}</div>
       </van-cell>
-      <van-cell title="其他退保原因" v-if="ebizSurrender.reason == '其他'">
+      <van-cell title="其他退保原因" v-if="ebizSurrender.reason == '06'">
         <div :class="[{ red: changeInfo.remark }]" slot="default">{{ ebizSurrender.remark }}</div>
       </van-cell>
     </van-cell-group>

src/views/ebiz/preserve/ct/SurrenderInfo.vue

@@ -421,7 +421,7 @@ export default {
       let valid = await this.$validator.validate()
       if (true === valid) {
         let ctBonusDTONew = Object.assign({}, this.ctAccountDTO, this.ctTrialDTO, this.detail, {
-          reason: this.reason,
+          reason: this.surrenderReasonType,
           remark: this.remark,
           isNewInfo: '0'
         })

src/views/ebiz/preserve/js/data-dictionary.js

@@ -85,12 +85,12 @@ export default {
   accountList: [{ id: '1', text: '原银行账户' }, { id: '2', text: '新银行账户' }],
   //退款原因列表
   surrenderReasonList: [
-    { id: '1', text: '个人经济原因，无力负担保费' },
+    { id: '01', text: '个人经济原因，无力负担保费' },
-    { id: '2', text: '对险种不满意' },
+    { id: '02', text: '对险种不满意' },
-    { id: '3', text: '对业务员不满意' },
+    { id: '03', text: '对业务员不满意' },
-    { id: '4', text: '对公司服务不满意' },
+    { id: '04', text: '对公司服务不满意' },
-    { id: '5', text: '人情投保' },
+    { id: '05', text: '人情投保' },
-    { id: '6', text: '其他' }
+    { id: '06', text: '其他' }
   ],
   // 续期缴费方式 1-现金、4-银行自动转账、8-银行回单 A-支付宝 W-微信 P-POS收费
   pcPayMode: [

src/views/ebiz/preserve/pc/ImageUpload.vue

@@ -198,8 +198,7 @@ export default {
             flag: 'h5',
             extra: {
               url: location.origin + '/#/preserve/common/handleResult?entry=PC',
-              pullRefresh: '1',
+              pullRefresh: '1'
-              backToFirst: '1'
             },
             routerInfo: {
               path: '/preserve/common/handleResult?entry=PC'