From d7959a97b92fc207027cd4765e09a58da0a00842 Mon Sep 17 00:00:00 2001
From: yuweiqi <yu.weiqi@ebiz-fooge.com>
Date: Wed, 10 Jun 2020 16:12:22 +0800
Subject: [PATCH 1/2] =?UTF-8?q?[FIX]=E3=80=90=E4=BF=9D=E5=85=A8=E3=80=91?=
 =?UTF-8?q?=E9=80=80=E4=BF=9D-=E9=80=80=E4=BF=9D=E5=8E=9F=E5=9B=A0?=
 =?UTF-8?q?=E6=9C=80=E5=A4=A7=E8=BE=93=E5=85=A5=E5=AD=97=E7=AC=A6=E6=95=B0?=
 =?UTF-8?q?=E9=99=90=E5=AE=9A200=EF=BC=9B=E7=BB=AD=E6=9C=9F=E8=B4=A6?=
 =?UTF-8?q?=E6=88=B7=E5=8F=98=E6=9B=B4=E9=A1=B5-=E5=B8=83=E5=B1=80?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/ebiz/preserve/ct/SurrenderInfo.vue |  1 +
 src/views/ebiz/preserve/pc/RenewalInfo.vue   | 62 +++++++++++++-------
 2 files changed, 41 insertions(+), 22 deletions(-)

diff --git a/src/views/ebiz/preserve/ct/SurrenderInfo.vue b/src/views/ebiz/preserve/ct/SurrenderInfo.vue
index 8e9e506e5..4392c80c1 100644
--- a/src/views/ebiz/preserve/ct/SurrenderInfo.vue
+++ b/src/views/ebiz/preserve/ct/SurrenderInfo.vue
@@ -99,6 +99,7 @@
             rows="4"
             autosize
             type="textarea"
+            maxlength="200"
             name="其他退保原因"
             placeholder="请输入其他退保原因"
             v-validate="surrenderReasonType == '6' ? 'required' : ''"
diff --git a/src/views/ebiz/preserve/pc/RenewalInfo.vue b/src/views/ebiz/preserve/pc/RenewalInfo.vue
index 7a6522dc2..d421298ef 100644
--- a/src/views/ebiz/preserve/pc/RenewalInfo.vue
+++ b/src/views/ebiz/preserve/pc/RenewalInfo.vue
@@ -49,16 +49,18 @@
         />
         <van-button type="danger" size="small" round class="bankCard mr10 w110 h20" @click="cardScanning('0')" v-no-more-click="2000">银行卡扫描</van-button>
       </van-cell-group>
-      <van-field
-        v-model="bankAdr"
-        label="开户银行所在地"
-        @click="bankProvincePopup = true"
-        placeholder="请输入"
-        v-validate="'required'"
-        name="开户银行所在地"
-        required
-        readonly
-      />
+      <van-cell-group class="mt10 change-container">
+        <van-field
+          v-model="bankAdr"
+          label="开户银行所在地"
+          @click="bankProvincePopup = true"
+          placeholder="请输入"
+          v-validate="'required'"
+          name="开户银行所在地"
+          required
+          readonly
+        />
+      </van-cell-group>
       <div class="bottom-btn bg-white">
         <van-button type="danger" size="large" @click="nextStep" v-no-more-click="2000">下一步</van-button>
       </div>
@@ -76,6 +78,12 @@
     </div>
     <!-- 银行卡扫描 -->
     <BankCardScan :scanShow="isScan" :clear="false" @getScanInfo="getBankCardInfo"></BankCardScan>
+    <!-- 信息变更提示弹窗 -->
+    <div class="dialog-container">
+      <van-dialog v-model="dialogShow" title="提示" @confirm="dialogShow = false" confirmButtonColor="#fff">
+        <p class="p15 pb20 fs14 text-center">该客户涉及到的所有保单相应信息将变更</p>
+      </van-dialog>
+    </div>
   </div>
 </template>
 
@@ -105,6 +113,7 @@ export default {
   },
   data() {
     return {
+      dialogShow: true, //信息变更弹窗是否显示
       valueKey: '',
       popupShow: false,
       pickerType: '',
@@ -142,11 +151,6 @@ export default {
   mounted() {
     // 筛选按钮的点击事件
     window.appCallBack = this.appCallBack
-    /*Dialog.confirm({
-      title: '提示',
-      message: '该客户涉及到的所有保单相应信息将变更',
-      showCancelButton: false
-    })*/
   },
   methods: {
     //区域选择
@@ -355,25 +359,39 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-.van-dialog__confirm {
-  background-color: #e9332e !important;
-  margin-right: 20px;
+.dialog-container {
+  /deep/.van-dialog__confirm {
+    background-color: #e9332e !important;
+  }
+  /deep/.van-dialog__header {
+    color: #e9332e !important;
+    padding-bottom: 5px;
+  }
+  /deep/.van-dialog {
+    width: 77%;
+  }
 }
 
 .renewal-info-container {
   .cont-info-container {
-    /deep/ .van-cell__value {
+    /deep/.van-cell__value {
       text-align: left;
-      width: 75%;
+      width: 15%;
+      flex: auto;
     }
   }
-  .change-container,
-  .align-items-c {
+  .change-container {
     /deep/.van-field__label {
       text-align: left;
       width: 40%;
     }
   }
+  .align-items-c {
+    /deep/.van-field__label {
+      text-align: left;
+      width: 55%;
+    }
+  }
   /deep/ .bankCard {
     width: 120px;
     height: 20px;

From 06c64a9498a5c020223b4b7339cccf969529e749 Mon Sep 17 00:00:00 2001
From: yuweiqi <yu.weiqi@ebiz-fooge.com>
Date: Wed, 10 Jun 2020 17:24:51 +0800
Subject: [PATCH 2/2] =?UTF-8?q?[FIX]=E3=80=90=E4=BF=9D=E5=85=A8=E3=80=91?=
 =?UTF-8?q?=E9=80=80=E4=BF=9D=E3=80=81=E7=BB=AD=E6=9C=9F=E5=8F=98=E6=9B=B4?=
 =?UTF-8?q?-=E6=96=87=E6=A1=A3=E9=98=85=E8=AF=BB=E6=8F=90=E4=BA=A4?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E8=AF=B7=E6=B1=82=E5=8F=82=E6=95=B0=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4=EF=BC=9B=E7=BB=AD=E6=9C=9F=E9=A1=B5=E9=9D=A2=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/ebiz/preserve/ct/SurrenderTip.vue    |  3 ++-
 .../ebiz/preserve/pc/AutopayAuthorization.vue  |  3 ++-
 .../ebiz/preserve/pc/RenewalConfirmation.vue   | 15 +++------------
 src/views/ebiz/preserve/pc/RenewalInfo.vue     | 18 +++++++++++++++---
 4 files changed, 22 insertions(+), 17 deletions(-)

diff --git a/src/views/ebiz/preserve/ct/SurrenderTip.vue b/src/views/ebiz/preserve/ct/SurrenderTip.vue
index bd9699ac5..aa5777a3e 100644
--- a/src/views/ebiz/preserve/ct/SurrenderTip.vue
+++ b/src/views/ebiz/preserve/ct/SurrenderTip.vue
@@ -117,7 +117,8 @@ export default {
         signMediaDTO: {
           signId: this.pdfList[0].signId,
           surrenderId: this.customerInfo.surrenderId,
-          documentStatus: '1'
+          documentStatus: '1',
+          documentType: '0' //documentType 0-阅读文档  3-签名文档
         }
       }
 
diff --git a/src/views/ebiz/preserve/pc/AutopayAuthorization.vue b/src/views/ebiz/preserve/pc/AutopayAuthorization.vue
index f08b17a8c..e62d6b86b 100644
--- a/src/views/ebiz/preserve/pc/AutopayAuthorization.vue
+++ b/src/views/ebiz/preserve/pc/AutopayAuthorization.vue
@@ -117,7 +117,8 @@ export default {
         signMediaDTO: {
           signId: this.pdfList[0].signId,
           surrenderId: this.customerInfo.surrenderId,
-          documentStatus: '1'
+          documentStatus: '1',
+          documentType: '0' //documentType 0-阅读文档  3-签名文档
         }
       }
 
diff --git a/src/views/ebiz/preserve/pc/RenewalConfirmation.vue b/src/views/ebiz/preserve/pc/RenewalConfirmation.vue
index 15de9e72e..bcbfc5fc2 100644
--- a/src/views/ebiz/preserve/pc/RenewalConfirmation.vue
+++ b/src/views/ebiz/preserve/pc/RenewalConfirmation.vue
@@ -142,14 +142,6 @@ export default {
     },
     //初始化信息
     init() {
-      this.$toast.loading({
-        // 持续展示 toast
-        duration: 0,
-        // 禁用背景点击
-        forbidClick: true,
-        loadingType: 'spinner',
-        message: '加载中……'
-      })
       let params = {
         edorType: 'PC',
         surrenderId: this.customerInfo.surrenderId,
@@ -249,11 +241,10 @@ export default {
 <style lang="scss" scoped>
 .renewal-confirmation-container {
   .cont-info-container {
-    /deep/.van-cell__title,
-    .van-cell__value {
-      flex: auto;
+    /deep/.van-cell__value {
       text-align: left;
-      width: 50%;
+      width: 15%;
+      flex: auto;
     }
   }
 }
diff --git a/src/views/ebiz/preserve/pc/RenewalInfo.vue b/src/views/ebiz/preserve/pc/RenewalInfo.vue
index d421298ef..90027471c 100644
--- a/src/views/ebiz/preserve/pc/RenewalInfo.vue
+++ b/src/views/ebiz/preserve/pc/RenewalInfo.vue
@@ -95,6 +95,7 @@ import { getBankList, checkCard } from '@/api/ebiz/sale/sale'
 import filters from '@/views/ebiz/preserve/filters'
 import getAreaName from '@/views/ebiz/preserve/js/utils/get-area-name'
 import areaList from '@/views/ebiz/preserve/js/utils/area'
+import dataDic from '../js/data-dictionary.js'
 
 export default {
   name: 'RenewalInfo',
@@ -153,6 +154,16 @@ export default {
     window.appCallBack = this.appCallBack
   },
   methods: {
+    //银行卡编码转银行名称
+    bankCodetoName(v) {
+      let text = ''
+      dataDic['edorBankType'].some(item => {
+        if (item.id == v) {
+          text = item.text
+        }
+      })
+      return text
+    },
     //区域选择
     sureArea(area, type) {
       switch (type) {
@@ -307,12 +318,12 @@ export default {
             {},
             {
               accountName: item.accountName,
-              bankName: item.bankName,
+              bankName: this.bankCodetoName(item.bankCode),
               accountType: item.accountType,
               bankCode: item.bankCode,
               bankNo: item.bankNo,
-              bankProvince: this.bankProvince, //TEST测试专用
-              // bankProvince: item.bankProvince,
+              // bankProvince: this.bankProvince, //TEST测试专用
+              bankProvince: item.bankProvince,
               isNewInfo: item.isNewInfo,
               contNo: item.bankNo,
               appntName: item.appntName,
@@ -325,6 +336,7 @@ export default {
           )
         )
       })
+
       let changeItem = {
         isNewInfo: '0',
         bankCode: this.bankCode,