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 @@