From 6cb1ff7c0f5683babdc3ff08b0365e062dd6ff7f Mon Sep 17 00:00:00 2001
From: mengxiaolong <meng.xiaolong@ebiz-digits.com>
Date: Tue, 17 Nov 2020 14:30:43 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=85=A5=E5=8F=B8=E4=BC=98=E5=8C=96bug?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

1. 审批不显示总行信息以及联行号问题修改
2. 界面反复跳转问题修改
3. 担保人类别去除"无"选项
---
 src/assets/js/utils/data-dictionary.js        |  3 +-
 .../ebiz/agentEenter/approve/BasicInfo.vue    | 82 +++++++++++------
 .../ebiz/agentEenter/approve/RecordDetail.vue | 87 +++++++++++++------
 3 files changed, 116 insertions(+), 56 deletions(-)

diff --git a/src/assets/js/utils/data-dictionary.js b/src/assets/js/utils/data-dictionary.js
index aa340ded1..cdce95ee7 100644
--- a/src/assets/js/utils/data-dictionary.js
+++ b/src/assets/js/utils/data-dictionary.js
@@ -2295,8 +2295,7 @@ export default {
   relationType: [
     { id: '0', text: '配偶' },
     { id: '1', text: '子女' },
-    { id: '2', text: '父母' },
-    { id: '3', text: '无' }
+    { id: '2', text: '父母' }
   ],
   guarantRelationType: [
     { id: '0', text: '亲属' },
diff --git a/src/views/ebiz/agentEenter/approve/BasicInfo.vue b/src/views/ebiz/agentEenter/approve/BasicInfo.vue
index 063b69040..ad7768c2d 100644
--- a/src/views/ebiz/agentEenter/approve/BasicInfo.vue
+++ b/src/views/ebiz/agentEenter/approve/BasicInfo.vue
@@ -26,11 +26,11 @@
         <van-cell title="证件号码" :value="BasicInfoDTO.idNo" />
         <van-cell title="联系地址" :value="BasicInfoDTO.address" />
         <van-cell title="邮政编码" :value="BasicInfoDTO.zip | blankFilter" />
-        <van-cell title="开户银行" :value="BasicInfoDTO.bankName | bankNameFilter" />
+        <van-cell title="开户银行" :value="BasicInfoDTO.bankName | bankNameFilter(bankList)" />
         <van-cell title="开户地" :value="BasicInfoDTO.bankAddress" />
         <van-cell title="开户姓名" :value="BasicInfoDTO.accountName" />
         <van-cell title="银行卡号" :value="BasicInfoDTO.bankCode" />
-        <van-cell title="联行号" :value="BasicInfoDTO.bankJoint | bankJointFilter(BasicInfoDTO.bankName)" />
+        <van-cell title="联行号" :value="BasicInfoDTO.bankJoint | bankJointFilter(BasicInfoDTO.bankName, bankJointsList)" />
         <van-cell title="从业年限" :value="BasicInfoDTO.perationPeriod | blankFilter" />
         <van-cell title="原工作单位" :value="BasicInfoDTO.oldCompany" />
         <van-cell title="原职业" :value="BasicInfoDTO.oldOccupation | idToText('oldOccupation')" />
@@ -103,10 +103,10 @@
 </template>
 <script>
 import config from '@/config'
-import { agentAddApproval } from '@/api/ebiz/agentEenter/agentEenter.js'
+import { agentAddApproval, getBankJoints } from '@/api/ebiz/agentEenter/agentEenter.js'
 import { Cell, CellGroup, Button, Grid, GridItem, Image, ImagePreview } from 'vant'
 import dictionary from '@/assets/js/utils/data-dictionary'
-import bankListJson from '../js/bankList.js'
+import { getBankList } from '@/api/ebiz/sale/sale'
 
 export default {
   name: 'approveInfo',
@@ -121,6 +121,8 @@ export default {
   },
   data() {
     return {
+      bankList: [],
+      bankJointsList: [],
       active: 0,
       agreements: [],
       medias: [],
@@ -169,8 +171,20 @@ export default {
     window.appCallBack = this.appCallBack
     //获取列表信息
     this.getOrderList()
+    this.getBankList()
   },
   methods: {
+    async getBankList() {
+      let data = {
+        operateType: 'enter_bank_type'
+      }
+      const res = await getBankList(data)
+      if (res.result == '0') {
+        this.bankList = res.content
+      } else {
+        this.$toast(res.resultMessage)
+      }
+    },
     appCallBack(data) {
       if (data.trigger == 'left_button_click') {
         if (!this.pdfShow) {
@@ -280,6 +294,33 @@ export default {
       })
     }
   },
+  watch: {
+    'BasicInfoDTO.bankName': {
+      async handler() {
+        let param = {
+          bankcode: this.BasicInfoDTO.bankName,
+          citycode: this.BasicInfoDTO.bankCity.slice(0, 4)
+        }
+        this.bankJointsList.splice(0)
+        let res = await getBankJoints(param)
+        if (res.result === '0') {
+          if (!res.content.length) {
+            param.citycode = this.BasicInfoDTO.bankProvince.slice(0, 4)
+            let res = await getBankJoints(param)
+            if (res.result === '0') {
+              this.bankJointsList.push(...res.content)
+            } else {
+              this.$toast(res.resultMessage)
+            }
+          } else {
+            this.bankJointsList.push(...res.content)
+          }
+        } else {
+          this.$toast(res.resultMessage)
+        }
+      }
+    }
+  },
   filters: {
     guarantRelationFilter(val) {
       for (let item of dictionary.guarantRelationType) {
@@ -301,36 +342,25 @@ export default {
     isSecond(val) {
       return val ? (val.toUpperCase() === 'Y' ? '是' : '否') : '-'
     },
-    bankNameFilter(val) {
-      switch (val) {
-        case '102':
-          return '工商银行'
-        case '501':
-          return '北部湾银行'
-        default:
-          return '-'
+    bankNameFilter(val, bankList) {
+      for (let bank of bankList) {
+        if (bank.code === val) {
+          return bank.bankName
+        }
       }
+      return '-'
     },
     genderFilter(val) {
       if (!val) return '-'
       return val === '0' ? '男' : '女'
     },
-    bankJointFilter(bankJoint, bankName) {
-      let bank = bankListJson.find(item => {
-        return item.code === bankName
-      })
-      if (bank) {
-        bank = bank.child.find(item => {
-          return item.code === bankJoint
-        })
-        if (bank) {
-          return bank.name
-        } else {
-          return '-'
+    bankJointFilter(bankJoint, bankName, bankJointsList) {
+      for (let joint of bankJointsList) {
+        if (joint.bankjoint === bankJoint) {
+          return joint.banknames
         }
-      } else {
-        return '-'
       }
+      return '-'
     }
   }
 }
diff --git a/src/views/ebiz/agentEenter/approve/RecordDetail.vue b/src/views/ebiz/agentEenter/approve/RecordDetail.vue
index 03258e3d3..bacbf2b8f 100644
--- a/src/views/ebiz/agentEenter/approve/RecordDetail.vue
+++ b/src/views/ebiz/agentEenter/approve/RecordDetail.vue
@@ -27,11 +27,11 @@
           <van-cell title="证件号码" :value="basicInfoDTO.idNo" />
           <van-cell title="联系地址" :value="basicInfoDTO.address" />
           <van-cell title="邮政编码" :value="basicInfoDTO.zip | blankFilter" />
-          <van-cell title="开户银行" :value="basicInfoDTO.bankName | bankNameFilter" />
+          <van-cell title="开户银行" :value="basicInfoDTO.bankName | bankNameFilter(bankList)" />
           <van-cell title="开户地" :value="basicInfoDTO.bankAddress" />
           <van-cell title="开户姓名" :value="basicInfoDTO.accountName" />
           <van-cell title="银行卡号" :value="basicInfoDTO.bankCode" />
-          <van-cell title="联行号" :value="basicInfoDTO.bankJoint | bankJointFilter(basicInfoDTO.bankName)" />
+          <van-cell title="联行号" :value="basicInfoDTO.bankJoint | bankJointFilter(basicInfoDTO.bankName, bankJointsList)" />
           <van-cell title="从业年限" :value="basicInfoDTO.perationPeriod | blankFilter" />
           <van-cell title="原工作单位" :value="basicInfoDTO.oldCompany" />
           <van-cell title="原职业" :value="basicInfoDTO.oldOccupation | idToText('oldOccupation')" />
@@ -108,10 +108,10 @@
 </template>
 <script>
 import config from '@/config'
-import { agentAddApproval } from '@/api/ebiz/agentEenter/agentEenter.js'
+import { agentAddApproval, getBankJoints } from '@/api/ebiz/agentEenter/agentEenter.js'
 import { Cell, CellGroup, Button, Tab, Tabs, Image, Grid, GridItem, Popup, ImagePreview } from 'vant'
 import dictionary from '@/assets/js/utils/data-dictionary'
-import bankListJson from '../js/bankList.js'
+import { getBankList } from '@/api/ebiz/sale/sale'
 
 export default {
   name: 'recordDetail',
@@ -129,6 +129,8 @@ export default {
   },
   data() {
     return {
+      bankList: [],
+      bankJointsList: [],
       active: 0,
       // 基本信息
       basicInfoDTO: {},
@@ -198,8 +200,20 @@ export default {
       }
     }
     this.getOrderList(param, '2')
+    this.getBankList()
   },
   methods: {
+    async getBankList() {
+      let data = {
+        operateType: 'enter_bank_type'
+      }
+      const res = await getBankList(data)
+      if (res.result == '0') {
+        this.bankList = res.content
+      } else {
+        this.$toast(res.resultMessage)
+      }
+    },
     appCallBack(data) {
       if (data.trigger == 'left_button_click') {
         if (!this.pdfShow) {
@@ -236,6 +250,7 @@ export default {
             this.medias = res.content.ebizEnterCustomerDto.ebizMediaDtoLst
             this.guarantorList = res.content.ebizEnterCustomerDto.ebizGuarantorList
             this.relationList = res.content.ebizEnterCustomerDto.ebizRelationDtoList
+            this.enterSubmitResDTO = res.content.enterSubmitResDTO
             this.classifyPhotos(this.medias)
           }
           // 需要新的接口文档
@@ -290,6 +305,33 @@ export default {
       this.pdfUrl = `${this.pdfBaseUrl}${encodeURIComponent(config.imgDomain + `/returnDirectStream?imgPath=${url}`)}`
     }
   },
+  watch: {
+    'basicInfoDTO.bankName': {
+      async handler() {
+        let param = {
+          bankcode: this.basicInfoDTO.bankName,
+          citycode: this.basicInfoDTO.bankCity.slice(0, 4)
+        }
+        this.bankJointsList.splice(0)
+        let res = await getBankJoints(param)
+        if (res.result === '0') {
+          if (!res.content.length) {
+            param.citycode = this.basicInfoDTO.bankProvince.slice(0, 4)
+            let res = await getBankJoints(param)
+            if (res.result === '0') {
+              this.bankJointsList.push(...res.content)
+            } else {
+              this.$toast(res.resultMessage)
+            }
+          } else {
+            this.bankJointsList.push(...res.content)
+          }
+        } else {
+          this.$toast(res.resultMessage)
+        }
+      }
+    }
+  },
   filters: {
     guarantRelationFilter(val) {
       for (let item of dictionary.guarantRelationType) {
@@ -315,32 +357,21 @@ export default {
       if (!val) return '-'
       return val === '0' ? '男' : '女'
     },
-    bankNameFilter(val) {
-      switch (val) {
-        case '102':
-          return '工商银行'
-        case '501':
-          return '北部湾银行'
-        default:
-          return '-'
-      }
-    },
-    bankJointFilter(bankJoint, bankName) {
-      let bank = bankListJson.find(item => {
-        return item.code === bankName
-      })
-      if (bank) {
-        bank = bank.child.find(item => {
-          return item.code === bankJoint
-        })
-        if (bank) {
-          return bank.name
-        } else {
-          return '-'
+    bankNameFilter(val, bankList) {
+      for (let bank of bankList) {
+        if (bank.code === val) {
+          return bank.bankName
         }
-      } else {
-        return '-'
       }
+      return '-'
+    },
+    bankJointFilter(bankJoint, bankName, bankJointsList) {
+      for (let joint of bankJointsList) {
+        if (joint.bankjoint === bankJoint) {
+          return joint.banknames
+        }
+      }
+      return '-'
     }
   }
 }