+
公户
@@ -728,6 +742,9 @@
getPayeeList() {
//普通转账
this.queryParams.status = "0"
+ if(this.form.bankType == 1 || this.form.bankType == 10){
+ this.queryParams.bankType = "";
+ }
listPayee(this.queryParams).then((response) => {
response.rows.map((res,index) => {
if(res.payeeType==1||res.payeeType==2){
@@ -944,6 +961,9 @@
this.queryParams.isPeers = this.form.isPeers
this.queryParams.accountType = this.form.accountType
this.queryParams.bankType = this.form.bankType
+ if(this.form.bankType == 1 || this.form.bankType == 10){
+ this.queryParams.bankType = "";
+ }
this.queryParams.status = "0"
listPayee(this.queryParams).then((response) => {
response.rows.map((res,index) => {
@@ -961,6 +981,9 @@
this.queryParams.isPeers = this.form.isPeers
this.queryParams.accountType = this.form.accountType
this.queryParams.bankType = this.form.bankType
+ if(this.form.bankType == 1 || this.form.bankType == 10){
+ this.queryParams.bankType = "";
+ }
this.queryParams.status = "0"
listPayee(this.queryParams).then((response) => {
response.rows.map((res,index) => {
@@ -1288,7 +1311,7 @@
this.$set(this.form, "cifNo", obj.cifNo);
this.$set(this.form, "payerFrom", '1');
this.$set(this.form, "clearingBank", obj.clearingBank);
- if(obj.bankType==1){
+ if(obj.bankType==1 || obj.bankType==10){
this.form.accountType = "1"
this.form.isPeers = null
this.accountTypeChange();
@@ -1355,6 +1378,9 @@
console.log(val);
this.payeeList = [];
this.queryParams.payee = this.payeeSearchValue;
+ if(this.form.bankType == 1 || this.form.bankType == 10){
+ this.queryParams.bankType = "";
+ }
listPayee(this.queryParams).then((response) => {
response.rows.map((res,index) => {
if(res.payeeType==1||res.payeeType==2){
diff --git a/src/views/sunVillage_info/bankAgriculture/paymentApproval/approvalApproval.vue b/src/views/sunVillage_info/bankAgriculture/paymentApproval/approvalApproval.vue
index 1c4119a3..eedb6d37 100644
--- a/src/views/sunVillage_info/bankAgriculture/paymentApproval/approvalApproval.vue
+++ b/src/views/sunVillage_info/bankAgriculture/paymentApproval/approvalApproval.vue
@@ -59,7 +59,7 @@
+
diff --git a/src/views/sunVillage_info/bankAgriculture/paymentApproval/approvalList.vue b/src/views/sunVillage_info/bankAgriculture/paymentApproval/approvalList.vue
index b5fbd4b7..8c9536dc 100644
--- a/src/views/sunVillage_info/bankAgriculture/paymentApproval/approvalList.vue
+++ b/src/views/sunVillage_info/bankAgriculture/paymentApproval/approvalList.vue
@@ -4,7 +4,7 @@
left-arrow
fixed
placeholder
- @click-left="onClickLeft"
+ @click-left="goBack()"
@click-right="goAdd()"
>
diff --git a/src/views/sunVillage_info/bankAgriculture/paymentApproval/approvalModify.vue b/src/views/sunVillage_info/bankAgriculture/paymentApproval/approvalModify.vue
index 32643fe0..c780ffeb 100644
--- a/src/views/sunVillage_info/bankAgriculture/paymentApproval/approvalModify.vue
+++ b/src/views/sunVillage_info/bankAgriculture/paymentApproval/approvalModify.vue
@@ -131,6 +131,20 @@
v-if="form.bankType == '6'"
:rules="[{ required: true , message:'请输入转账附言' }]"
/>
+
@@ -263,7 +277,7 @@
-
+
公户
@@ -533,6 +547,9 @@
console.log(val);
this.payeeList = [];
this.queryParams.payee = this.payeeSearchValue;
+ if(this.form.bankType == 1 || this.form.bankType == 10){
+ this.queryParams.bankType = "";
+ }
listPayee(this.queryParams).then((response) => {
response.rows.map((res,index) => {
if(res.payeeType==1||res.payeeType==2){
@@ -688,6 +705,9 @@
this.queryParams.accountType = this.form.accountType?this.form.accountType:null
this.queryParams.bankType = this.form.bankType
this.queryParams.status = "0"
+ if(this.form.bankType == 1 || this.form.bankType == 10){
+ this.queryParams.bankType = "";
+ }
listPayee(this.queryParams).then((response) => {
response.rows.map((res,index) => {
if(res.payeeType==1||res.payeeType==2){
@@ -789,6 +809,9 @@
this.queryParams.isPeers = this.form.isPeers
this.queryParams.bankType = this.form.bankType
this.queryParams.status = "0"
+ if(this.form.bankType == 1 || this.form.bankType == 10){
+ this.queryParams.bankType = "";
+ }
listPayee(this.queryParams).then((response) => {
response.rows.map((res,index) => {
if(res.payeeType==1||res.payeeType==2){
@@ -806,6 +829,9 @@
this.queryParams.isPeers = this.form.isPeers
this.queryParams.bankType = this.form.bankType
this.queryParams.status = "0"
+ if(this.form.bankType == 1 || this.form.bankType == 10){
+ this.queryParams.bankType = "";
+ }
listPayee(this.queryParams).then((response) => {
response.rows.map((res,index) => {
if(res.payeeType==1||res.payeeType==2){
@@ -1179,7 +1205,7 @@
this.$set(this.form, "payerFrom", '1');
this.$set(this.form, "clearingBank", obj.clearingBank);
console.log(obj.bankType)
- if(obj.bankType==1){
+ if(obj.bankType==1 || obj.bankType==10){
this.form.accountType = "1"
this.form.isPeers = null
this.accountTypeChange();
diff --git a/src/views/sunVillage_info/bankAgriculture/paymentPending/approvalDetail.vue b/src/views/sunVillage_info/bankAgriculture/paymentPending/approvalDetail.vue
index 922df3a2..68c3d61d 100644
--- a/src/views/sunVillage_info/bankAgriculture/paymentPending/approvalDetail.vue
+++ b/src/views/sunVillage_info/bankAgriculture/paymentPending/approvalDetail.vue
@@ -59,7 +59,7 @@
+
@@ -277,6 +277,7 @@
this.queryParams.id = id;
this.queryParams.uuid = this.form.uuid;
this.queryParams.alternateField1 = this.form.alternateField1;
+ this.queryParams.accountPassword = this.form.accountPassword;
let queryParams = this.queryParams;
const bankType = this.form.bankType;
var that = this;
@@ -301,7 +302,7 @@
if(err.toString().indexOf('验证码错误') !== -1){
this.paySubmitDisabled = false;
return
- }else if(err.toString().indexOf('错误代码:-1') == -1 && err.toString().indexOf('错误代码:-2') == -1){
+ }else if(err.toString().indexOf('错误代码:-1') !== -1 && err.toString().indexOf('错误代码:-2') !== -1){
this.getList();
clearTimeout(this.sms_timer);
this.smsStatus = false;
@@ -329,12 +330,15 @@
if(err.toString().indexOf('验证码错误') !== -1){
this.paySubmitDisabled = false;
return
- }else if(err.toString().indexOf('错误代码:-1') == -1 && err.toString().indexOf('错误代码:-2') == -1){
+ }else if(err.toString().indexOf('错误代码:-1') !== -1 && err.toString().indexOf('错误代码:-2') !== -1){
this.getList();
clearTimeout(this.sms_timer);
this.smsStatus = false;
this.sms_disabled = false;
this.smsText = "发送验证码";
+ }else if(err.toString().indexOf('支付口令不正确') !== -1){
+ this.paySubmitDisabled1 = false;
+ return
}
setTimeout(function(){
history.go(-1)
diff --git a/src/views/yinnong/bankAgriculture/paymentApproval/approvalAdd.vue b/src/views/yinnong/bankAgriculture/paymentApproval/approvalAdd.vue
index 01ee3971..575589df 100644
--- a/src/views/yinnong/bankAgriculture/paymentApproval/approvalAdd.vue
+++ b/src/views/yinnong/bankAgriculture/paymentApproval/approvalAdd.vue
@@ -131,6 +131,20 @@
v-if="form.bankType == '6'"
:rules="[{ required: true , message:'请输入转账附言' }]"
/>
+
@@ -257,8 +271,8 @@
-
收款方信息
-
+
diff --git a/src/views/sunVillage_info/bankAgriculture/paymentApproval/approvalDetail.vue b/src/views/sunVillage_info/bankAgriculture/paymentApproval/approvalDetail.vue
index 30b144cc..e0fcb181 100644
--- a/src/views/sunVillage_info/bankAgriculture/paymentApproval/approvalDetail.vue
+++ b/src/views/sunVillage_info/bankAgriculture/paymentApproval/approvalDetail.vue
@@ -59,7 +59,7 @@
收款方信息
-收款方信息
-
-
+
+
公户
@@ -551,6 +565,9 @@
console.log(val);
this.payeeList = [];
this.queryParams.payee = this.payeeSearchValue;
+ if(this.form.bankType == 1 || this.form.bankType == 10){
+ this.queryParams.bankType = "";
+ }
listPayee(this.queryParams).then((response) => {
response.rows.map((res,index) => {
if(res.payeeType==1||res.payeeType==2){
@@ -854,6 +871,9 @@
getPayeeList() {
//普通转账
this.queryParams.status = "0"
+ if(this.form.bankType == 1 || this.form.bankType == 10){
+ this.queryParams.bankType = "";
+ }
listPayee(this.queryParams).then((response) => {
response.rows.map((res,index) => {
if(res.payeeType==1||res.payeeType==2){
@@ -955,6 +975,9 @@
this.queryParams.accountType = this.form.accountType
this.queryParams.bankType = this.form.bankType
this.queryParams.status = "0"
+ if(this.form.bankType == 1 || this.form.bankType == 10){
+ this.queryParams.bankType = "";
+ }
listPayee(this.queryParams).then((response) => {
response.rows.map((res,index) => {
if(res.payeeType==1||res.payeeType==2){
@@ -972,6 +995,9 @@
this.queryParams.accountType = this.form.accountType
this.queryParams.bankType = this.form.bankType
this.queryParams.status = "0"
+ if(this.form.bankType == 1 || this.form.bankType == 10){
+ this.queryParams.bankType = "";
+ }
listPayee(this.queryParams).then((response) => {
response.rows.map((res,index) => {
if(res.payeeType==1||res.payeeType==2){
@@ -1280,7 +1306,7 @@
this.$set(this.form, "cifNo", obj.cifNo);
this.$set(this.form, "payerFrom", '1');
this.$set(this.form, "clearingBank", obj.clearingBank);
- if(obj.bankType==1){
+ if(obj.bankType==1 || obj.bankType==10){
this.form.accountType = "1"
this.form.isPeers = null
this.accountTypeChange();
diff --git a/src/views/yinnong/bankAgriculture/paymentApproval/approvalApproval.vue b/src/views/yinnong/bankAgriculture/paymentApproval/approvalApproval.vue
index bcf97a68..b0a24ef0 100644
--- a/src/views/yinnong/bankAgriculture/paymentApproval/approvalApproval.vue
+++ b/src/views/yinnong/bankAgriculture/paymentApproval/approvalApproval.vue
@@ -59,7 +59,7 @@
收款方信息
-
+
diff --git a/src/views/yinnong/bankAgriculture/paymentApproval/approvalDetail.vue b/src/views/yinnong/bankAgriculture/paymentApproval/approvalDetail.vue
index 8967a6ca..ef6fd36a 100644
--- a/src/views/yinnong/bankAgriculture/paymentApproval/approvalDetail.vue
+++ b/src/views/yinnong/bankAgriculture/paymentApproval/approvalDetail.vue
@@ -62,7 +62,7 @@
收款方信息
-
diff --git a/src/views/yinnong/bankAgriculture/paymentApproval/approvalModify.vue b/src/views/yinnong/bankAgriculture/paymentApproval/approvalModify.vue
index f8069149..a148239f 100644
--- a/src/views/yinnong/bankAgriculture/paymentApproval/approvalModify.vue
+++ b/src/views/yinnong/bankAgriculture/paymentApproval/approvalModify.vue
@@ -131,6 +131,20 @@
v-if="form.bankType == '6'"
:rules="[{ required: true , message:'请输入转账附言' }]"
/>
+
@@ -267,7 +281,7 @@
-
+
公户
@@ -570,6 +584,9 @@
console.log(val);
this.payeeList = [];
this.queryParams.payee = this.payeeSearchValue;
+ if(this.form.bankType == 1 || this.form.bankType == 10){
+ this.queryParams.bankType = "";
+ }
listPayee(this.queryParams).then((response) => {
response.rows.map((res,index) => {
if(res.payeeType==1||res.payeeType==2){
@@ -722,6 +739,9 @@
this.queryParams.accountType = this.form.accountType ? this.form.accountType : null
this.queryParams.bankType = this.form.bankType
this.queryParams.status = "0"
+ if(this.form.bankType == 1 || this.form.bankType == 10){
+ this.queryParams.bankType = "";
+ }
listPayee(this.queryParams).then((response) => {
response.rows.map((res, index) => {
if (res.payeeType == 1 || res.payeeType == 2) {
@@ -943,6 +963,9 @@
this.queryParams.isPeers = this.form.isPeers
this.queryParams.bankType = this.form.bankType
this.queryParams.status = "0"
+ if(this.form.bankType == 1 || this.form.bankType == 10){
+ this.queryParams.bankType = "";
+ }
listPayee(this.queryParams).then((response) => {
response.rows.map((res, index) => {
if (res.payeeType == 1 || res.payeeType == 2) {
@@ -960,6 +983,9 @@
this.queryParams.isPeers = this.form.isPeers
this.queryParams.bankType = this.form.bankType
this.queryParams.status = "0"
+ if(this.form.bankType == 1 || this.form.bankType == 10){
+ this.queryParams.bankType = "";
+ }
listPayee(this.queryParams).then((response) => {
response.rows.map((res, index) => {
if (res.payeeType == 1 || res.payeeType == 2) {
@@ -1218,7 +1244,7 @@
this.$set(this.form, "bankType", obj.bankType);
this.$set(this.form, "payerFrom", '1');
this.$set(this.form, "clearingBank", obj.clearingBank);
- if (obj.bankType == 1) {
+ if (obj.bankType == 1 || obj.bankType == 10) {
this.form.accountType = "1"
this.form.isPeers = null
this.accountTypeChange();