diff --git a/src/api/onlineHome/bankAgriculture/paymentApproval.js b/src/api/onlineHome/bankAgriculture/paymentApproval.js index a0584bde..aa8697d4 100644 --- a/src/api/onlineHome/bankAgriculture/paymentApproval.js +++ b/src/api/onlineHome/bankAgriculture/paymentApproval.js @@ -321,3 +321,10 @@ export function listTemplate(query) { params: query }) } +// 根据模板主表id审批模板明细详细 +export function selectApprovalByTemplateId(templateId) { + return request({ + url: '/service/templateDetail/selectApprovalByTemplateId/' + templateId, + method: 'get' + }) +} diff --git a/src/views/yinnong/bankAgriculture/paymentApproval/approvalDetail11.vue b/src/views/yinnong/bankAgriculture/paymentApproval/approvalDetail11.vue index ac95e9b7..b5ca8b39 100644 --- a/src/views/yinnong/bankAgriculture/paymentApproval/approvalDetail11.vue +++ b/src/views/yinnong/bankAgriculture/paymentApproval/approvalDetail11.vue @@ -165,6 +165,7 @@ }); this.getDictionaries(); this.getFileList(); + this.getTemplateList(); }, methods: { getTemplateList(){ diff --git a/src/views/yinnong/bankAgriculture/paymentApproval/approvalDetail12.vue b/src/views/yinnong/bankAgriculture/paymentApproval/approvalDetail12.vue index dcb9b0e8..9abc8da7 100644 --- a/src/views/yinnong/bankAgriculture/paymentApproval/approvalDetail12.vue +++ b/src/views/yinnong/bankAgriculture/paymentApproval/approvalDetail12.vue @@ -222,6 +222,7 @@ }); this.getDictionaries(); this.getFileList(); + this.getTemplateList(); }, methods: { getTemplateList(){ diff --git a/src/views/yinnong/bankAgriculture/paymentApproval/approvalProcess.vue b/src/views/yinnong/bankAgriculture/paymentApproval/approvalProcess.vue index 5849dae9..eb1651f6 100644 --- a/src/views/yinnong/bankAgriculture/paymentApproval/approvalProcess.vue +++ b/src/views/yinnong/bankAgriculture/paymentApproval/approvalProcess.vue @@ -26,32 +26,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -80,6 +54,33 @@ + + + + + + 组级审批 + 村级审批 + 镇级审批 + + + + 审批人:{{item2.nickName}} + + + + + 审批顺序:{{item2.approvalOrder}}级审批 + + + + + 审批节点:{{item2.name}} + + + + + @@ -89,14 +90,17 @@ import { getTransferProcess, getTransfer, getProjectto, - queryTransferDetail + queryTransferDetail, + selectApprovalByTemplateId } from "@/api/onlineHome/bankAgriculture/paymentApproval"; export default { name: "approvalProcess", data() { return { processList:{}, - form:{} + form:{}, + approvalTemplateDeptList:[], + approvalTemplateDetailList:[] }; }, created() { @@ -107,7 +111,6 @@ export default { getTransferProcess(id){ getTransferProcess(id).then(res => { this.processList = res.data.processSchedule - console.log(res.data.processSchedule) this.processList.乡镇审批时间 = this.processList.乡镇审批时间?this.format(this.processList.乡镇审批时间, "yyyy-MM-dd HH:mm:ss"):"" this.processList.区县审批时间 = this.processList.区县审批时间?this.format(this.processList.区县审批时间, "yyyy-MM-dd HH:mm:ss"):"" this.processList.支付状态时间 = this.processList.支付状态时间?this.format(this.processList.支付状态时间, "yyyy-MM-dd HH:mm:ss"):"" @@ -118,7 +121,14 @@ export default { getTransfer(id).then((response) => { this.form = response.data; this.processList = {} - this.getTransferProcess(this.$route.query.id); + if(this.form.auditStatus == 0){ + selectApprovalByTemplateId(this.form.approvalTemplateId).then(rs => { + this.approvalTemplateDeptList = rs.approvalDepts; + this.approvalTemplateDetailList = rs.approvalDetails; + }) + }else{ + this.getTransferProcess(this.$route.query.id); + } if(this.form.capitalExpenditureType==2){ this.capitalExpenditureOpen = true let param={ diff --git a/src/views/yinnong/bankAgriculture/paymentApproval/approvalProcess2.vue b/src/views/yinnong/bankAgriculture/paymentApproval/approvalProcess2.vue index f077c94d..19a08442 100644 --- a/src/views/yinnong/bankAgriculture/paymentApproval/approvalProcess2.vue +++ b/src/views/yinnong/bankAgriculture/paymentApproval/approvalProcess2.vue @@ -26,32 +26,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -80,6 +54,33 @@ + + + + + + 组级审批 + 村级审批 + 镇级审批 + + + + 审批人:{{item2.nickName}} + + + + + 审批顺序:{{item2.approvalOrder}}级审批 + + + + + 审批节点:{{item2.name}} + + + + + @@ -89,7 +90,8 @@ import { getTransferProcess, getTransfer, getProjectto, - queryTransferDetail + queryTransferDetail, + selectApprovalByTemplateId } from "@/api/onlineHome/bankAgriculture/paymentApproval"; import { getCash, @@ -101,7 +103,9 @@ export default { data() { return { processList:{}, - form:{} + form:{}, + approvalTemplateDeptList:[], + approvalTemplateDetailList:[] }; }, created() { @@ -122,7 +126,14 @@ export default { getCash(id).then((response) => { this.form = response.data; this.processList = {} - this.getTransferProcess1(this.$route.query.id); + if(this.form.auditStatus == 0){ + selectApprovalByTemplateId(this.form.approvalTemplateId).then(rs => { + this.approvalTemplateDeptList = rs.approvalDepts; + this.approvalTemplateDetailList = rs.approvalDetails; + }) + }else{ + this.getTransferProcess1(this.$route.query.id); + } if(this.form.capitalExpenditureType==2){ this.capitalExpenditureOpen = true let param={
组级审批
村级审批
镇级审批
审批人:{{item2.nickName}}
审批顺序:{{item2.approvalOrder}}级审批
审批节点:{{item2.name}}