From ac00b1e387e789343673961c24b93bfea8a7d240 Mon Sep 17 00:00:00 2001 From: yujk <990961482@qq.com> Date: Fri, 17 Dec 2021 15:29:25 +0800 Subject: [PATCH] =?UTF-8?q?=E9=93=B6=E5=86=9C=20=E5=B8=B8=E7=94=A8?= =?UTF-8?q?=EF=BC=8C=E8=99=9A=E6=8B=9F=E8=BD=AC=E8=B4=A6=EF=BC=9A=E6=94=B6?= =?UTF-8?q?=E6=AC=BE=E6=96=B9=E7=B1=BB=E5=9E=8B=EF=BC=8C=E6=98=AF=E5=90=A6?= =?UTF-8?q?=E5=90=8C=E8=A1=8C=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../paymentApproval/approvalAdd.vue | 62 ++++++++++++++----- .../paymentApproval/approvalAdd2.vue | 22 ++----- .../paymentApproval/approvalAdd3.vue | 23 ++----- .../paymentApproval/approvalAdd4.vue | 45 +++++++++++--- .../paymentApproval/approvalAdd5.vue | 22 ++----- .../paymentApproval/approvalDetail.vue | 2 +- .../paymentApproval/approvalDetail2.vue | 1 - .../paymentApproval/approvalDetail3.vue | 1 - .../paymentApproval/approvalDetail4.vue | 2 +- .../paymentApproval/approvalDetail5.vue | 1 - .../paymentApproval/approvalModify.vue | 39 ++++++++++-- .../paymentApproval/approvalModify2.vue | 17 +---- .../paymentApproval/approvalModify3.vue | 12 ---- .../paymentApproval/approvalModify4.vue | 45 +++++++++++--- .../paymentApproval/approvalModify5.vue | 1 - 15 files changed, 175 insertions(+), 120 deletions(-) diff --git a/src/views/onlineHome/bankAgriculture/paymentApproval/approvalAdd.vue b/src/views/onlineHome/bankAgriculture/paymentApproval/approvalAdd.vue index a0ae3bc1..db8fa68a 100644 --- a/src/views/onlineHome/bankAgriculture/paymentApproval/approvalAdd.vue +++ b/src/views/onlineHome/bankAgriculture/paymentApproval/approvalAdd.vue @@ -163,17 +163,17 @@

收款方信息

- + - + - - -
@@ -226,11 +218,11 @@
- + - + 保存并提交 @@ -347,7 +339,6 @@ cashierId: null, transferType: '2', accountType: '2', - isPeers:'Y', explainSituation: null, succeedAmount: null, payer: null, @@ -782,7 +773,6 @@ this.$set(this.chargeItme[i], "payeeAccount", obj.payeeAccount); this.$set(this.chargeItme[i], "bankDeposit", obj.bankDeposit); this.$set(this.chargeItme[i], "accountType", obj.accountType); - this.$set(this.chargeItme[i], "payeePaymentLines", obj.payeePaymentLines); }else if(fuzhitype == 1){ this.$set(this.chargeItme[i], "payee",'') this.$set(this.chargeItme[i], "bankType",'') @@ -790,7 +780,6 @@ this.$set(this.chargeItme[i], "payeeAccount", ''); this.$set(this.chargeItme[i], "bankDeposit", ''); this.$set(this.chargeItme[i], "accountType", ''); - this.$set(this.chargeItme[i], "payeePaymentLines", ''); this.$notify({ type: 'danger', message: '请选择账户类型相同的收款方!' }); }else if(fuzhitype == 2){ this.$set(this.chargeItme[i], "payee",'') @@ -799,7 +788,6 @@ this.$set(this.chargeItme[i], "payeeAccount", ''); this.$set(this.chargeItme[i], "bankDeposit", ''); this.$set(this.chargeItme[i], "accountType", ''); - this.$set(this.chargeItme[i], "payeePaymentLines", ''); this.$notify({ type: 'danger', message: '收款方已存在!' }); } }, @@ -809,8 +797,9 @@ //model就是上面的数据源 return account.id === select; //筛选出匹配数据 }); - if(obj.accountPassword != null && obj.accountPassword != "" && - obj.bankType != null && obj.bankType != ""){ + if(obj.payerFrom==1&&obj.operatorCode != null && obj.operatorCode != "" && + obj.enterpriseCode != null && obj.enterpriseCode != "" && + obj.accountPassword != null && obj.accountPassword != ""){ this.$set(this.form, "bookId", obj.bookId); this.$set(this.form, "deptId", obj.deptId); this.$set(this.form, "cashierId", obj.id); @@ -818,7 +807,6 @@ this.$set(this.form, "payerAccount", obj.bankAccountNumber); this.$set(this.form, "operatorCode", obj.operatorCode); this.$set(this.form, "enterpriseCode", obj.enterpriseCode); - this.$set(this.form, "bankType", obj.bankType); this.$set(this.form, "payerFrom", '1'); }else{ if(obj.payerFrom==1){ diff --git a/src/views/onlineHome/bankAgriculture/paymentApproval/approvalAdd3.vue b/src/views/onlineHome/bankAgriculture/paymentApproval/approvalAdd3.vue index e235bd47..9ccff9fb 100644 --- a/src/views/onlineHome/bankAgriculture/paymentApproval/approvalAdd3.vue +++ b/src/views/onlineHome/bankAgriculture/paymentApproval/approvalAdd3.vue @@ -171,14 +171,6 @@ - - -
@@ -225,11 +217,11 @@
- + - + 保存并提交 @@ -353,7 +345,6 @@ cashierId: null, transferType: '3', accountType: '2', - isPeers:'Y', explainSituation: null, succeedAmount: null, payer: null, @@ -520,7 +511,6 @@ this.form.payer = data.text; this.form.cashierId = data.value; this.form.payerAccount = data.payeeAccount; - this.form.bankType = data.bankType; this.showpayer = false; this.accountTypeChange(); }, @@ -802,7 +792,6 @@ this.$set(this.chargeItme[i], "payeeAccount", obj.payeeAccount); this.$set(this.chargeItme[i], "bankDeposit", obj.bankDeposit); this.$set(this.chargeItme[i], "accountType", obj.accountType); - this.$set(this.chargeItme[i], "payeePaymentLines", obj.payeePaymentLines); }else if(fuzhitype == 1){ this.$set(this.chargeItme[i], "payee",'') this.$set(this.chargeItme[i], "bankType",'') @@ -810,7 +799,6 @@ this.$set(this.chargeItme[i], "payeeAccount", ''); this.$set(this.chargeItme[i], "bankDeposit", ''); this.$set(this.chargeItme[i], "accountType", ''); - this.$set(this.chargeItme[i], "payeePaymentLines", ''); this.$notify({ type: 'danger', message: '请选择账户类型相同的收款方!' }); }else if(fuzhitype == 2){ this.$set(this.chargeItme[i], "payee",'') @@ -819,7 +807,6 @@ this.$set(this.chargeItme[i], "payeeAccount", ''); this.$set(this.chargeItme[i], "bankDeposit", ''); this.$set(this.chargeItme[i], "accountType", ''); - this.$set(this.chargeItme[i], "payeePaymentLines", ''); this.$notify({ type: 'danger', message: '收款方已存在!' }); } }, @@ -829,8 +816,9 @@ //model就是上面的数据源 return account.id === select; //筛选出匹配数据 }); - if(obj.accountPassword != null && obj.accountPassword != "" && - obj.bankType != null && obj.bankType != ""){ + if(obj.payerFrom==1&&obj.operatorCode != null && obj.operatorCode != "" && + obj.enterpriseCode != null && obj.enterpriseCode != "" && + obj.accountPassword != null && obj.accountPassword != ""){ this.$set(this.form, "bookId", obj.bookId); this.$set(this.form, "deptId", obj.deptId); this.$set(this.form, "cashierId", obj.id); @@ -838,7 +826,6 @@ this.$set(this.form, "payerAccount", obj.bankAccountNumber); this.$set(this.form, "operatorCode", obj.operatorCode); this.$set(this.form, "enterpriseCode", obj.enterpriseCode); - this.$set(this.form, "bankType", obj.bankType); this.$set(this.form, "payerFrom", '1'); }else{ if(obj.payerFrom==1){ diff --git a/src/views/onlineHome/bankAgriculture/paymentApproval/approvalAdd4.vue b/src/views/onlineHome/bankAgriculture/paymentApproval/approvalAdd4.vue index d1483dd7..9cd6c607 100644 --- a/src/views/onlineHome/bankAgriculture/paymentApproval/approvalAdd4.vue +++ b/src/views/onlineHome/bankAgriculture/paymentApproval/approvalAdd4.vue @@ -163,7 +163,7 @@

收款方信息

- + - - -
@@ -779,7 +771,6 @@ this.$set(this.chargeItme[i], "payeeAccount", obj.payeeAccount); this.$set(this.chargeItme[i], "bankDeposit", obj.bankDeposit); this.$set(this.chargeItme[i], "accountType", obj.accountType); - this.$set(this.chargeItme[i], "payeePaymentLines", obj.payeePaymentLines); }else if(fuzhitype == 1){ this.$set(this.chargeItme[i], "payee",'') this.$set(this.chargeItme[i], "bankType",'') @@ -787,7 +778,6 @@ this.$set(this.chargeItme[i], "payeeAccount", ''); this.$set(this.chargeItme[i], "bankDeposit", ''); this.$set(this.chargeItme[i], "accountType", ''); - this.$set(this.chargeItme[i], "payeePaymentLines", ''); this.$notify({ type: 'danger', message: '请选择账户类型相同的收款方!' }); }else if(fuzhitype == 2){ this.$set(this.chargeItme[i], "payee",'') @@ -796,7 +786,6 @@ this.$set(this.chargeItme[i], "payeeAccount", ''); this.$set(this.chargeItme[i], "bankDeposit", ''); this.$set(this.chargeItme[i], "accountType", ''); - this.$set(this.chargeItme[i], "payeePaymentLines", ''); this.$notify({ type: 'danger', message: '收款方已存在!' }); } }, @@ -806,8 +795,9 @@ //model就是上面的数据源 return account.id === select; //筛选出匹配数据 }); - if(obj.accountPassword != null && obj.accountPassword != "" && - obj.bankType != null && obj.bankType != ""){ + if(obj.payerFrom==1&&obj.operatorCode != null && obj.operatorCode != "" && + obj.enterpriseCode != null && obj.enterpriseCode != "" && + obj.accountPassword != null && obj.accountPassword != ""){ this.$set(this.form, "bookId", obj.bookId); this.$set(this.form, "deptId", obj.deptId); this.$set(this.form, "cashierId", obj.id); @@ -815,7 +805,6 @@ this.$set(this.form, "payerAccount", obj.bankAccountNumber); this.$set(this.form, "operatorCode", obj.operatorCode); this.$set(this.form, "enterpriseCode", obj.enterpriseCode); - this.$set(this.form, "bankType", obj.bankType); this.$set(this.form, "payerFrom", '1'); }else{ if(obj.payerFrom==1){ diff --git a/src/views/onlineHome/bankAgriculture/paymentApproval/approvalModify3.vue b/src/views/onlineHome/bankAgriculture/paymentApproval/approvalModify3.vue index 86fb7d00..769a5017 100644 --- a/src/views/onlineHome/bankAgriculture/paymentApproval/approvalModify3.vue +++ b/src/views/onlineHome/bankAgriculture/paymentApproval/approvalModify3.vue @@ -171,14 +171,6 @@ - - -
@@ -505,7 +497,6 @@ this.form.payer = data.text; this.form.cashierId = data.value; this.form.payerAccount = data.payeeAccount - this.form.bankType = data.bankType; this.showpayer = false; //this.selectChange(data.value); this.accountTypeChange(); @@ -787,7 +778,6 @@ this.$set(this.chargeItme[i], "payeeAccount", obj.payeeAccount); this.$set(this.chargeItme[i], "bankDeposit", obj.bankDeposit); this.$set(this.chargeItme[i], "accountType", obj.accountType); - this.$set(this.chargeItme[i], "payeePaymentLines", obj.payeePaymentLines); }else if(fuzhitype == 1){ this.$set(this.chargeItme[i], "payee",'') this.$set(this.chargeItme[i], "bankType",'') @@ -795,7 +785,6 @@ this.$set(this.chargeItme[i], "payeeAccount", ''); this.$set(this.chargeItme[i], "bankDeposit", ''); this.$set(this.chargeItme[i], "accountType", ''); - this.$set(this.chargeItme[i], "payeePaymentLines", ''); this.$notify({ type: 'danger', message: '请选择账户类型相同的收款方!' }); }else if(fuzhitype == 2){ this.$set(this.chargeItme[i], "payee",'') @@ -804,7 +793,6 @@ this.$set(this.chargeItme[i], "payeeAccount", ''); this.$set(this.chargeItme[i], "bankDeposit", ''); this.$set(this.chargeItme[i], "accountType", ''); - this.$set(this.chargeItme[i], "payeePaymentLines", ''); this.$notify({ type: 'danger', message: '收款方已存在!' }); } }, diff --git a/src/views/onlineHome/bankAgriculture/paymentApproval/approvalModify4.vue b/src/views/onlineHome/bankAgriculture/paymentApproval/approvalModify4.vue index 36a84700..55673ed2 100644 --- a/src/views/onlineHome/bankAgriculture/paymentApproval/approvalModify4.vue +++ b/src/views/onlineHome/bankAgriculture/paymentApproval/approvalModify4.vue @@ -163,7 +163,7 @@

收款方信息

- +