diff --git a/src/views/sunVillage_info/bankAgriculture/collectionAccount/collectionAdd.vue b/src/views/sunVillage_info/bankAgriculture/collectionAccount/collectionAdd.vue index 558a4b73..dd509237 100644 --- a/src/views/sunVillage_info/bankAgriculture/collectionAccount/collectionAdd.vue +++ b/src/views/sunVillage_info/bankAgriculture/collectionAccount/collectionAdd.vue @@ -59,7 +59,12 @@ required :rules="[{ required: true , message:'请选择开户银行' }]" /> - + + + + { + 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}); + } + }); + }, + bankDepositSearch(data){ + this.bankDepositOptions = []; + let queryParams={ + "bankType":this.form.bankType, + "bankDeposit":this.bankDepositValue, "status": "0", } listDeposit(queryParams).then(response => { diff --git a/src/views/sunVillage_info/bankAgriculture/collectionAccount/collectionModify.vue b/src/views/sunVillage_info/bankAgriculture/collectionAccount/collectionModify.vue index fc296946..e2fb8daf 100644 --- a/src/views/sunVillage_info/bankAgriculture/collectionAccount/collectionModify.vue +++ b/src/views/sunVillage_info/bankAgriculture/collectionAccount/collectionModify.vue @@ -49,7 +49,12 @@ required :rules="[{ required: true , message:'请选择开户银行' }]" /> - + + + + { - this.bankDepositOptions = [] - for(var i = 0 ; i < rr.rows.length ; i++){ - if(_this.form.payeePaymentLines==rr.rows[i].payeePaymentLines){ - _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}); - } - }); _this.form = response.data; + _this.bankDeposit = response.data.bankDeposit; + _this.bankDepositSearch(); }); }, @@ -188,6 +182,22 @@ this.showBankType = false; let queryParams={ "bankType":this.form.bankType, + "bankDeposit":this.bankDepositValue, + "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}); + } + }); + }, + bankDepositSearch(data){ + this.bankDepositOptions = []; + let queryParams={ + "bankType":this.form.bankType, + "bankDeposit":this.bankDepositValue, "status": "0", } listDeposit(queryParams).then(response => { diff --git a/src/views/sunVillage_info/bankAgriculture/paymentApproval/approvalAdd.vue b/src/views/sunVillage_info/bankAgriculture/paymentApproval/approvalAdd.vue index 9255493f..01517f8f 100644 --- a/src/views/sunVillage_info/bankAgriculture/paymentApproval/approvalAdd.vue +++ b/src/views/sunVillage_info/bankAgriculture/paymentApproval/approvalAdd.vue @@ -538,6 +538,9 @@ this.payerOptions[index].text = res.accountName; this.payerOptions[index].value = res.id; }) + if(this.payerOptions != null && this.payerOptions.length>0){ + this.onConfirmPayer(this.payerOptions[0]); + } }); this.getDictionaries(); this.getTemplateList(); @@ -728,7 +731,7 @@ listPayee(this.queryParams).then((response) => { response.rows.map((res,index) => { if(res.payeeType==1||res.payeeType==2){ - res.text = res.payee; + res.text = (res.payee +":"+ res.payeeAccount); res.value = res.id; this.payeeList.push(res) } @@ -945,7 +948,7 @@ listPayee(this.queryParams).then((response) => { response.rows.map((res,index) => { if(res.payeeType==1||res.payeeType==2){ - response.rows[index].text = res.payee; + response.rows[index].text = (res.payee +":"+ res.payeeAccount); response.rows[index].value = res.id; this.payeeList.push(res) } @@ -962,7 +965,7 @@ listPayee(this.queryParams).then((response) => { response.rows.map((res,index) => { if(res.payeeType==1||res.payeeType==2){ - response.rows[index].text = res.payee; + response.rows[index].text = (res.payee +":"+ res.payeeAccount); response.rows[index].value = res.id; this.payeeList.push(res) } @@ -1301,7 +1304,7 @@ listPayee(this.queryParams).then((response) => { response.rows.map((res,index) => { if(res.payeeType==1||res.payeeType==2){ - response.rows[index].text = res.payee; + response.rows[index].text = (res.payee +":"+ res.payeeAccount); response.rows[index].value = res.id; this.payeeList.push(res) } @@ -1353,7 +1356,7 @@ listPayee(this.queryParams).then((response) => { response.rows.map((res,index) => { if(res.payeeType==1||res.payeeType==2){ - response.rows[index].text = res.payee; + response.rows[index].text = (res.payee +":"+ res.payeeAccount); response.rows[index].value = res.id; this.payeeList.push(res) } diff --git a/src/views/sunVillage_info/bankAgriculture/paymentApproval/approvalModify.vue b/src/views/sunVillage_info/bankAgriculture/paymentApproval/approvalModify.vue index d2bb0704..1c266e7c 100644 --- a/src/views/sunVillage_info/bankAgriculture/paymentApproval/approvalModify.vue +++ b/src/views/sunVillage_info/bankAgriculture/paymentApproval/approvalModify.vue @@ -536,7 +536,7 @@ listPayee(this.queryParams).then((response) => { response.rows.map((res,index) => { if(res.payeeType==1||res.payeeType==2){ - response.rows[index].text = res.payee; + response.rows[index].text = (res.payee +":"+ res.payeeAccount); response.rows[index].value = res.id; this.payeeList.push(res) } @@ -691,7 +691,7 @@ listPayee(this.queryParams).then((response) => { response.rows.map((res,index) => { if(res.payeeType==1||res.payeeType==2){ - res.text = res.payee; + res.text = (res.payee +":"+ res.payeeAccount); res.value = res.id; this.payeeList.push(res) } @@ -792,7 +792,7 @@ listPayee(this.queryParams).then((response) => { response.rows.map((res,index) => { if(res.payeeType==1||res.payeeType==2){ - response.rows[index].text = res.payee; + response.rows[index].text = (res.payee +":"+ res.payeeAccount); response.rows[index].value = res.id; this.payeeList.push(res) } @@ -809,7 +809,7 @@ listPayee(this.queryParams).then((response) => { response.rows.map((res,index) => { if(res.payeeType==1||res.payeeType==2){ - response.rows[index].text = res.payee; + response.rows[index].text = (res.payee +":"+ res.payeeAccount); response.rows[index].value = res.id; this.payeeList.push(res) } diff --git a/src/views/sunVillage_info/bankAgriculture/paymentApproval/collectionAdd.vue b/src/views/sunVillage_info/bankAgriculture/paymentApproval/collectionAdd.vue index 0b2b5ecf..352d7620 100644 --- a/src/views/sunVillage_info/bankAgriculture/paymentApproval/collectionAdd.vue +++ b/src/views/sunVillage_info/bankAgriculture/paymentApproval/collectionAdd.vue @@ -56,7 +56,12 @@ required :rules="[{ required: true , message:'请选择开户银行' }]" /> - + + + + { + 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}); + } + }); + }, + bankDepositSearch(data){ + this.bankDepositOptions = []; + let queryParams={ + "bankType":this.form.bankType, + "bankDeposit":this.bankDepositValue, "status": "0", } listDeposit(queryParams).then(response => { diff --git a/src/views/sunVillage_info/bankAgriculture/paymentApproval/collectionAdd2.vue b/src/views/sunVillage_info/bankAgriculture/paymentApproval/collectionAdd2.vue index 06a3b6be..eb7caa76 100644 --- a/src/views/sunVillage_info/bankAgriculture/paymentApproval/collectionAdd2.vue +++ b/src/views/sunVillage_info/bankAgriculture/paymentApproval/collectionAdd2.vue @@ -56,7 +56,12 @@ required :rules="[{ required: true , message:'请选择开户银行' }]" /> - + + + + { + 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}); + } + }); + }, + bankDepositSearch(data){ + this.bankDepositOptions = []; + let queryParams={ + "bankType":this.form.bankType, + "bankDeposit":this.bankDepositValue, "status": "0", } listDeposit(queryParams).then(response => { diff --git a/src/views/sunVillage_info/bankAgriculture/paymentApproval/collectionApprovalAdd.vue b/src/views/sunVillage_info/bankAgriculture/paymentApproval/collectionApprovalAdd.vue index b43f96ce..7c1d1d7f 100644 --- a/src/views/sunVillage_info/bankAgriculture/paymentApproval/collectionApprovalAdd.vue +++ b/src/views/sunVillage_info/bankAgriculture/paymentApproval/collectionApprovalAdd.vue @@ -50,7 +50,12 @@ required :rules="[{ required: true , message:'请选择开户银行' }]" /> - + + + + { + 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}); + } + }); + }, + bankDepositSearch(data){ + this.bankDepositOptions = []; + let queryParams={ + "bankType":this.form.bankType, + "bankDeposit":this.bankDepositValue, "status": "0", } listDeposit(queryParams).then(response => { diff --git a/src/views/yinnong/bankAgriculture/collectionAccount/collectionAdd.vue b/src/views/yinnong/bankAgriculture/collectionAccount/collectionAdd.vue index 21dcdf7d..cb888359 100644 --- a/src/views/yinnong/bankAgriculture/collectionAccount/collectionAdd.vue +++ b/src/views/yinnong/bankAgriculture/collectionAccount/collectionAdd.vue @@ -41,27 +41,25 @@ @cancel="showBankType = false" /> -
- - - - - -
- -
-
- + + + + + { + 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}); + } + }); + }, + bankDepositSearch(data){ + this.bankDepositOptions = []; + let queryParams={ + "bankType":this.form.bankType, + "bankDeposit":this.bankDepositValue, "status": "0", } listDeposit(queryParams).then(response => { diff --git a/src/views/yinnong/bankAgriculture/collectionAccount/collectionModify.vue b/src/views/yinnong/bankAgriculture/collectionAccount/collectionModify.vue index 34c0a14f..f5553168 100644 --- a/src/views/yinnong/bankAgriculture/collectionAccount/collectionModify.vue +++ b/src/views/yinnong/bankAgriculture/collectionAccount/collectionModify.vue @@ -36,27 +36,25 @@ @cancel="showBankType = false" /> -
- - - - - -
- -
-
- + + + + + { - // this.bankDepositOptions = [] - // for(var i = 0 ; i < rr.rows.length ; i++){ - // if(_this.form.payeePaymentLines==rr.rows[i].payeePaymentLines){ - // _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}); - // } - // }); _this.form = response.data; _this.bankDeposit = response.data.bankDeposit; + _this.bankDepositSearch(); }); }, @@ -197,6 +183,22 @@ this.showBankType = false; let queryParams={ "bankType":this.form.bankType, + "bankDeposit":this.bankDepositValue, + "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}); + } + }); + }, + bankDepositSearch(data){ + this.bankDepositOptions = []; + let queryParams={ + "bankType":this.form.bankType, + "bankDeposit":this.bankDepositValue, "status": "0", } listDeposit(queryParams).then(response => { diff --git a/src/views/yinnong/bankAgriculture/paymentApproval/approvalAdd.vue b/src/views/yinnong/bankAgriculture/paymentApproval/approvalAdd.vue index fb563553..7a4c6e09 100644 --- a/src/views/yinnong/bankAgriculture/paymentApproval/approvalAdd.vue +++ b/src/views/yinnong/bankAgriculture/paymentApproval/approvalAdd.vue @@ -248,6 +248,7 @@ /> +
@@ -536,6 +537,9 @@ this.payerOptions[index].text = res.accountName; this.payerOptions[index].value = res.id; }) + if(this.payerOptions != null && this.payerOptions.length>0){ + this.onConfirmPayer(this.payerOptions[0]); + } }); this.getDictionaries(); this.getTemplateList(); @@ -550,7 +554,7 @@ listPayee(this.queryParams).then((response) => { response.rows.map((res,index) => { if(res.payeeType==1||res.payeeType==2){ - response.rows[index].text = res.payee; + response.rows[index].text = (res.payee +":"+ res.payeeAccount); response.rows[index].value = res.id; this.payeeList.push(res) } @@ -853,7 +857,7 @@ listPayee(this.queryParams).then((response) => { response.rows.map((res,index) => { if(res.payeeType==1||res.payeeType==2){ - res.text = res.payee; + res.text = (res.payee +":"+ res.payeeAccount); res.value = res.id; this.payeeList.push(res) } @@ -954,7 +958,7 @@ listPayee(this.queryParams).then((response) => { response.rows.map((res,index) => { if(res.payeeType==1||res.payeeType==2){ - response.rows[index].text = res.payee; + response.rows[index].text = (res.payee +":"+ res.payeeAccount); response.rows[index].value = res.id; this.payeeList.push(res) } @@ -971,7 +975,7 @@ listPayee(this.queryParams).then((response) => { response.rows.map((res,index) => { if(res.payeeType==1||res.payeeType==2){ - response.rows[index].text = res.payee; + response.rows[index].text = (res.payee +":"+ res.payeeAccount); response.rows[index].value = res.id; this.payeeList.push(res) } @@ -1264,6 +1268,7 @@ this.$set(this.form, "cashierId", obj.id); this.$set(this.form, "payer", obj.accountName); this.$set(this.form, "payerAccount", obj.bankAccountNumber); + this.$set(this.form, "balance", obj.balance); this.$set(this.form, "operatorCode", obj.operatorCode); this.$set(this.form, "enterpriseCode", obj.enterpriseCode); this.$set(this.form, "bankType", obj.bankType); @@ -1291,7 +1296,7 @@ listPayee(this.queryParams).then((response) => { response.rows.map((res,index) => { if(res.payeeType==1||res.payeeType==2){ - response.rows[index].text = res.payee; + response.rows[index].text = (res.payee +":"+ res.payeeAccount); response.rows[index].value = res.id; this.payeeList.push(res) } diff --git a/src/views/yinnong/bankAgriculture/paymentApproval/approvalModify.vue b/src/views/yinnong/bankAgriculture/paymentApproval/approvalModify.vue index b2b6a1fa..de7b5a20 100644 --- a/src/views/yinnong/bankAgriculture/paymentApproval/approvalModify.vue +++ b/src/views/yinnong/bankAgriculture/paymentApproval/approvalModify.vue @@ -573,7 +573,7 @@ listPayee(this.queryParams).then((response) => { response.rows.map((res,index) => { if(res.payeeType==1||res.payeeType==2){ - response.rows[index].text = res.payee; + response.rows[index].text = (res.payee +":"+ res.payeeAccount); response.rows[index].value = res.id; this.payeeList.push(res) } @@ -725,7 +725,7 @@ listPayee(this.queryParams).then((response) => { response.rows.map((res, index) => { if (res.payeeType == 1 || res.payeeType == 2) { - res.text = res.payee; + res.text = (res.payee +":"+ res.payeeAccount); res.value = res.id; this.payeeList.push(res) } @@ -946,7 +946,7 @@ listPayee(this.queryParams).then((response) => { response.rows.map((res, index) => { if (res.payeeType == 1 || res.payeeType == 2) { - response.rows[index].text = res.payee; + response.rows[index].text = (res.payee +":"+ res.payeeAccount); response.rows[index].value = res.id; this.payeeList.push(res) } @@ -963,7 +963,7 @@ listPayee(this.queryParams).then((response) => { response.rows.map((res, index) => { if (res.payeeType == 1 || res.payeeType == 2) { - response.rows[index].text = res.payee; + response.rows[index].text = (res.payee +":"+ res.payeeAccount); response.rows[index].value = res.id; this.payeeList.push(res) } diff --git a/src/views/yinnong/bankAgriculture/paymentApproval/collectionAdd.vue b/src/views/yinnong/bankAgriculture/paymentApproval/collectionAdd.vue index a3a7115c..cb5fced7 100644 --- a/src/views/yinnong/bankAgriculture/paymentApproval/collectionAdd.vue +++ b/src/views/yinnong/bankAgriculture/paymentApproval/collectionAdd.vue @@ -37,27 +37,25 @@ @cancel="showBankType = false" /> -
- - - - - -
- -
-
- + + + + + { + 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}); + } + }); + }, + bankDepositSearch(data){ + this.bankDepositOptions = []; + let queryParams={ + "bankType":this.form.bankType, + "bankDeposit":this.bankDepositValue, "status": "0", } listDeposit(queryParams).then(response => { diff --git a/src/views/yinnong/bankAgriculture/paymentApproval/collectionAdd2.vue b/src/views/yinnong/bankAgriculture/paymentApproval/collectionAdd2.vue index 2b431ca4..51932ee8 100644 --- a/src/views/yinnong/bankAgriculture/paymentApproval/collectionAdd2.vue +++ b/src/views/yinnong/bankAgriculture/paymentApproval/collectionAdd2.vue @@ -37,27 +37,25 @@ @cancel="showBankType = false" /> -
- - - - - -
- -
-
- + + + + + { + 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}); + } + }); + }, + bankDepositSearch(data){ + this.bankDepositOptions = []; + let queryParams={ + "bankType":this.form.bankType, + "bankDeposit":this.bankDepositValue, "status": "0", } listDeposit(queryParams).then(response => { diff --git a/src/views/yinnong/bankAgriculture/paymentApproval/collectionApprovalAdd.vue b/src/views/yinnong/bankAgriculture/paymentApproval/collectionApprovalAdd.vue index b43f96ce..7c1d1d7f 100644 --- a/src/views/yinnong/bankAgriculture/paymentApproval/collectionApprovalAdd.vue +++ b/src/views/yinnong/bankAgriculture/paymentApproval/collectionApprovalAdd.vue @@ -50,7 +50,12 @@ required :rules="[{ required: true , message:'请选择开户银行' }]" /> - + + + + { + 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}); + } + }); + }, + bankDepositSearch(data){ + this.bankDepositOptions = []; + let queryParams={ + "bankType":this.form.bankType, + "bankDeposit":this.bankDepositValue, "status": "0", } listDeposit(queryParams).then(response => {