From 1ac53340959d558f40786fac3629111d823c76e2 Mon Sep 17 00:00:00 2001 From: xuyuanqing <392009588@qq.com> Date: Thu, 25 Apr 2024 14:19:25 +0800 Subject: [PATCH] =?UTF-8?q?=E9=93=B6=E5=86=9C-=E9=93=B6=E8=A1=8C=E8=BD=AC?= =?UTF-8?q?=E8=B4=A6=E7=94=B3=E8=AF=B7=E3=80=81=E5=A4=87=E4=BB=98=E9=87=91?= =?UTF-8?q?=E6=94=AF=E5=87=BA=E7=94=B3=E8=AF=B7=E8=87=AA=E5=AE=9A=E4=B9=89?= =?UTF-8?q?=E5=AE=A1=E6=89=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bankAgriculture/paymentApproval.js | 10 +- .../paymentApproval/approvalAdd.vue | 33 +- .../paymentApproval/approvalAdd11.vue | 470 ++--------------- .../paymentApproval/approvalApproval.vue | 2 +- .../paymentApproval/approvalApproval11.vue | 11 +- .../paymentApproval/approvalDetail.vue | 2 +- .../paymentApproval/approvalDetail11.vue | 2 +- .../paymentApproval/approvalList.vue | 6 +- .../paymentApproval/approvalList11.vue | 6 +- .../paymentApproval/approvalModify.vue | 33 +- .../paymentApproval/approvalModify11.vue | 469 ++--------------- .../paymentApproval/approvalProcess.vue | 66 +-- .../paymentApproval/approvalAdd.vue | 70 +-- .../paymentApproval/approvalAdd11.vue | 473 ++---------------- .../paymentApproval/approvalApproval.vue | 25 +- .../paymentApproval/approvalApproval10.vue | 2 +- .../paymentApproval/approvalApproval11.vue | 10 +- .../paymentApproval/approvalDetail.vue | 2 +- .../paymentApproval/approvalList.vue | 6 +- .../paymentApproval/approvalModify.vue | 33 +- .../paymentApproval/approvalProcess.vue | 53 +- .../paymentApproval/approvalProcess2.vue | 53 +- .../yinnong/doneCompleted/completedNew.vue | 41 +- src/views/yinnong/doneCompleted/doneNew.vue | 42 +- 24 files changed, 299 insertions(+), 1621 deletions(-) diff --git a/src/api/onlineHome/bankAgriculture/paymentApproval.js b/src/api/onlineHome/bankAgriculture/paymentApproval.js index 3653742a..c36415c0 100644 --- a/src/api/onlineHome/bankAgriculture/paymentApproval.js +++ b/src/api/onlineHome/bankAgriculture/paymentApproval.js @@ -192,9 +192,9 @@ export function addCashdetail(data) { } // 查询转账账户详情详细 -export function getTransferProcess(id) { +export function getTransferProcess(auditbatchNo) { return request({ - url: '/yinnong/transfer/getProcessSchedule/' + id, + url: '/yinnong/transfer/getProcessScheduleInfoNew/' + auditbatchNo, method: 'get' }) } @@ -223,12 +223,12 @@ export function getQmyeFlow(id) { }) } -// 查询当前账期余额 +// 审批 export function approval(data) { return request({ - url: '/activiti/process/complete', + url: '/approval/audit/audit', method: 'post', - params:data + data:data }) } diff --git a/src/views/sunVillage_info/bankAgriculture/paymentApproval/approvalAdd.vue b/src/views/sunVillage_info/bankAgriculture/paymentApproval/approvalAdd.vue index 7ad10c7e..1ae2e27c 100644 --- a/src/views/sunVillage_info/bankAgriculture/paymentApproval/approvalAdd.vue +++ b/src/views/sunVillage_info/bankAgriculture/paymentApproval/approvalAdd.vue @@ -132,7 +132,7 @@ label-width="auto" maxlength="20" required - show-word-limit + show-word-limit v-if="form.bankType == '6'" :rules="[{ required: true , message:'请输入转账附言' }]" /> @@ -146,7 +146,7 @@ label-width="auto" maxlength="30" required - show-word-limit + show-word-limit v-if="form.bankType != '5' && form.bankType != '6'" :rules="[{ required: true , message:'请输入转账附言' }]" /> @@ -646,7 +646,7 @@ } // if(this.form.bankType == '2' && this.form.isPeers == 'N' && this.chargeItme.length>0 && this.chargeItme != []){ // this.$notify({ type: 'danger', message: '目前农商行仅支持单笔跨行转账，即仅能有一个收款方！' }); - // }else + // }else if(this.form.bankType == '7' && this.chargeItme.length>0 && this.chargeItme != []){ this.$notify({ type: 'danger', message: '目前农商行仅支持单笔转账，即仅能有一个收款方！' }); }else{ @@ -873,56 +873,29 @@ this.$set(this.projectForm, "ynType", '1'); if(this.form.capitalExpenditureType==2){ addProjectto(this.projectForm).then(res => { - if(_this.form.approvalMode === '1'){ - customSubmit(this.form.id).then(res => { - _this.$toast.success('提交成功'); - setTimeout(function(){ - _this.$router.push('/sunVillage_info/approvalList') - },1500) - }) - }else{ offlineCustomSubmit(this.form.id).then(res => { _this.$toast.success('提交成功'); setTimeout(function(){ _this.$router.push('/sunVillage_info/approvalList') },1500) }) - } }) } else if(this.form.capitalExpenditureType==4){ addInfoto(this.infoForm).then(res => { - if(_this.form.approvalMode === '1'){ - customSubmit(this.form.id).then(res => { - _this.$toast.success('提交成功'); - setTimeout(function(){ - _this.$router.push('/sunVillage_info/approvalList') - },1500) - }) - }else{ offlineCustomSubmit(this.form.id).then(res => { _this.$toast.success('提交成功'); setTimeout(function(){ _this.$router.push('/sunVillage_info/approvalList') },1500) }) - } }) }else{ - if(_this.form.approvalMode === '1'){ - customSubmit(this.form.id).then(res => { - _this.$toast.success('提交成功'); - setTimeout(function(){ - _this.$router.push('/sunVillage_info/approvalList') - },1500) - }) - }else{ offlineCustomSubmit(this.form.id).then(res => { _this.$toast.success('提交成功'); setTimeout(function(){ _this.$router.push('/sunVillage_info/approvalList') },1500) }) - } } }) }, diff --git a/src/views/sunVillage_info/bankAgriculture/paymentApproval/approvalAdd11.vue b/src/views/sunVillage_info/bankAgriculture/paymentApproval/approvalAdd11.vue index 72f40ce2..df527990 100644 --- a/src/views/sunVillage_info/bankAgriculture/paymentApproval/approvalAdd11.vue +++ b/src/views/sunVillage_info/bankAgriculture/paymentApproval/approvalAdd11.vue @@ -264,7 +264,7 @@