From 942d9969a3193d5d566d2b7d3dbf50c8e995a257 Mon Sep 17 00:00:00 2001 From: yujk <990961482@qq.com> Date: Wed, 15 Dec 2021 17:40:11 +0800 Subject: [PATCH] =?UTF-8?q?=E9=93=B6=E5=86=9C=20=E6=98=AF=E5=90=A6?= =?UTF-8?q?=E4=B8=8E=E4=BB=98=E6=AC=BE=E6=96=B9=E5=90=8C=E8=A1=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../paymentApproval/approvalAdd.vue | 17 +++++++++++++---- .../paymentApproval/approvalAdd2.vue | 15 ++++++++++++--- .../paymentApproval/approvalAdd3.vue | 16 +++++++++++++--- .../paymentApproval/approvalAdd4.vue | 10 ++++++++++ .../paymentApproval/approvalAdd5.vue | 15 ++++++++++++--- .../paymentApproval/approvalApproval.vue | 1 + .../paymentApproval/approvalDetail.vue | 2 ++ .../paymentApproval/approvalDetail2.vue | 1 + .../paymentApproval/approvalDetail3.vue | 1 + .../paymentApproval/approvalDetail4.vue | 2 ++ .../paymentApproval/approvalDetail5.vue | 1 + .../paymentApproval/approvalModify.vue | 14 +++++++++++--- .../paymentApproval/approvalModify2.vue | 14 +++++++++++--- .../paymentApproval/approvalModify3.vue | 9 +++++++++ .../paymentApproval/approvalModify4.vue | 9 +++++++++ .../paymentApproval/approvalModify5.vue | 14 +++++++++++--- 16 files changed, 119 insertions(+), 22 deletions(-) diff --git a/src/views/onlineHome/bankAgriculture/paymentApproval/approvalAdd.vue b/src/views/onlineHome/bankAgriculture/paymentApproval/approvalAdd.vue index 91179ff5..1cf08657 100644 --- a/src/views/onlineHome/bankAgriculture/paymentApproval/approvalAdd.vue +++ b/src/views/onlineHome/bankAgriculture/paymentApproval/approvalAdd.vue @@ -171,6 +171,14 @@ + + +
@@ -333,7 +341,6 @@ this.payerOptions = response.rows; response.rows.map((res,index) => { res['payerFrom'] = '1' - console.log(res) this.payerOptions[index].text = res.accountName; this.payerOptions[index].value = res.id; }) @@ -351,6 +358,7 @@ cashierId: null, transferType: '1', accountType: '2', + isPeers:'Y', explainSituation: null, succeedAmount: null, payer: null, @@ -502,6 +510,7 @@ this.chargeItme[index].showbankType = false; }, onConfirmPayer(data){ + console.log(data) this.form.payer = data.text; this.form.cashierId = data.value; this.showpayer = false; @@ -802,9 +811,8 @@ //model就是上面的数据源 return account.id === select; //筛选出匹配数据 }); - if(obj.payerFrom==1&&obj.operatorCode != null && obj.operatorCode != "" && - obj.enterpriseCode != null && obj.enterpriseCode != "" && - obj.accountPassword != null && obj.accountPassword != ""){ + if(obj.accountPassword != null && obj.accountPassword != "" && + obj.bankType != null && obj.bankType != ""){ this.$set(this.form, "bookId", obj.bookId); this.$set(this.form, "deptId", obj.deptId); this.$set(this.form, "cashierId", obj.id); @@ -812,6 +820,7 @@ 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/approvalAdd2.vue b/src/views/onlineHome/bankAgriculture/paymentApproval/approvalAdd2.vue index 90a2552a..d0f957ea 100644 --- a/src/views/onlineHome/bankAgriculture/paymentApproval/approvalAdd2.vue +++ b/src/views/onlineHome/bankAgriculture/paymentApproval/approvalAdd2.vue @@ -171,6 +171,14 @@ + + +
@@ -339,6 +347,7 @@ cashierId: null, transferType: '2', accountType: '2', + isPeers:'Y', explainSituation: null, succeedAmount: null, payer: null, @@ -797,9 +806,8 @@ //model就是上面的数据源 return account.id === select; //筛选出匹配数据 }); - if(obj.payerFrom==1&&obj.operatorCode != null && obj.operatorCode != "" && - obj.enterpriseCode != null && obj.enterpriseCode != "" && - obj.accountPassword != null && obj.accountPassword != ""){ + if(obj.accountPassword != null && obj.accountPassword != "" && + obj.bankType != null && obj.bankType != ""){ this.$set(this.form, "bookId", obj.bookId); this.$set(this.form, "deptId", obj.deptId); this.$set(this.form, "cashierId", obj.id); @@ -807,6 +815,7 @@ 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 889b2ce1..a63cf2e9 100644 --- a/src/views/onlineHome/bankAgriculture/paymentApproval/approvalAdd3.vue +++ b/src/views/onlineHome/bankAgriculture/paymentApproval/approvalAdd3.vue @@ -171,6 +171,14 @@ + + +
@@ -345,6 +353,7 @@ cashierId: null, transferType: '3', accountType: '2', + isPeers:'Y', explainSituation: null, succeedAmount: null, payer: null, @@ -511,6 +520,7 @@ 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(); }, @@ -816,9 +826,8 @@ //model就是上面的数据源 return account.id === select; //筛选出匹配数据 }); - if(obj.payerFrom==1&&obj.operatorCode != null && obj.operatorCode != "" && - obj.enterpriseCode != null && obj.enterpriseCode != "" && - obj.accountPassword != null && obj.accountPassword != ""){ + if(obj.accountPassword != null && obj.accountPassword != "" && + obj.bankType != null && obj.bankType != ""){ this.$set(this.form, "bookId", obj.bookId); this.$set(this.form, "deptId", obj.deptId); this.$set(this.form, "cashierId", obj.id); @@ -826,6 +835,7 @@ 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 e3e5f291..100493d6 100644 --- a/src/views/onlineHome/bankAgriculture/paymentApproval/approvalAdd4.vue +++ b/src/views/onlineHome/bankAgriculture/paymentApproval/approvalAdd4.vue @@ -171,6 +171,14 @@ + + +
@@ -346,6 +354,7 @@ cashierId: null, transferType: '4', accountType: '2', + isPeers:'Y', explainSituation: null, succeedAmount: null, payer: null, @@ -809,6 +818,7 @@ this.$set(this.form, "payerAccount", obj.payeeAccount); 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'); }, beforeRead(file) { diff --git a/src/views/onlineHome/bankAgriculture/paymentApproval/approvalAdd5.vue b/src/views/onlineHome/bankAgriculture/paymentApproval/approvalAdd5.vue index 91efce42..6cbe5a83 100644 --- a/src/views/onlineHome/bankAgriculture/paymentApproval/approvalAdd5.vue +++ b/src/views/onlineHome/bankAgriculture/paymentApproval/approvalAdd5.vue @@ -171,6 +171,14 @@ + + +
@@ -347,6 +355,7 @@ cashierId: null, transferType: '5', accountType: '2', + isPeers:'Y', explainSituation: null, succeedAmount: null, payer: null, @@ -818,9 +827,8 @@ //model就是上面的数据源 return account.id === select; //筛选出匹配数据 }); - if(obj.payerFrom==1&&obj.operatorCode != null && obj.operatorCode != "" && - obj.enterpriseCode != null && obj.enterpriseCode != "" && - obj.accountPassword != null && obj.accountPassword != ""){ + if(obj.accountPassword != null && obj.accountPassword != "" && + obj.bankType != null && obj.bankType != ""){ this.$set(this.form, "bookId", obj.bookId); this.$set(this.form, "deptId", obj.deptId); this.$set(this.form, "cashierId", obj.id); @@ -828,6 +836,7 @@ 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/approvalApproval.vue b/src/views/onlineHome/bankAgriculture/paymentApproval/approvalApproval.vue index 7c4fbcb5..ea705d49 100644 --- a/src/views/onlineHome/bankAgriculture/paymentApproval/approvalApproval.vue +++ b/src/views/onlineHome/bankAgriculture/paymentApproval/approvalApproval.vue @@ -46,6 +46,7 @@
+
diff --git a/src/views/onlineHome/bankAgriculture/paymentApproval/approvalDetail.vue b/src/views/onlineHome/bankAgriculture/paymentApproval/approvalDetail.vue index 49a357e5..2b47655c 100644 --- a/src/views/onlineHome/bankAgriculture/paymentApproval/approvalDetail.vue +++ b/src/views/onlineHome/bankAgriculture/paymentApproval/approvalDetail.vue @@ -46,6 +46,8 @@
+ +
diff --git a/src/views/onlineHome/bankAgriculture/paymentApproval/approvalDetail2.vue b/src/views/onlineHome/bankAgriculture/paymentApproval/approvalDetail2.vue index 90d48785..97d83b57 100644 --- a/src/views/onlineHome/bankAgriculture/paymentApproval/approvalDetail2.vue +++ b/src/views/onlineHome/bankAgriculture/paymentApproval/approvalDetail2.vue @@ -46,6 +46,7 @@
+
diff --git a/src/views/onlineHome/bankAgriculture/paymentApproval/approvalDetail3.vue b/src/views/onlineHome/bankAgriculture/paymentApproval/approvalDetail3.vue index 6c2db76a..3dbc05fc 100644 --- a/src/views/onlineHome/bankAgriculture/paymentApproval/approvalDetail3.vue +++ b/src/views/onlineHome/bankAgriculture/paymentApproval/approvalDetail3.vue @@ -46,6 +46,7 @@
+
diff --git a/src/views/onlineHome/bankAgriculture/paymentApproval/approvalDetail4.vue b/src/views/onlineHome/bankAgriculture/paymentApproval/approvalDetail4.vue index 4b3425bc..6412d248 100644 --- a/src/views/onlineHome/bankAgriculture/paymentApproval/approvalDetail4.vue +++ b/src/views/onlineHome/bankAgriculture/paymentApproval/approvalDetail4.vue @@ -46,6 +46,8 @@
+ +
diff --git a/src/views/onlineHome/bankAgriculture/paymentApproval/approvalDetail5.vue b/src/views/onlineHome/bankAgriculture/paymentApproval/approvalDetail5.vue index aa5501ee..0286cb48 100644 --- a/src/views/onlineHome/bankAgriculture/paymentApproval/approvalDetail5.vue +++ b/src/views/onlineHome/bankAgriculture/paymentApproval/approvalDetail5.vue @@ -46,6 +46,7 @@
+
diff --git a/src/views/onlineHome/bankAgriculture/paymentApproval/approvalModify.vue b/src/views/onlineHome/bankAgriculture/paymentApproval/approvalModify.vue index 8d503234..baa679d7 100644 --- a/src/views/onlineHome/bankAgriculture/paymentApproval/approvalModify.vue +++ b/src/views/onlineHome/bankAgriculture/paymentApproval/approvalModify.vue @@ -171,6 +171,14 @@ + + +
@@ -794,9 +802,8 @@ //model就是上面的数据源 return account.id === select; //筛选出匹配数据 }); - if(obj.payerFrom==1&&obj.operatorCode != null && obj.operatorCode != "" && - obj.enterpriseCode != null && obj.enterpriseCode != "" && - obj.accountPassword != null && obj.accountPassword != ""){ + if(obj.accountPassword != null && obj.accountPassword != "" && + obj.bankType != null && obj.bankType != ""){ this.$set(this.form, "bookId", obj.bookId); this.$set(this.form, "deptId", obj.deptId); this.$set(this.form, "cashierId", obj.id); @@ -804,6 +811,7 @@ 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/approvalModify2.vue b/src/views/onlineHome/bankAgriculture/paymentApproval/approvalModify2.vue index bd4d257b..70ac62bf 100644 --- a/src/views/onlineHome/bankAgriculture/paymentApproval/approvalModify2.vue +++ b/src/views/onlineHome/bankAgriculture/paymentApproval/approvalModify2.vue @@ -171,6 +171,14 @@ + + +
@@ -795,9 +803,8 @@ //model就是上面的数据源 return account.id === select; //筛选出匹配数据 }); - if(obj.payerFrom==1&&obj.operatorCode != null && obj.operatorCode != "" && - obj.enterpriseCode != null && obj.enterpriseCode != "" && - obj.accountPassword != null && obj.accountPassword != ""){ + if(obj.accountPassword != null && obj.accountPassword != "" && + obj.bankType != null && obj.bankType != ""){ this.$set(this.form, "bookId", obj.bookId); this.$set(this.form, "deptId", obj.deptId); this.$set(this.form, "cashierId", obj.id); @@ -805,6 +812,7 @@ 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 769a5017..fc1495c6 100644 --- a/src/views/onlineHome/bankAgriculture/paymentApproval/approvalModify3.vue +++ b/src/views/onlineHome/bankAgriculture/paymentApproval/approvalModify3.vue @@ -171,6 +171,14 @@ + + +
@@ -497,6 +505,7 @@ 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(); diff --git a/src/views/onlineHome/bankAgriculture/paymentApproval/approvalModify4.vue b/src/views/onlineHome/bankAgriculture/paymentApproval/approvalModify4.vue index 1d39045f..4b66b560 100644 --- a/src/views/onlineHome/bankAgriculture/paymentApproval/approvalModify4.vue +++ b/src/views/onlineHome/bankAgriculture/paymentApproval/approvalModify4.vue @@ -171,6 +171,14 @@ + + +
@@ -805,6 +813,7 @@ this.$set(this.form, "payerAccount", obj.payeeAccount); 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'); }, beforeRead(file) { diff --git a/src/views/onlineHome/bankAgriculture/paymentApproval/approvalModify5.vue b/src/views/onlineHome/bankAgriculture/paymentApproval/approvalModify5.vue index 330f20ef..1b8d938f 100644 --- a/src/views/onlineHome/bankAgriculture/paymentApproval/approvalModify5.vue +++ b/src/views/onlineHome/bankAgriculture/paymentApproval/approvalModify5.vue @@ -171,6 +171,14 @@ + + +
@@ -797,9 +805,8 @@ //model就是上面的数据源 return account.id === select; //筛选出匹配数据 }); - if(obj.payerFrom==1&&obj.operatorCode != null && obj.operatorCode != "" && - obj.enterpriseCode != null && obj.enterpriseCode != "" && - obj.accountPassword != null && obj.accountPassword != ""){ + if(obj.accountPassword != null && obj.accountPassword != "" && + obj.bankType != null && obj.bankType != ""){ this.$set(this.form, "bookId", obj.bookId); this.$set(this.form, "deptId", obj.deptId); this.$set(this.form, "cashierId", obj.id); @@ -807,6 +814,7 @@ 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){