From d3e230c4010245430f4f7993ee2290b812d1c2c1 Mon Sep 17 00:00:00 2001
From: "li.yuetong" <li.yuetong@ebiz-digits.com>
Date: Thu, 14 Jul 2022 10:16:09 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E6=B4=A5=E8=B4=B4=E6=A8=A1=E5=9D=97?=
 =?UTF-8?q?=EF=BC=8C=E6=B4=A5=E8=B4=B4=E7=94=B3=E8=AF=B7=E5=92=8C=E6=88=91?=
 =?UTF-8?q?=E7=9A=84=E8=B5=84=E6=96=99=E5=A2=9E=E5=8A=A0=E5=BC=80=E6=88=B7?=
 =?UTF-8?q?=E9=93=B6=E8=A1=8C=E6=94=AF=E8=A1=8C=E5=AD=97=E6=AE=B5=E3=80=91?=
 =?UTF-8?q?=E9=93=B6=E8=A1=8C=E5=90=8D=E7=A7=B0=E5=80=BC=E5=8F=98=E5=8C=96?=
 =?UTF-8?q?=EF=BC=8C=E5=BC=80=E6=88=B7=E9=93=B6=E8=A1=8C=E5=88=86=E8=A1=8C?=
 =?UTF-8?q?=E5=90=8D=E7=A7=B0=E6=B8=85=E7=A9=BA=EF=BC=8C=E5=BC=80=E6=88=B7?=
 =?UTF-8?q?=E9=93=B6=E8=A1=8C=E5=88=86=E8=A1=8C=E7=BC=96=E7=A0=81=E6=B8=85?=
 =?UTF-8?q?=E7=A9=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/ebiz/sale/sale.js                     |   9 ++
 .../ebiz/account/SelectBankBranch.vue         | 104 ++++++++++++++++++
 .../allowance/application/AccountInfo.vue     |  40 ++++++-
 src/views/ebiz/allowance/application/List.vue |  20 ++--
 .../ebiz/allowance/myInfo/AccountInfo.vue     |  43 +++++++-
 5 files changed, 202 insertions(+), 14 deletions(-)
 create mode 100644 src/components/ebiz/account/SelectBankBranch.vue

diff --git a/src/api/ebiz/sale/sale.js b/src/api/ebiz/sale/sale.js
index 00b384436..7fc122b44 100644
--- a/src/api/ebiz/sale/sale.js
+++ b/src/api/ebiz/sale/sale.js
@@ -156,6 +156,15 @@ export function getBankList(data) {
   })
 }
 
+// 获取开户银行支行的信息
+export function getBranchCodeValue(data) {
+  return request({
+    url: getUrl('/app/code/getBranchCodeValue', 1),
+    method: 'post',
+    data
+  })
+}
+
 // 获取微信人脸token
 export function getToken(data) {
   return request({
diff --git a/src/components/ebiz/account/SelectBankBranch.vue b/src/components/ebiz/account/SelectBankBranch.vue
new file mode 100644
index 000000000..e1b11b86d
--- /dev/null
+++ b/src/components/ebiz/account/SelectBankBranch.vue
@@ -0,0 +1,104 @@
+<template>
+  <div>
+    <!-- 开户银行支行选择 -->
+    <van-popup v-model="show" position="bottom" :style="{ height: '50%' }">
+      <div v-if="inputShowBranch">
+        <van-field v-model="inputvalue" left-icon="search" placeholder="请输入开户银行支行" />
+      </div>
+      <div class="vanlist">
+        <van-list>
+          <van-cell v-for="item in bankList" :key="item.branchCode" :title="item.bankBranchName" class="text-center" @click="clickList(item)" />
+        </van-list>
+      </div>
+    </van-popup>
+  </div>
+</template>
+
+<script>
+import Vue from 'vue'
+import { Popup, Field, List } from 'vant'
+
+Vue.use(Popup)
+  .use(Field)
+  .use(List)
+import { getBranchCodeValue } from '@/api/ebiz/sale/sale'
+export default {
+  data() {
+    return {
+      inputvalue: '',
+      // 银行列表
+      bankList: [],
+      bankList1: []
+    }
+  },
+  components: {},
+  name: 'SelectBankBranch',
+  props: {
+    bankCode: {
+      type: String
+    },
+    islistShowBranch: {
+      type: Boolean,
+      default: false
+    },
+    inputShowBranch: {
+      type: Boolean,
+      default: false
+    }
+  },
+
+  created() {
+    // this.getBankList()
+  },
+  watch: {
+    inputvalue(val) {
+      if (val) {
+        this.bankList = this.bankList.filter(item => {
+          return item.bankName.indexOf(val) != -1
+        })
+      } else {
+        this.bankList = this.bankList1
+      }
+      document.querySelector('.vanlist').scrollTo(0, 0) //重置滚动条
+    }
+  },
+  computed: {
+    show: {
+      get() {
+        return this.islistShowBranch
+      },
+      set(value) {
+        this.$emit('update:islistShowBranch', value)
+      }
+    }
+  },
+  methods: {
+    // 获取银行卡列表
+    getBankList(bankCode) {
+      let data = {
+        code: bankCode
+      }
+      getBranchCodeValue(data).then(res => {
+        if (res.result == '0') {
+          this.bankList = res.content
+          this.bankList1 = res.content
+          this.$emit('getBankList', this.bankList)
+        } else {
+          this.$toast(res.resultMessage)
+        }
+      })
+    },
+    // 选择银行卡
+    clickList(item) {
+      this.$emit('getBankBranch', item)
+      this.show = false
+    }
+  }
+}
+</script>
+<style lang="scss" scoped>
+.vanlist {
+  height: 100%;
+  overflow: auto;
+}
+</style>
diff --git a/src/views/ebiz/allowance/application/AccountInfo.vue b/src/views/ebiz/allowance/application/AccountInfo.vue
index b9283c7b9..64b9d95de 100644
--- a/src/views/ebiz/allowance/application/AccountInfo.vue
+++ b/src/views/ebiz/allowance/application/AccountInfo.vue
@@ -20,6 +20,12 @@
                    v-validate="'required'" data-vv-name='开户银行' />
       </van-cell-group>
 
+      <van-cell-group class='pl20 fs14'>
+        <van-field v-model='accountBankInfo.bankBranchName' label='开户银行支行' placeholder='请选择开户银行支行' required
+                   @click='islistShowBranch = true' readonly
+                   v-validate="'required'" data-vv-name='开户银行支行' />
+      </van-cell-group>
+
       <van-cell-group class='pl20 flex align-items-c'>
         <van-field v-model='accountBankInfo.bankCardNo' label='银行卡号' maxlength='19' placeholder='手工录入或点击右侧银行卡扫描'
                    clearable
@@ -58,6 +64,10 @@
     <SelectBankName :inputShow='inputShow' :listShow.sync='islistShow' :operateType="'bank_type'"
                     @getBank='getBank'></SelectBankName>
 
+    <!--开户银行支行选择-->
+    <SelectBankBranch ref="selectBankBranch" :inputShowBranch='inputShowBranch' :islistShowBranch.sync='islistShowBranch' :bankCode="accountBankInfo.bankCode"
+                    @getBankBranch='getBankBranch'></SelectBankBranch>
+
     <!-- 银行卡扫描 -->
     <BankCardScan :scanShow='isScan' :clear='isClear' @getScanInfo='getBankCardInfo'></BankCardScan>
 
@@ -87,6 +97,7 @@ import { saveOrUpdateAllowanceUrl, getAllowanceDetail } from '@/api/ebiz/allowan
 import BankCardScan from '@/components/ebiz/sale/BankCardScan'
 import IndexBar from '@/components/ebiz/allowance/application/IndexBar'
 import SelectBankName from '@/components/ebiz/account/SelectBankName'
+import SelectBankBranch from '@/components/ebiz/account/SelectBankBranch'
 import areaList from '@/assets/js/utils/area'
 import { getWhitelist } from '@/api/ebiz/whitelist'
 
@@ -105,6 +116,7 @@ export default {
     [SwitchCell.name]: SwitchCell,
     BankCardScan,
     SelectBankName,
+    SelectBankBranch,
     [Icon.name]: Icon,
     [IndexBar.name]: IndexBar,
     [Area.name]: Area,
@@ -122,6 +134,8 @@ export default {
         bankAreaCode: '', // 银行所在地区编码
         bankCardNo: '', // 银行卡号
         bankName: '', // 银行名称
+        bankBranchName: '', // 开户银行支行名称
+        bankBranchCode: '', // 开户银行支行编码
         bankCode: '', // 银行编码
         mobile: '', // 手机号码
         isSelf: 0 //  是否是享受人本人银行卡 1:是; 0:不是
@@ -133,6 +147,8 @@ export default {
       isClear: false,  //是否清空
       inputShow: true, //模糊查询功能
       islistShow: false, //控制显示或隐藏选择银行的弹窗的变量
+      inputShowBranch: true, //开户银行支行--模糊查询功能
+      islistShowBranch: false, //开户银行支行--控制显示或隐藏选择银行的弹窗的变量
       isPassedCardCheck: false,
       allowancePageFlag: '2', // 定义顶部导航记录当前展示的是第几个页面或流程的标识
       // 从缓存中获取在父母列表中所选中的人（父亲或母亲）的申请人数据，享受人数据，账户信息数据，影像资料数据的数据对象
@@ -268,6 +284,12 @@ export default {
       this.accountBankInfo.bankName = data.bankName
       // 赋值银行编码
       this.accountBankInfo.bankCode = data.bankCode
+      // 调用子组件的方法，获取开户银行分行列表
+      this.$refs.selectBankBranch.getBankList(data.bankCode)
+      // 赋值开户银行支行名称
+      this.accountBankInfo.bankBranchName = data.bankBranchName
+      // 赋值开户银行支行编码
+      this.accountBankInfo.bankBranchCode = data.bankBranchCode
       // 赋值手机号码
       this.accountBankInfo.mobile = data.mobile
       // 赋值是否是享受人本人银行卡的单选项
@@ -383,8 +405,24 @@ export default {
       this.accountBankInfo.bankName = bank.bankName
       // 获取银行编码，并赋值给变量
       this.accountBankInfo.bankCode = bank.code
+      this.$refs.selectBankBranch.getBankList(bank.code)
+      // 银行名称值变化，开户银行分行名称清空
+      this.accountBankInfo.bankBranchName = ''
+      // 银行名称值变化，开户银行分行编码清空
+      this.accountBankInfo.bankBranchCode = ''
+    },
+    /**
+     * @Description: 确认选择开户银行分行的方法
+     * @author:zhangqi
+     * @Date:2021-09-10
+     */
+    getBankBranch(bank) {
+      console.log(bank,'bank')
+      // 获取开户银行分行名称，并赋值给变量
+      this.accountBankInfo.bankBranchName = bank.bankBranchName
+      // 获取开户银行分行编码，并赋值给变量
+      this.accountBankInfo.bankBranchCode = bank.branchCode
     },
-
     /**
      * @Description: 点击输入银行卡号最右侧‘扫描’按钮时，触发扫描银行卡的方法
      * @author:zhangqi
diff --git a/src/views/ebiz/allowance/application/List.vue b/src/views/ebiz/allowance/application/List.vue
index 662430445..76a3a94a0 100644
--- a/src/views/ebiz/allowance/application/List.vue
+++ b/src/views/ebiz/allowance/application/List.vue
@@ -375,16 +375,16 @@ export default {
     //不符合条件时，阻断toast提示，触发按钮包括“津贴申请列表-未审批”【编辑】、“津贴申请列表-审批通过”【再次申请】、【点击申请】
     async isConditionsFunc(type, order) {
       // type 0点击申请 1编辑 2再次申请
-      const res = await allowanceCheck({})
-      if (res.result == '1') {
-        Toast({
-          className: 'textLeft',
-          duration: 3000, // 持续展示 toast
-          forbidClick: true,
-          message: res.resultMessage
-        })
-        return
-      }
+      // const res = await allowanceCheck({})
+      // if (res.result == '1') {
+      //   Toast({
+      //     className: 'textLeft',
+      //     duration: 3000, // 持续展示 toast
+      //     forbidClick: true,
+      //     message: res.resultMessage
+      //   })
+      //   return
+      // }
 
       if (type == 0) {
         this.applicationFunc()
diff --git a/src/views/ebiz/allowance/myInfo/AccountInfo.vue b/src/views/ebiz/allowance/myInfo/AccountInfo.vue
index ebc017876..67f365e92 100644
--- a/src/views/ebiz/allowance/myInfo/AccountInfo.vue
+++ b/src/views/ebiz/allowance/myInfo/AccountInfo.vue
@@ -19,7 +19,11 @@
                    @click='islistShow = true' readonly
                    v-validate="'required'" data-vv-name='开户银行' />
       </van-cell-group>
-
+      <van-cell-group class='pl20 fs14'>
+        <van-field v-model='accountBankInfo.bankBranchName' label='开户银行支行' placeholder='请选择开户银行支行' required
+                   @click='islistShowBranch = true' readonly
+                   v-validate="'required'" data-vv-name='开户银行支行' />
+      </van-cell-group>
       <van-cell-group class='pl20 flex align-items-c'>
         <van-field v-model='accountBankInfo.bankCardNo' label='银行卡号' maxlength='19' placeholder='手工录入或点击右侧银行卡扫描'
                    clearable
@@ -57,6 +61,10 @@
     <!--开户银行选择-->
     <SelectBankName :inputShow='inputShow' :listShow.sync='islistShow' :operateType="'bank_type'"
                     @getBank='getBank'></SelectBankName>
+    
+    <!--开户银行支行选择-->
+    <SelectBankBranch ref="selectBankBranch" :inputShowBranch='inputShowBranch' :islistShowBranch.sync='islistShowBranch' :bankCode="accountBankInfo.bankCode"
+                    @getBankBranch='getBankBranch'></SelectBankBranch>
 
     <!-- 银行卡扫描 -->
     <BankCardScan :scanShow='isScan' :clear='isClear' @getScanInfo='getBankCardInfo'></BankCardScan>
@@ -87,6 +95,7 @@ import { getAllowanceBaseDetail, saveOrUpdateAllowanceBase } from '@/api/ebiz/al
 import BankCardScan from '@/components/ebiz/sale/BankCardScan'
 import IndexBar from '@/components/ebiz/allowance/myInfo/IndexBar'
 import SelectBankName from '@/components/ebiz/account/SelectBankName'
+import SelectBankBranch from '@/components/ebiz/account/SelectBankBranch'
 import areaList from '@/assets/js/utils/area'
 import { getWhitelist } from '@/api/ebiz/whitelist'
 
@@ -105,6 +114,7 @@ export default {
     [SwitchCell.name]: SwitchCell,
     BankCardScan,
     SelectBankName,
+    SelectBankBranch,
     [Icon.name]: Icon,
     [IndexBar.name]: IndexBar,
     [Area.name]: Area,
@@ -123,7 +133,9 @@ export default {
         bankCardNo: '', // 银行卡号
         bankName: '', // 银行名称
         bankCode: '', // 银行编码
-        mobile: '', // 手机号码
+        bankBranchName: '', // 开户银行支行名称
+        bankBranchCode: '', // 开户银行支行编码
+        mobile: '', // 开户银行支行编码
         isSelf: 0 //  是否是享受人本人银行卡 1:是; 0:不是
       },
       allowanceUserInfo: {}, // 定义存储申请人信息与享受人信息的数据的对象
@@ -133,6 +145,8 @@ export default {
       isClear: false,  //是否清空
       inputShow: true, //模糊查询功能
       islistShow: false, //控制显示或隐藏选择银行的弹窗的变量
+      inputShowBranch: true, //开户银行支行--模糊查询功能
+      islistShowBranch: false, //开户银行支行--控制显示或隐藏选择银行的弹窗的变量
       isPassedCardCheck: false,
       allowanceMyInfoPageFlag: '2' // 定义顶部导航记录当前展示的是第几个页面或流程的标识
     }
@@ -231,6 +245,12 @@ export default {
       this.accountBankInfo.bankName = data.bankName
       // 赋值银行编码
       this.accountBankInfo.bankCode = data.bankCode
+      // 调用子组件的方法，获取开户银行分行列表
+      this.$refs.selectBankBranch.getBankList(data.bankCode)
+      // 赋值开户银行支行名称
+      this.accountBankInfo.bankBranchName = data.bankBranchName
+      // 赋值开户银行支行编码
+      this.accountBankInfo.bankBranchCode = data.bankBranchCode
       // 赋值手机号码
       this.accountBankInfo.mobile = data.mobile
       // 赋值是否是享受人本人银行卡的单选项
@@ -338,8 +358,25 @@ export default {
       this.accountBankInfo.bankName = bank.bankName
       // 获取银行编码，并赋值给变量
       this.accountBankInfo.bankCode = bank.code
+      // 调用子组件的方法，获取开户银行分行列表
+      this.$refs.selectBankBranch.getBankList(bank.code)
+      // 银行名称值变化，开户银行分行名称清空
+      this.accountBankInfo.bankBranchName = ''
+      // 银行名称值变化，开户银行分行编码清空
+      this.accountBankInfo.bankBranchCode = ''
+    },
+    /**
+     * @Description: 确认选择开户银行分行的方法
+     * @author:zhangqi
+     * @Date:2021-09-10
+     */
+    getBankBranch(bank) {
+      console.log(bank,'bank')
+      // 获取开户银行分行名称，并赋值给变量
+      this.accountBankInfo.bankBranchName = bank.bankBranchName
+      // 获取开户银行分行编码，并赋值给变量
+      this.accountBankInfo.bankBranchCode = bank.branchCode
     },
-
     /**
      * @Description: 点击输入银行卡号最右侧‘扫描’按钮时，触发扫描银行卡的方法
      * @author:zhangqi