diff --git a/src/api/onlineHome/bankAgriculture/paymentApproval.js b/src/api/onlineHome/bankAgriculture/paymentApproval.js index 42db29b4..70fff9a8 100644 --- a/src/api/onlineHome/bankAgriculture/paymentApproval.js +++ b/src/api/onlineHome/bankAgriculture/paymentApproval.js @@ -125,3 +125,10 @@ export function approval(data) { params:data }) } +// 删除银行转账 +export function delTransfer(id) { + return request({ + url: '/yinnong/transfer/remove/' + id, + method: 'get' + }) +} diff --git a/src/views/onlineHome/bankAgriculture/paymentAccount/paymentAccountDetail.vue b/src/views/onlineHome/bankAgriculture/paymentAccount/paymentAccountDetail.vue index 95e7ab55..716d40f1 100644 --- a/src/views/onlineHome/bankAgriculture/paymentAccount/paymentAccountDetail.vue +++ b/src/views/onlineHome/bankAgriculture/paymentAccount/paymentAccountDetail.vue @@ -7,7 +7,7 @@ @click-left="$router.back(-1)" >

基础信息

diff --git a/src/views/onlineHome/bankAgriculture/paymentApproval/approvalAdd.vue b/src/views/onlineHome/bankAgriculture/paymentApproval/approvalAdd.vue index 930d48a2..8031432d 100644 --- a/src/views/onlineHome/bankAgriculture/paymentApproval/approvalAdd.vue +++ b/src/views/onlineHome/bankAgriculture/paymentApproval/approvalAdd.vue @@ -223,11 +223,11 @@ - + - 保存并提交 + 保存并提交
@@ -250,6 +250,8 @@ showFundType:false, showpayer:false, + buttonType:'a', + minDate: new Date(), maxDate: new Date(2025, 10, 1), currentDate: new Date(), @@ -366,8 +368,14 @@ } }, getChange(){ - console.log(this.$refs.submit) - + console.log(this.buttonType) + if(this.buttonType == 'update'){ + console.log('update') + this.goUpdate(); + }else if(this.buttonType == 'add'){ + console.log('add') + this.goAdd(); + } }, getDictionaries(){ this.getDicts("capital_expenditure_type").then((res) => { @@ -521,8 +529,6 @@ this.$set(this.form, "expenditureAmount", total); }, goAdd(){ - console.log('aaa'); - return; if(this.chargeItme.length<1){ this.$notify({ type: 'danger', message: '请添加收款方信息' }); return; @@ -568,8 +574,6 @@ }); }, goUpdate(){ - console.log('aaa'); - return; if(this.chargeItme.length<1){ this.$notify({ type: 'danger', message: '请添加收款方信息' }); return; @@ -598,13 +602,13 @@ this.$set(this.projectForm, "ynType", '1'); if(this.form.capitalExpenditureType==2){ addProjectto(this.projectForm).then(res => { - this.$toast.success('修改成功'); + this.$toast.success('保存成功'); setTimeout(function(){ history.go(-1) },2000) }) }else{ - this.$toast.success('修改成功'); + this.$toast.success('保存成功'); setTimeout(function(){ history.go(-1) },2000) diff --git a/src/views/onlineHome/bankAgriculture/paymentApproval/approvalApproval.vue b/src/views/onlineHome/bankAgriculture/paymentApproval/approvalApproval.vue index 974ea166..f87141da 100644 --- a/src/views/onlineHome/bankAgriculture/paymentApproval/approvalApproval.vue +++ b/src/views/onlineHome/bankAgriculture/paymentApproval/approvalApproval.vue @@ -58,7 +58,7 @@ -
+
审批
意见
@@ -71,7 +71,7 @@
-
+
提交 diff --git a/src/views/onlineHome/bankAgriculture/paymentApproval/approvalList.vue b/src/views/onlineHome/bankAgriculture/paymentApproval/approvalList.vue index b3d10056..9311a2f9 100644 --- a/src/views/onlineHome/bankAgriculture/paymentApproval/approvalList.vue +++ b/src/views/onlineHome/bankAgriculture/paymentApproval/approvalList.vue @@ -35,6 +35,9 @@ + + + @@ -46,7 +49,7 @@