From 5f7c56bac14ed7aebae12477667266852adefc8e Mon Sep 17 00:00:00 2001
From: yangfuda <945208611@qq.com>
Date: Mon, 8 Jan 2024 15:26:55 +0800
Subject: [PATCH] =?UTF-8?q?=E9=93=B6=E5=86=9C=EF=BC=9A=E9=BB=91=E9=BE=99?=
=?UTF-8?q?=E6=B1=9F=E5=86=9C=E5=95=86=E8=A1=8C=E7=9B=B8=E5=85=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../paymentAccount/paymentAccountAdd.vue | 3 +-
.../paymentAccount/paymentAccountModify.vue | 3 +-
.../paymentApproval/approvalAdd.vue | 39 +++++++++++--------
.../paymentApproval/approvalDetail.vue | 7 ++++
.../paymentApproval/approvalModify.vue | 33 +++++++++-------
.../paymentAccount/paymentAccountAdd.vue | 3 +-
.../paymentAccount/paymentAccountModify.vue | 3 +-
.../paymentApproval/approvalAdd.vue | 39 +++++++++++--------
.../paymentApproval/approvalDetail.vue | 2 +-
.../paymentApproval/approvalModify.vue | 33 +++++++++-------
10 files changed, 98 insertions(+), 67 deletions(-)
diff --git a/src/views/sunVillage_info/bankAgriculture/paymentAccount/paymentAccountAdd.vue b/src/views/sunVillage_info/bankAgriculture/paymentAccount/paymentAccountAdd.vue
index 7da1e53a..f252b3b7 100644
--- a/src/views/sunVillage_info/bankAgriculture/paymentAccount/paymentAccountAdd.vue
+++ b/src/views/sunVillage_info/bankAgriculture/paymentAccount/paymentAccountAdd.vue
@@ -104,7 +104,8 @@
@cancel="showTaccountId = false"
/>
-
+
+
diff --git a/src/views/sunVillage_info/bankAgriculture/paymentAccount/paymentAccountModify.vue b/src/views/sunVillage_info/bankAgriculture/paymentAccount/paymentAccountModify.vue
index c71b3828..297ad992 100644
--- a/src/views/sunVillage_info/bankAgriculture/paymentAccount/paymentAccountModify.vue
+++ b/src/views/sunVillage_info/bankAgriculture/paymentAccount/paymentAccountModify.vue
@@ -98,7 +98,8 @@
@cancel="showTaccountId = false"
/>
-
+
+
diff --git a/src/views/sunVillage_info/bankAgriculture/paymentApproval/approvalAdd.vue b/src/views/sunVillage_info/bankAgriculture/paymentApproval/approvalAdd.vue
index 15c725ff..7ad10c7e 100644
--- a/src/views/sunVillage_info/bankAgriculture/paymentApproval/approvalAdd.vue
+++ b/src/views/sunVillage_info/bankAgriculture/paymentApproval/approvalAdd.vue
@@ -257,7 +257,7 @@
@@ -465,6 +465,7 @@
projectFundType:'',
nowDate:"",
isModifyOrder:false, //是已创建订单 false新建订单 true已创建订单
+ isCanBatch:true, //能否批量
};
},
created() {
@@ -643,22 +644,28 @@
this.$notify({ type: 'danger', message: '请选择所属银行！' });
return;
}
- if(this.form.bankType == '2' && this.form.isPeers == 'N' && this.chargeItme.length>0 && this.chargeItme != []){
- this.$notify({ type: 'danger', message: '目前农商行仅支持单笔跨行转账，即仅能有一个收款方！' });
+ // if(this.form.bankType == '2' && this.form.isPeers == 'N' && this.chargeItme.length>0 && this.chargeItme != []){
+ // this.$notify({ type: 'danger', message: '目前农商行仅支持单笔跨行转账，即仅能有一个收款方！' });
+ // }else
+ if(this.form.bankType == '7' && this.chargeItme.length>0 && this.chargeItme != []){
+ this.$notify({ type: 'danger', message: '目前农商行仅支持单笔转账，即仅能有一个收款方！' });
}else{
- this.getDicts("bank_type").then(res => {
- this.chargeItme.splice(index + 1, 0, {
- payeeId: "", //收款方ID
- payee: "", //收款方
- payeeAccount: "", //收款账户
- bankDeposit: "", //开户银行
- incomeAmount: "", //收入金额
- bankType: null, //所属银行
- bankTypeText:"", //所属银行
- showPayee:false,
- showbankType:false
- });
- });}
+ this.getDicts("bank_type").then(res => {
+ this.chargeItme.splice(index + 1, 0, {
+ payeeId: "", //收款方ID
+ payee: "", //收款方
+ payeeAccount: "", //收款账户
+ bankDeposit: "", //开户银行
+ incomeAmount: "", //收入金额
+ bankType: null, //所属银行
+ bankTypeText:"", //所属银行
+ showPayee:false,
+ showbankType:false
+ });
+ });}
+ if(this.form.bankType == '7'){
+ this.isCanBatch = false;
+ }
},
getPayeeList() {
//普通转账
diff --git a/src/views/sunVillage_info/bankAgriculture/paymentApproval/approvalDetail.vue b/src/views/sunVillage_info/bankAgriculture/paymentApproval/approvalDetail.vue
index 2ad1b61b..46e2781b 100644
--- a/src/views/sunVillage_info/bankAgriculture/paymentApproval/approvalDetail.vue
+++ b/src/views/sunVillage_info/bankAgriculture/paymentApproval/approvalDetail.vue
@@ -71,6 +71,8 @@
+
+
查看更多
收起列表
@@ -131,6 +133,7 @@
bankTypeDictionaries:[],
projectList:[],
projectFundTypeOptions:[],
+ transferStatusOptions:[],
projectFundTypeDictionaries:[],
projectList:[],
@@ -175,6 +178,9 @@
}
this.projectFundTypeDictionaries = response.data;
});
+ this.getDicts("transfer_status").then((response) => {
+ this.transferStatusOptions = response.data;
+ });
this.getDictionaries();
this.getFileList();
this.getTemplateList();
@@ -241,6 +247,7 @@
}
for (var j = 0 ; j < response.rows.length ; j++){
response.rows[j].bankTypeText = this.selectDictLabel(res.data, response.rows[j].bankType);
+ response.rows[j].transferStatus = this.selectDictLabel(this.transferStatusOptions, response.rows[j].transferStatus);
}
this.chargeItme = response.rows;
});
diff --git a/src/views/sunVillage_info/bankAgriculture/paymentApproval/approvalModify.vue b/src/views/sunVillage_info/bankAgriculture/paymentApproval/approvalModify.vue
index a5974bcd..ace2e890 100644
--- a/src/views/sunVillage_info/bankAgriculture/paymentApproval/approvalModify.vue
+++ b/src/views/sunVillage_info/bankAgriculture/paymentApproval/approvalModify.vue
@@ -590,22 +590,25 @@
this.$notify({ type: 'danger', message: '请选择所属银行！' });
return;
}
- if(this.form.bankType == '2' && this.form.isPeers == 'N' && this.chargeItme.length>1){
- this.$notify({ type: 'danger', message: '目前农商行仅支持单笔跨行转账，即仅能有一个收款方！' });
+ // if(this.form.bankType == '2' && this.form.isPeers == 'N' && this.chargeItme.length==1){
+ // this.$notify({ type: 'danger', message: '目前农商行仅支持单笔跨行转账，即仅能有一个收款方！' });
+ // }else
+ if(this.form.bankType == '7' && this.chargeItme.length==1){
+ this.$notify({ type: 'danger', message: '目前农商行仅支持单笔转账，即仅能有一个收款方！' });
}else{
- this.getDicts("bank_type_all").then(res => {
- this.chargeItme.splice(index + 1, 0, {
- payeeId: "", //收款方ID
- payee: "", //收款方
- payeeAccount: "", //收款账户
- bankDeposit: "", //开户银行
- incomeAmount: "", //收入金额
- bankType: null, //所属银行
- bankTypeText:"", //所属银行
- showPayee:false,
- showbankType:false
- });
- });}
+ this.getDicts("bank_type_all").then(res => {
+ this.chargeItme.splice(index + 1, 0, {
+ payeeId: "", //收款方ID
+ payee: "", //收款方
+ payeeAccount: "", //收款账户
+ bankDeposit: "", //开户银行
+ incomeAmount: "", //收入金额
+ bankType: null, //所属银行
+ bankTypeText:"", //所属银行
+ showPayee:false,
+ showbankType:false
+ });
+ });}
},
getPayeeList() {
//普通转账
diff --git a/src/views/yinnong/bankAgriculture/paymentAccount/paymentAccountAdd.vue b/src/views/yinnong/bankAgriculture/paymentAccount/paymentAccountAdd.vue
index ae33044c..17715e45 100644
--- a/src/views/yinnong/bankAgriculture/paymentAccount/paymentAccountAdd.vue
+++ b/src/views/yinnong/bankAgriculture/paymentAccount/paymentAccountAdd.vue
@@ -98,7 +98,8 @@
@cancel="showTaccountId = false"
/>
-
+
+
diff --git a/src/views/yinnong/bankAgriculture/paymentAccount/paymentAccountModify.vue b/src/views/yinnong/bankAgriculture/paymentAccount/paymentAccountModify.vue
index c71b3828..297ad992 100644
--- a/src/views/yinnong/bankAgriculture/paymentAccount/paymentAccountModify.vue
+++ b/src/views/yinnong/bankAgriculture/paymentAccount/paymentAccountModify.vue
@@ -98,7 +98,8 @@
@cancel="showTaccountId = false"
/>
-
+
+
diff --git a/src/views/yinnong/bankAgriculture/paymentApproval/approvalAdd.vue b/src/views/yinnong/bankAgriculture/paymentApproval/approvalAdd.vue
index 360e31fd..f1beb1a5 100644
--- a/src/views/yinnong/bankAgriculture/paymentApproval/approvalAdd.vue
+++ b/src/views/yinnong/bankAgriculture/paymentApproval/approvalAdd.vue
@@ -252,7 +252,7 @@
@@ -461,6 +461,7 @@
projectFundType:'',
nowDate:"",
isModifyOrder:false, //是已创建订单 false新建订单 true已创建订单
+ isCanBatch:true, //能否批量
};
},
created() {
@@ -638,22 +639,28 @@
this.$notify({ type: 'danger', message: '请选择所属银行！' });
return;
}
- if(this.form.bankType == '2' && this.form.isPeers == 'N' && this.chargeItme.length>0 && this.chargeItme != []){
- this.$notify({ type: 'danger', message: '目前农商行仅支持单笔跨行转账，即仅能有一个收款方！' });
+ // if(this.form.bankType == '2' && this.form.isPeers == 'N' && this.chargeItme.length>0 && this.chargeItme != []){
+ // this.$notify({ type: 'danger', message: '目前农商行仅支持单笔跨行转账，即仅能有一个收款方！' });
+ // }else
+ if(this.form.bankType == '7' && this.chargeItme.length>0 && this.chargeItme != []){
+ this.$notify({ type: 'danger', message: '目前农商行仅支持单笔转账，即仅能有一个收款方！' });
}else{
- this.getDicts("bank_type").then(res => {
- this.chargeItme.splice(index + 1, 0, {
- payeeId: "", //收款方ID
- payee: "", //收款方
- payeeAccount: "", //收款账户
- bankDeposit: "", //开户银行
- incomeAmount: "", //收入金额
- bankType: null, //所属银行
- bankTypeText:"", //所属银行
- showPayee:false,
- showbankType:false
- });
- });}
+ this.getDicts("bank_type").then(res => {
+ this.chargeItme.splice(index + 1, 0, {
+ payeeId: "", //收款方ID
+ payee: "", //收款方
+ payeeAccount: "", //收款账户
+ bankDeposit: "", //开户银行
+ incomeAmount: "", //收入金额
+ bankType: null, //所属银行
+ bankTypeText:"", //所属银行
+ showPayee:false,
+ showbankType:false
+ });
+ });}
+ if(this.form.bankType == '7'){
+ this.isCanBatch = false;
+ }
},
getPayeeList() {
//普通转账
diff --git a/src/views/yinnong/bankAgriculture/paymentApproval/approvalDetail.vue b/src/views/yinnong/bankAgriculture/paymentApproval/approvalDetail.vue
index fae6f78d..447d0f0a 100644
--- a/src/views/yinnong/bankAgriculture/paymentApproval/approvalDetail.vue
+++ b/src/views/yinnong/bankAgriculture/paymentApproval/approvalDetail.vue
@@ -72,7 +72,7 @@
-
+
查看更多
收起列表
diff --git a/src/views/yinnong/bankAgriculture/paymentApproval/approvalModify.vue b/src/views/yinnong/bankAgriculture/paymentApproval/approvalModify.vue
index 80be76b4..4eb51dca 100644
--- a/src/views/yinnong/bankAgriculture/paymentApproval/approvalModify.vue
+++ b/src/views/yinnong/bankAgriculture/paymentApproval/approvalModify.vue
@@ -589,22 +589,25 @@
this.$notify({ type: 'danger', message: '请选择所属银行！' });
return;
}
- if(this.form.bankType == '2' && this.form.isPeers == 'N' && this.chargeItme.length>1){
- this.$notify({ type: 'danger', message: '目前农商行仅支持单笔跨行转账，即仅能有一个收款方！' });
+ // if(this.form.bankType == '2' && this.form.isPeers == 'N' && this.chargeItme.length==1){
+ // this.$notify({ type: 'danger', message: '目前农商行仅支持单笔跨行转账，即仅能有一个收款方！' });
+ // }else
+ if(this.form.bankType == '7' && this.chargeItme.length==1){
+ this.$notify({ type: 'danger', message: '目前农商行仅支持单笔转账，即仅能有一个收款方！' });
}else{
- this.getDicts("bank_type_all").then(res => {
- this.chargeItme.splice(index + 1, 0, {
- payeeId: "", //收款方ID
- payee: "", //收款方
- payeeAccount: "", //收款账户
- bankDeposit: "", //开户银行
- incomeAmount: "", //收入金额
- bankType: null, //所属银行
- bankTypeText:"", //所属银行
- showPayee:false,
- showbankType:false
- });
- });}
+ this.getDicts("bank_type_all").then(res => {
+ this.chargeItme.splice(index + 1, 0, {
+ payeeId: "", //收款方ID
+ payee: "", //收款方
+ payeeAccount: "", //收款账户
+ bankDeposit: "", //开户银行
+ incomeAmount: "", //收入金额
+ bankType: null, //所属银行
+ bankTypeText:"", //所属银行
+ showPayee:false,
+ showbankType:false
+ });
+ });}
},
getPayeeList() {
//普通转账