diff --git a/src/views/onlineHome/bankAgriculture/paymentApproval/approvalDetail3.vue b/src/views/onlineHome/bankAgriculture/paymentApproval/approvalDetail3.vue
index 3dbc05fc..6c2db76a 100644
--- a/src/views/onlineHome/bankAgriculture/paymentApproval/approvalDetail3.vue
+++ b/src/views/onlineHome/bankAgriculture/paymentApproval/approvalDetail3.vue
@@ -46,7 +46,6 @@
diff --git a/src/views/onlineHome/bankAgriculture/paymentApproval/approvalDetail4.vue b/src/views/onlineHome/bankAgriculture/paymentApproval/approvalDetail4.vue
index 6412d248..338f9f5a 100644
--- a/src/views/onlineHome/bankAgriculture/paymentApproval/approvalDetail4.vue
+++ b/src/views/onlineHome/bankAgriculture/paymentApproval/approvalDetail4.vue
@@ -45,7 +45,7 @@
列表信息
-
+
diff --git a/src/views/onlineHome/bankAgriculture/paymentApproval/approvalDetail5.vue b/src/views/onlineHome/bankAgriculture/paymentApproval/approvalDetail5.vue
index 0286cb48..aa5501ee 100644
--- a/src/views/onlineHome/bankAgriculture/paymentApproval/approvalDetail5.vue
+++ b/src/views/onlineHome/bankAgriculture/paymentApproval/approvalDetail5.vue
@@ -46,7 +46,6 @@
-
diff --git a/src/views/onlineHome/bankAgriculture/paymentApproval/approvalModify.vue b/src/views/onlineHome/bankAgriculture/paymentApproval/approvalModify.vue
index e673c406..ba1a8443 100644
--- a/src/views/onlineHome/bankAgriculture/paymentApproval/approvalModify.vue
+++ b/src/views/onlineHome/bankAgriculture/paymentApproval/approvalModify.vue
@@ -212,9 +212,7 @@
label="所属银行"
placeholder="请选择"
v-model="item.bankTypeText"
- @click="item.showbankType = true"
input-align="right"
- right-icon="arrow-down"
required
:rules="[{ required: true , message:'请选择所属银行' }]"
/>
@@ -427,8 +425,8 @@
payeeAccount: "", //收款账户
bankDeposit: "", //开户银行
incomeAmount: "", //收入金额
- bankType: "1", //所属银行
- bankTypeText:this.selectDictLabel(res.data, 1), //所属银行
+ bankType: null, //所属银行
+ bankTypeText:"", //所属银行
showPayee:false,
showbankType:false
});
@@ -516,6 +514,21 @@
this.payeeList = [];
this.chargeItme = [];
this.queryParams.accountType = this.form.accountType
+ this.queryParams.bankType = this.form.bankType
+ this.queryParams.status = "0"
+ listPayee(this.queryParams).then((response) => {
+ this.payeeList = response.rows;
+ response.rows.map((res,index) => {
+ this.payeeList[index].text = res.payee;
+ this.payeeList[index].value = res.id;
+ })
+ });
+ },
+ accountTypeChange1(e){
+ this.payeeList = [];
+ this.chargeItme = [];
+ this.queryParams.isPeers = this.form.isPeers
+ this.queryParams.bankType = this.form.bankType
this.queryParams.status = "0"
listPayee(this.queryParams).then((response) => {
this.payeeList = response.rows;
@@ -755,6 +768,7 @@
payeeSelectChange(select, i) {
let obj = {};
let fuzhitype = 0;
+ let _this = this
obj = this.payeeList.find((account) => {
//model就是上面的数据源
return account.id === select ; //筛选出匹配数据
@@ -779,6 +793,11 @@
this.$set(this.chargeItme[i], "bankDeposit", obj.bankDeposit);
this.$set(this.chargeItme[i], "accountType", obj.accountType);
this.$set(this.chargeItme[i], "payeePaymentLines", obj.payeePaymentLines);
+ _this.bankTypeDictionaries.map(rr => {
+ if(rr.value==obj.bankType){
+ this.$set(this.chargeItme[i], "bankTypeText", rr.text);
+ }
+ })
}else if(fuzhitype == 1){
this.$set(this.chargeItme[i], "payee",'')
this.$set(this.chargeItme[i], "bankType",'')
@@ -787,6 +806,7 @@
this.$set(this.chargeItme[i], "bankDeposit", '');
this.$set(this.chargeItme[i], "accountType", '');
this.$set(this.chargeItme[i], "payeePaymentLines", '');
+ this.$set(this.chargeItme[i], "bankTypeText", '');
this.$notify({ type: 'danger', message: '请选择账户类型相同的收款方!' });
}else if(fuzhitype == 2){
this.$set(this.chargeItme[i], "payee",'')
@@ -796,6 +816,7 @@
this.$set(this.chargeItme[i], "bankDeposit", '');
this.$set(this.chargeItme[i], "accountType", '');
this.$set(this.chargeItme[i], "payeePaymentLines", '');
+ this.$set(this.chargeItme[i], "bankTypeText", '');
this.$notify({ type: 'danger', message: '收款方已存在!' });
}
},
@@ -816,6 +837,16 @@
this.$set(this.form, "enterpriseCode", obj.enterpriseCode);
this.$set(this.form, "bankType", obj.bankType);
this.$set(this.form, "payerFrom", '1');
+ console.log(obj.bankType)
+ if(obj.bankType==1){
+ this.form.accountType = "1"
+ this.form.isPeers = null
+ this.accountTypeChange();
+ }else if(obj.bankType==2||obj.bankType==4){
+ this.form.accountType = null
+ this.form.isPeers = "Y"
+ this.accountTypeChange1();
+ }
}else{
if(obj.payerFrom==1){
this.diglogStatus = false;
diff --git a/src/views/onlineHome/bankAgriculture/paymentApproval/approvalModify2.vue b/src/views/onlineHome/bankAgriculture/paymentApproval/approvalModify2.vue
index 0ababe1d..bd4d257b 100644
--- a/src/views/onlineHome/bankAgriculture/paymentApproval/approvalModify2.vue
+++ b/src/views/onlineHome/bankAgriculture/paymentApproval/approvalModify2.vue
@@ -171,14 +171,6 @@
-
-
-
- 是
- 否
-
-
-
@@ -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 @@
收款方信息
-
+
公户
@@ -173,7 +173,7 @@
-
+
是
否
@@ -210,11 +210,9 @@
readonly
clickable
label="所属银行"
- placeholder="请选择"
+ placeholder=""
v-model="item.bankTypeText"
- @click="item.showbankType = true"
input-align="right"
- right-icon="arrow-down"
required
:rules="[{ required: true , message:'请选择所属银行' }]"
/>
@@ -428,8 +426,8 @@
payeeAccount: "", //收款账户
bankDeposit: "", //开户银行
incomeAmount: "", //收入金额
- bankType: "1", //所属银行
- bankTypeText:this.selectDictLabel(res.data, 1), //所属银行
+ bankType:null, //所属银行
+ bankTypeText:"", //所属银行
showPayee:false,
showbankType:false
});
@@ -519,6 +517,21 @@
this.payeeList = [];
this.chargeItme = [];
this.queryParams.accountType = this.form.accountType
+ this.queryParams.bankType = this.form.bankType
+ this.queryParams.status = "0"
+ listPayee(this.queryParams).then((response) => {
+ this.payeeList = response.rows;
+ response.rows.map((res,index) => {
+ this.payeeList[index].text = res.payee;
+ this.payeeList[index].value = res.id;
+ })
+ });
+ },
+ accountTypeChange1(e){
+ this.payeeList = [];
+ this.chargeItme = [];
+ this.queryParams.isPeers = this.form.isPeers
+ this.queryParams.bankType = this.form.bankType
this.queryParams.status = "0"
listPayee(this.queryParams).then((response) => {
this.payeeList = response.rows;
@@ -758,6 +771,7 @@
payeeSelectChange(select, i) {
let obj = {};
let fuzhitype = 0;
+ let _this = this
obj = this.payeeList.find((account) => {
//model就是上面的数据源
return account.id === select ; //筛选出匹配数据
@@ -782,6 +796,11 @@
this.$set(this.chargeItme[i], "bankDeposit", obj.bankDeposit);
this.$set(this.chargeItme[i], "accountType", obj.accountType);
this.$set(this.chargeItme[i], "payeePaymentLines", obj.payeePaymentLines);
+ _this.bankTypeDictionaries.map(rr => {
+ if(rr.value==obj.bankType){
+ this.$set(this.chargeItme[i], "bankTypeText", rr.text);
+ }
+ })
}else if(fuzhitype == 1){
this.$set(this.chargeItme[i], "payee",'')
this.$set(this.chargeItme[i], "bankType",'')
@@ -790,6 +809,7 @@
this.$set(this.chargeItme[i], "bankDeposit", '');
this.$set(this.chargeItme[i], "accountType", '');
this.$set(this.chargeItme[i], "payeePaymentLines", '');
+ this.$set(this.chargeItme[i], "bankTypeText", '');
this.$notify({ type: 'danger', message: '请选择账户类型相同的收款方!' });
}else if(fuzhitype == 2){
this.$set(this.chargeItme[i], "payee",'')
@@ -799,6 +819,7 @@
this.$set(this.chargeItme[i], "bankDeposit", '');
this.$set(this.chargeItme[i], "accountType", '');
this.$set(this.chargeItme[i], "payeePaymentLines", '');
+ this.$set(this.chargeItme[i], "bankTypeText", '');
this.$notify({ type: 'danger', message: '收款方已存在!' });
}
},
@@ -808,7 +829,6 @@
//model就是上面的数据源
return account.id === select; //筛选出匹配数据
});
- console.log(obj)
this.$set(this.form, "bookId", obj.bookId);
this.$set(this.form, "deptId", obj.deptId);
this.$set(this.form, "cashierId", obj.id);
@@ -818,6 +838,15 @@
this.$set(this.form, "enterpriseCode", obj.enterpriseCode);
this.$set(this.form, "bankType", obj.bankType);
this.$set(this.form, "payerFrom", '1');
+ if(obj.bankType==1){
+ this.form.accountType = "1"
+ this.form.isPeers = null
+ this.accountTypeChange();
+ }else if(obj.bankType==2||obj.bankType==4){
+ this.form.accountType = null
+ this.form.isPeers = "Y"
+ this.accountTypeChange1();
+ }
},
beforeRead(file) {
this.uploadFiles.push(file.file);
diff --git a/src/views/onlineHome/bankAgriculture/paymentApproval/approvalModify5.vue b/src/views/onlineHome/bankAgriculture/paymentApproval/approvalModify5.vue
index abdcd087..6fd29933 100644
--- a/src/views/onlineHome/bankAgriculture/paymentApproval/approvalModify5.vue
+++ b/src/views/onlineHome/bankAgriculture/paymentApproval/approvalModify5.vue
@@ -212,7 +212,6 @@
label="所属银行"
placeholder="请选择"
v-model="item.bankTypeText"
- @click="item.showbankType = true"
input-align="right"
required
:rules="[{ required: true , message:'请选择所属银行' }]"