From 6fc11efbb404753e77b2b98480e186e8dcb78804 Mon Sep 17 00:00:00 2001
From: yujk <990961482@qq.com>
Date: Fri, 10 Jun 2022 14:07:17 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=85=E5=9F=BA=E5=9C=B0app?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../collectionAccount/collectionAdd.vue       |  8 +-
 .../collectionAccount/collectionModify.vue    | 79 +++++++++++++++++--
 .../paymentAccount/paymentAccountAdd.vue      |  5 +-
 .../paymentAccount/paymentAccountModify.vue   |  3 +-
 4 files changed, 77 insertions(+), 18 deletions(-)

diff --git a/src/views/yinnong/bankAgriculture/collectionAccount/collectionAdd.vue b/src/views/yinnong/bankAgriculture/collectionAccount/collectionAdd.vue
index d6d604c4..7511ecb7 100644
--- a/src/views/yinnong/bankAgriculture/collectionAccount/collectionAdd.vue
+++ b/src/views/yinnong/bankAgriculture/collectionAccount/collectionAdd.vue
@@ -170,7 +170,6 @@
 
       },
       getError(e){
-        console.log(e)
         this.$notify({ type: 'danger', message: e.errors[0].message });
       },
       onConfirmBankType(data){
@@ -180,23 +179,22 @@
         this.form.payeePaymentLines = ""
         this.showBankType = false;
         let queryParams={
-          "pageNum": 1,
-          "pageSize": 20,
           "bankType":this.form.bankType,
           "status": "0",
         }
         listDeposit(queryParams).then(response => {
           this.bankDepositOptions = []
           for(var i = 0 ; i < response.rows.length ; i++){
-            this.bankDepositOptions.push({"text":response.rows[i].bankDeposit,"value":response.rows[i].id,"payeePaymentLines":response.rows[i].payeePaymentLines});
+            this.bankDepositOptions.push({"text":response.rows[i].bankDeposit,"value":response.rows[i].id,
+              "payeePaymentLines":response.rows[i].payeePaymentLines,"institutionNumber":response.rows[i].institutionNumber});
           }
         });
       },
       onConfirmBankDeposit(data){
-        console.log(data)
         this.bankDeposit = data.text
         this.form.bankDeposit = data.value
         this.form.payeePaymentLines = data.payeePaymentLines
+        this.form.alternateField10 = data.institutionNumber
         this.showBankDeposit = false;
       },
       onConfirmPayeeType(data){
diff --git a/src/views/yinnong/bankAgriculture/collectionAccount/collectionModify.vue b/src/views/yinnong/bankAgriculture/collectionAccount/collectionModify.vue
index 66a51fd0..fd882efc 100644
--- a/src/views/yinnong/bankAgriculture/collectionAccount/collectionModify.vue
+++ b/src/views/yinnong/bankAgriculture/collectionAccount/collectionModify.vue
@@ -36,7 +36,28 @@
             @cancel="showBankType = false"
           />
         </van-popup>
-        <van-field label="开户银行" required :rules="[{ required: true , message:'请输入开户银行' }]" v-model="form.bankDeposit" placeholder="请输入开户银行" input-align="right" label-width="auto"/>
+        <van-field
+          readonly
+          clickable
+          label="开户银行"
+          placeholder="请选择"
+          @click="showBankDeposit = true"
+          v-model="bankDeposit"
+          input-align="right"
+          right-icon="arrow-down"
+          label-width="auto"
+          required
+          :rules="[{ required: true , message:'请选择开户银行' }]"
+        />
+        <van-popup v-model="showBankDeposit" position="bottom">
+          <van-picker
+            show-toolbar
+            :columns="bankDepositOptions"
+            @confirm="onConfirmBankDeposit"
+            @cancel="showBankDeposit = false"
+          />
+        </van-popup>
+        <van-field label="联行号" readonly required :rules="[{ required: true , message:'请输入联行号' }]" v-model="form.payeePaymentLines"  input-align="right" label-width="auto"/>
       </div>
 
       <div class="main_box" style="margin-top: 10px;">
@@ -95,21 +116,27 @@
 </template>
 
 <script>
-  import { getPayee , updatePayee } from "@/api/onlineHome/bankAgriculture/collectionAccount";
+  import { getPayee , updatePayee,listDeposit } from "@/api/onlineHome/bankAgriculture/collectionAccount";
   export default {
     name: "collectionModify",
     data() {
       return {
         showBankType:false,
+        showBankDeposit:false,
         showPayeeType:false,
-        form:{},
+        form:{
+          accountType:'1',
+          status:'0'
+        },
 
         bankType:'',
         payeeType:'',
-
+        bankDeposit:'',
         bankTypeOptions:[],
+        statusOptions:[],
+        accountTypeOptions:[],
         payeeTypeOptions:[],
-
+        bankDepositOptions:[],
       };
     },
     created() {
@@ -118,19 +145,35 @@
     methods: {
       getDictionaries(){
         getPayee(this.$route.query.id).then((response) => {
+          let _this = this
+          this.form = response.data;
           this.houseGetDicts("bank_type").then((res) => {
             for(var i = 0 ; i < res.data.length ; i++){
-              this.bankTypeOptions.push({text:res.data[i].dictLabel,value:res.data[i].dictValue});
+              _this.bankTypeOptions.push({text:res.data[i].dictLabel,value:res.data[i].dictValue});
             }
             this.bankType = this.selectDictLabel(res.data, response.data.bankType);
           });
           this.houseGetDicts("payee_type").then((res) => {
             for(var i = 0 ; i < res.data.length ; i++){
-              this.payeeTypeOptions.push({text:res.data[i].dictLabel,value:res.data[i].dictValue});
+              _this.payeeTypeOptions.push({text:res.data[i].dictLabel,value:res.data[i].dictValue});
             }
             this.payeeType = this.selectDictLabel(res.data, response.data.payeeType);
           });
-          this.form = response.data;
+          let queryParams={
+            "bankType":response.data.bankType,
+            "status": "0",
+          }
+          listDeposit(queryParams).then(rr => {
+            this.bankDepositOptions = []
+            for(var i = 0 ; i < rr.rows.length ; i++){
+              if(_this.form.bankDeposit==rr.rows[i].id){
+                _this.bankDeposit = rr.rows[i].bankDeposit
+              }
+                _this.bankDepositOptions.push({"text":rr.rows[i].bankDeposit,"value":rr.rows[i].id,
+                "payeePaymentLines":rr.rows[i].payeePaymentLines,"institutionNumber":rr.rows[i].institutionNumber});
+            }
+          });
+
         });
 
       },
@@ -141,7 +184,27 @@
       onConfirmBankType(data){
         this.bankType = data.text;
         this.form.bankType = data.value;
+        this.bankDeposit = ""
+        this.form.payeePaymentLines = ""
         this.showBankType = false;
+        let queryParams={
+          "bankType":this.form.bankType,
+          "status": "0",
+        }
+        listDeposit(queryParams).then(response => {
+          this.bankDepositOptions = []
+          for(var i = 0 ; i < response.rows.length ; i++){
+            this.bankDepositOptions.push({"text":response.rows[i].bankDeposit,"value":response.rows[i].id,
+              "payeePaymentLines":response.rows[i].payeePaymentLines,"institutionNumber":response.rows[i].institutionNumber});
+          }
+        });
+      },
+      onConfirmBankDeposit(data){
+        this.bankDeposit = data.text
+        this.form.bankDeposit = data.value
+        this.form.payeePaymentLines = data.payeePaymentLines
+        this.form.alternateField10 = data.institutionNumber
+        this.showBankDeposit = false;
       },
       onConfirmPayeeType(data){
         this.payeeType = data.text;
diff --git a/src/views/yinnong/bankAgriculture/paymentAccount/paymentAccountAdd.vue b/src/views/yinnong/bankAgriculture/paymentAccount/paymentAccountAdd.vue
index ad5cd484..2829ba19 100644
--- a/src/views/yinnong/bankAgriculture/paymentAccount/paymentAccountAdd.vue
+++ b/src/views/yinnong/bankAgriculture/paymentAccount/paymentAccountAdd.vue
@@ -119,7 +119,7 @@
           right-icon="arrow-down"
           label-width="auto"
           required
-          :rules="[{ required: true , message:'请选择开户银行' }]"
+          :rules="[{ required: true , message:'请选择中心账套' }]"
           v-if="accountType=='银行存款'&&form.managementControlType=='2'"
         />
         <van-popup v-model="showCentralBookId" position="bottom">
@@ -302,8 +302,6 @@
         bankTypeOptions: [],
         subjectDeatil:'',
         bankDepositQueryParams: {
-          pageNum: 1,
-          pageSize: 10,
           bookId: null,
           deptId: null,
           payee: null,
@@ -404,6 +402,7 @@
         this.showBankDeposit = false
         this.$set(this.form, "bankName", val.bankDeposit);
         this.$set(this.form, "paymentLines", val.payeePaymentLines);
+        this.$set(this.form, "alternateField10", val.institutionNumber);
       },
       onConfirmTaccountId(val){
         this.showTaccountId = false
diff --git a/src/views/yinnong/bankAgriculture/paymentAccount/paymentAccountModify.vue b/src/views/yinnong/bankAgriculture/paymentAccount/paymentAccountModify.vue
index 4de3a362..5a34aa2f 100644
--- a/src/views/yinnong/bankAgriculture/paymentAccount/paymentAccountModify.vue
+++ b/src/views/yinnong/bankAgriculture/paymentAccount/paymentAccountModify.vue
@@ -302,8 +302,6 @@
         bankTypeOptions: [],
         subjectDeatil:'',
         bankDepositQueryParams: {
-          pageNum: 1,
-          pageSize: 10,
           bookId: null,
           deptId: null,
           payee: null,
@@ -460,6 +458,7 @@
         this.showBankDeposit = false
         this.$set(this.form, "bankName", val.bankDeposit);
         this.$set(this.form, "paymentLines", val.payeePaymentLines);
+        this.$set(this.form, "alternateField10", val.institutionNumber);
       },
       onConfirmTaccountId(val){
         this.showTaccountId = false