diff --git a/src/api/onlineHome/bankAgriculture/paymentApproval.js b/src/api/onlineHome/bankAgriculture/paymentApproval.js index 7b6eb300..70fff9a8 100644 --- a/src/api/onlineHome/bankAgriculture/paymentApproval.js +++ b/src/api/onlineHome/bankAgriculture/paymentApproval.js @@ -116,3 +116,19 @@ export function getQmyeFlow(id) { method: 'post' }) } + +// 查询当前账期余额 +export function approval(data) { + return request({ + url: '/activiti/process/complete', + method: 'post', + params:data + }) +} +// 删除银行转账 +export function delTransfer(id) { + return request({ + url: '/yinnong/transfer/remove/' + id, + method: 'get' + }) +} diff --git a/src/router/index.js b/src/router/index.js index dea24b0d..81cbbd00 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -1014,6 +1014,15 @@ export const constantRoutes = [ }, component: (resolve) => require(['@/views/onlineHome/bankAgriculture/paymentApproval/approvalAdd'], resolve) }, + { + path: '/approvalApproval', + name: 'approvalApproval', + meta: { + title: '付款审批', + hidden: true, + }, + component: (resolve) => require(['@/views/onlineHome/bankAgriculture/paymentApproval/approvalApproval'], resolve) + }, { path: '/approvalModify', name: 'approvalModify', 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 a4cb31e2..8031432d 100644 --- a/src/views/onlineHome/bankAgriculture/paymentApproval/approvalAdd.vue +++ b/src/views/onlineHome/bankAgriculture/paymentApproval/approvalAdd.vue @@ -10,14 +10,14 @@

添加付款申请

- +

基础信息

- +

关联项目

@@ -97,6 +97,8 @@ @click="showproject = true" input-align="right" right-icon="arrow-down" + required + :rules="[{ required: true , message:'请选择项目名称' }]" /> - - + + - + +

付款方信息

@@ -142,7 +147,7 @@ right-icon="arrow-down" label-width="auto" required - :rules="[{ required: true }]" + :rules="[{ required: true , message:'请选择付款方' }]" /> - +

收款方信息

-
@@ -244,6 +250,8 @@ showFundType:false, showpayer:false, + buttonType:'a', + minDate: new Date(), maxDate: new Date(2025, 10, 1), currentDate: new Date(), @@ -359,6 +367,16 @@ ynType:'1' } }, + getChange(){ + 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) => { for (var i = 0; i < res.data.length; i++) { @@ -372,6 +390,10 @@ }); this.getPayeeList(); }, + getError(e){ + console.log(e) + this.$notify({ type: 'danger', message: e.errors[0].message }); + }, addChargeItme(index){ if(this.chargeItme.length>0&&this.chargeItme[this.chargeItme.length-1].payee == ''){ this.$notify({ type: 'danger', message: '请勿添加多个空列表信息' }); @@ -507,17 +529,21 @@ this.$set(this.form, "expenditureAmount", total); }, goAdd(){ + if(this.chargeItme.length<1){ + this.$notify({ type: 'danger', message: '请添加收款方信息' }); + return; + } if(this.form.remark != null && this.form.remark.indexOf("|")!=-1){ - this.$toast.error("付款事由禁止包含|。"); + this.$notify({ type: 'danger', message: '付款事由禁止包含!' }); return; } if(this.form.capitalExpenditureType==2){ if(this.projectForm.projectName==""||this.projectForm.projectName==null){ - this.$toast.error('请选择项目名称!'); + this.$notify({ type: 'danger', message: '请选择项目名称!' }); return; } if(this.projectForm.projectBillNum==""||this.projectForm.projectBillNum==null){ - this.$toast.error('请输入工程发票号!'); + this.$notify({ type: 'danger', message: '请输入工程发票号!' }); return; } } @@ -525,12 +551,9 @@ this.$set(this.form, "bankTypeList", this.chargeItme); this.$set(this.form, "accountTypeList", this.chargeItme); this.$set(this.form, "transferStatusList", this.chargeItme); - console.log(this.form); addTransfer(this.form).then(response => { - console.log(response); this.projectForm.outId = response.data.id this.$set(this.projectForm, "ynType", '1'); - console.log(this.projectForm) if(this.form.capitalExpenditureType==2){ addProjectto(this.projectForm).then(res => { customSubmit(response.data.id).then(res => { @@ -551,17 +574,21 @@ }); }, goUpdate(){ + if(this.chargeItme.length<1){ + this.$notify({ type: 'danger', message: '请添加收款方信息' }); + return; + } if(this.form.remark != null && this.form.remark.indexOf("|")!=-1){ - this.$toast.error("付款事由禁止包含|。"); + this.$notify({ type: 'danger', message: '付款事由禁止包含!' }); return; } if(this.form.capitalExpenditureType==2){ if(this.projectForm.projectName==""||this.projectForm.projectName==null){ - this.$toast.error('请选择项目名称!'); + this.$notify({ type: 'danger', message: '请选择项目名称!' }); return; } if(this.projectForm.projectBillNum==""||this.projectForm.projectBillNum==null){ - this.$toast.error('请输入工程发票号!'); + this.$notify({ type: 'danger', message: '请输入工程发票号!' }); return; } } @@ -575,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 new file mode 100644 index 00000000..f87141da --- /dev/null +++ b/src/views/onlineHome/bankAgriculture/paymentApproval/approvalApproval.vue @@ -0,0 +1,306 @@ + + + + + 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 @@