diff --git a/src/router/index.js b/src/router/index.js index 56663b6a..ab03c9b4 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -2233,6 +2233,15 @@ export const constantRoutes = [ }, component: (resolve) => require(['@/views/yinnong/bankAgriculture/paymentApproval/approvalProcess2'], resolve) }, + { + path: '/yinnong/approvalProcess3', + name: 'approvalProcess3', + meta: { + title: '审批流程', + hidden: true, + }, + component: (resolve) => require(['@/views/yinnong/bankAgriculture/paymentApproval/approvalProcess3'], resolve) + }, { path: '/yinnong/collectionList', name: 'collectionList', diff --git a/src/views/yinnong/bankAgriculture/paymentApproval/approvalAdd.vue b/src/views/yinnong/bankAgriculture/paymentApproval/approvalAdd.vue index 01f981ba..36c4e7db 100644 --- a/src/views/yinnong/bankAgriculture/paymentApproval/approvalAdd.vue +++ b/src/views/yinnong/bankAgriculture/paymentApproval/approvalAdd.vue @@ -9,6 +9,9 @@ +

基础信息

@@ -457,6 +460,13 @@ }, methods: { + goFlow(){ + if(this.form.approvalMode == '1' && this.form.approvalTemplateId != undefined && this.form.approvalTemplateId != "undefined"){ + window.location='approvalProcess3?approvalTemplateId='+this.form.approvalTemplateId+'&approvalMode='+this.form.approvalMode; + }else{ + this.$notify({ type: 'danger', message: '无审批流程!' }); + } + }, getTemplateList(){ let templateQueryParams = { // 分页 diff --git a/src/views/yinnong/bankAgriculture/paymentApproval/approvalAdd10.vue b/src/views/yinnong/bankAgriculture/paymentApproval/approvalAdd10.vue index d0b2659b..c8874bb5 100644 --- a/src/views/yinnong/bankAgriculture/paymentApproval/approvalAdd10.vue +++ b/src/views/yinnong/bankAgriculture/paymentApproval/approvalAdd10.vue @@ -9,6 +9,9 @@ +

基础信息

@@ -348,6 +351,13 @@ this.addChargeItme(); }, methods: { + goFlow(){ + if(this.form.approvalMode == '1' && this.form.approvalTemplateId != undefined && this.form.approvalTemplateId != "undefined"){ + window.location='approvalProcess3?approvalTemplateId='+this.form.approvalTemplateId+'&approvalMode='+this.form.approvalMode; + }else{ + this.$notify({ type: 'danger', message: '无审批流程!' }); + } + }, getNowDate(){ var _this = this; let yy = new Date().getFullYear(); diff --git a/src/views/yinnong/bankAgriculture/paymentApproval/approvalAdd11.vue b/src/views/yinnong/bankAgriculture/paymentApproval/approvalAdd11.vue index d8dd7957..2927cae9 100644 --- a/src/views/yinnong/bankAgriculture/paymentApproval/approvalAdd11.vue +++ b/src/views/yinnong/bankAgriculture/paymentApproval/approvalAdd11.vue @@ -9,6 +9,9 @@ +

基础信息

@@ -378,6 +381,13 @@ this.getTemplateList(); }, methods: { + goFlow(){ + if(this.form.approvalMode == '1' && this.form.approvalTemplateId != undefined && this.form.approvalTemplateId != "undefined"){ + window.location='approvalProcess3?approvalTemplateId='+this.form.approvalTemplateId+'&approvalMode='+this.form.approvalMode; + }else{ + this.$notify({ type: 'danger', message: '无审批流程!' }); + } + }, getTemplateList(){ let templateQueryParams = { // 分页 diff --git a/src/views/yinnong/bankAgriculture/paymentApproval/approvalAdd12.vue b/src/views/yinnong/bankAgriculture/paymentApproval/approvalAdd12.vue index 7230e015..820e73fb 100644 --- a/src/views/yinnong/bankAgriculture/paymentApproval/approvalAdd12.vue +++ b/src/views/yinnong/bankAgriculture/paymentApproval/approvalAdd12.vue @@ -9,6 +9,9 @@ +

基础信息

@@ -424,6 +427,13 @@ this.getTemplateList(); }, methods: { + goFlow(){ + if(this.form.approvalMode == '1' && this.form.approvalTemplateId != undefined && this.form.approvalTemplateId != "undefined"){ + window.location='approvalProcess3?approvalTemplateId='+this.form.approvalTemplateId+'&approvalMode='+this.form.approvalMode; + }else{ + this.$notify({ type: 'danger', message: '无审批流程!' }); + } + }, getTemplateList(){ let templateQueryParams = { // 分页 diff --git a/src/views/yinnong/bankAgriculture/paymentApproval/approvalAdd2.vue b/src/views/yinnong/bankAgriculture/paymentApproval/approvalAdd2.vue index 777eda03..42dacc30 100644 --- a/src/views/yinnong/bankAgriculture/paymentApproval/approvalAdd2.vue +++ b/src/views/yinnong/bankAgriculture/paymentApproval/approvalAdd2.vue @@ -9,6 +9,9 @@ +

基础信息

@@ -420,6 +423,13 @@ this.getTemplateList(); }, methods: { + goFlow(){ + if(this.form.approvalMode == '1' && this.form.approvalTemplateId != undefined && this.form.approvalTemplateId != "undefined"){ + window.location='approvalProcess3?approvalTemplateId='+this.form.approvalTemplateId+'&approvalMode='+this.form.approvalMode; + }else{ + this.$notify({ type: 'danger', message: '无审批流程!' }); + } + }, getTemplateList(){ let templateQueryParams = { // 分页 diff --git a/src/views/yinnong/bankAgriculture/paymentApproval/approvalAdd3.vue b/src/views/yinnong/bankAgriculture/paymentApproval/approvalAdd3.vue index 9ccff9fb..26aabe4f 100644 --- a/src/views/yinnong/bankAgriculture/paymentApproval/approvalAdd3.vue +++ b/src/views/yinnong/bankAgriculture/paymentApproval/approvalAdd3.vue @@ -9,6 +9,9 @@ +

基础信息

@@ -372,6 +375,13 @@ ynType:'1' } }, + goFlow(){ + if(this.form.approvalMode == '1' && this.form.approvalTemplateId != undefined && this.form.approvalTemplateId != "undefined"){ + window.location='approvalProcess3?approvalTemplateId='+this.form.approvalTemplateId+'&approvalMode='+this.form.approvalMode; + }else{ + this.$notify({ type: 'danger', message: '无审批流程!' }); + } + }, getChange(){ console.log(this.buttonType) if(this.buttonType == 'update'){ diff --git a/src/views/yinnong/bankAgriculture/paymentApproval/approvalAdd4.vue b/src/views/yinnong/bankAgriculture/paymentApproval/approvalAdd4.vue index ea39c670..602567c1 100644 --- a/src/views/yinnong/bankAgriculture/paymentApproval/approvalAdd4.vue +++ b/src/views/yinnong/bankAgriculture/paymentApproval/approvalAdd4.vue @@ -9,6 +9,9 @@ +

基础信息

@@ -396,6 +399,13 @@ this.getDictionaries(); }, methods: { + goFlow(){ + if(this.form.approvalMode == '1' && this.form.approvalTemplateId != undefined && this.form.approvalTemplateId != "undefined"){ + window.location='approvalProcess3?approvalTemplateId='+this.form.approvalTemplateId+'&approvalMode='+this.form.approvalMode; + }else{ + this.$notify({ type: 'danger', message: '无审批流程!' }); + } + }, getNowDate(){ var _this = this; let yy = new Date().getFullYear(); diff --git a/src/views/yinnong/bankAgriculture/paymentApproval/approvalAdd5.vue b/src/views/yinnong/bankAgriculture/paymentApproval/approvalAdd5.vue index 3e9a2e23..d03d9986 100644 --- a/src/views/yinnong/bankAgriculture/paymentApproval/approvalAdd5.vue +++ b/src/views/yinnong/bankAgriculture/paymentApproval/approvalAdd5.vue @@ -9,6 +9,9 @@ +

基础信息

@@ -374,6 +377,13 @@ ynType:'1' } }, + goFlow(){ + if(this.form.approvalMode == '1' && this.form.approvalTemplateId != undefined && this.form.approvalTemplateId != "undefined"){ + window.location='approvalProcess3?approvalTemplateId='+this.form.approvalTemplateId+'&approvalMode='+this.form.approvalMode; + }else{ + this.$notify({ type: 'danger', message: '无审批流程!' }); + } + }, getChange(){ console.log(this.buttonType) if(this.buttonType == 'update'){ diff --git a/src/views/yinnong/bankAgriculture/paymentApproval/approvalModify.vue b/src/views/yinnong/bankAgriculture/paymentApproval/approvalModify.vue index ad5f16bd..0afa2a4c 100644 --- a/src/views/yinnong/bankAgriculture/paymentApproval/approvalModify.vue +++ b/src/views/yinnong/bankAgriculture/paymentApproval/approvalModify.vue @@ -9,6 +9,9 @@ +

基础信息

@@ -446,6 +449,13 @@ }, methods: { + goFlow(){ + if(this.form.approvalMode == '1' && this.form.approvalTemplateId != undefined && this.form.approvalTemplateId != "undefined"){ + window.location='approvalProcess3?approvalTemplateId='+this.form.approvalTemplateId+'&approvalMode='+this.form.approvalMode; + }else{ + this.$notify({ type: 'danger', message: '无审批流程!' }); + } + }, onConfirmTemplate(data){ selectApprovalByTemplateId(data.id).then(res => { this.showtemplate = false; diff --git a/src/views/yinnong/bankAgriculture/paymentApproval/approvalModify10.vue b/src/views/yinnong/bankAgriculture/paymentApproval/approvalModify10.vue index 9f640610..e2dda4c8 100644 --- a/src/views/yinnong/bankAgriculture/paymentApproval/approvalModify10.vue +++ b/src/views/yinnong/bankAgriculture/paymentApproval/approvalModify10.vue @@ -9,6 +9,9 @@ +

基础信息

@@ -346,6 +349,13 @@ this.getFileList(); }, methods: { + goFlow(){ + if(this.form.approvalMode == '1' && this.form.approvalTemplateId != undefined && this.form.approvalTemplateId != "undefined"){ + window.location='approvalProcess3?approvalTemplateId='+this.form.approvalTemplateId+'&approvalMode='+this.form.approvalMode; + }else{ + this.$notify({ type: 'danger', message: '无审批流程!' }); + } + }, initProjectInfo(){ let _this = this let queryParams={ diff --git a/src/views/yinnong/bankAgriculture/paymentApproval/approvalModify11.vue b/src/views/yinnong/bankAgriculture/paymentApproval/approvalModify11.vue index a0e772e3..981fc60a 100644 --- a/src/views/yinnong/bankAgriculture/paymentApproval/approvalModify11.vue +++ b/src/views/yinnong/bankAgriculture/paymentApproval/approvalModify11.vue @@ -9,6 +9,9 @@ +

基础信息

@@ -372,6 +375,13 @@ this.getFileList(); }, methods: { + goFlow(){ + if(this.form.approvalMode == '1' && this.form.approvalTemplateId != undefined && this.form.approvalTemplateId != "undefined"){ + window.location='approvalProcess3?approvalTemplateId='+this.form.approvalTemplateId+'&approvalMode='+this.form.approvalMode; + }else{ + this.$notify({ type: 'danger', message: '无审批流程!' }); + } + }, onConfirmTemplate(data){ selectApprovalByTemplateId(data.id).then(res => { this.showtemplate = false; diff --git a/src/views/yinnong/bankAgriculture/paymentApproval/approvalModify12.vue b/src/views/yinnong/bankAgriculture/paymentApproval/approvalModify12.vue index 0da92dbd..2d4a8a76 100644 --- a/src/views/yinnong/bankAgriculture/paymentApproval/approvalModify12.vue +++ b/src/views/yinnong/bankAgriculture/paymentApproval/approvalModify12.vue @@ -9,6 +9,9 @@ +

基础信息

@@ -428,6 +431,13 @@ this.getFileList(); }, methods: { + goFlow(){ + if(this.form.approvalMode == '1' && this.form.approvalTemplateId != undefined && this.form.approvalTemplateId != "undefined"){ + window.location='approvalProcess3?approvalTemplateId='+this.form.approvalTemplateId+'&approvalMode='+this.form.approvalMode; + }else{ + this.$notify({ type: 'danger', message: '无审批流程!' }); + } + }, onConfirmTemplate(data){ selectApprovalByTemplateId(data.id).then(res => { this.showtemplate = false; diff --git a/src/views/yinnong/bankAgriculture/paymentApproval/approvalModify2.vue b/src/views/yinnong/bankAgriculture/paymentApproval/approvalModify2.vue index e50efe9b..cafa0175 100644 --- a/src/views/yinnong/bankAgriculture/paymentApproval/approvalModify2.vue +++ b/src/views/yinnong/bankAgriculture/paymentApproval/approvalModify2.vue @@ -9,6 +9,9 @@ +

基础信息

@@ -442,6 +445,13 @@ this.getFileList(); }, methods: { + goFlow(){ + if(this.form.approvalMode == '1' && this.form.approvalTemplateId != undefined && this.form.approvalTemplateId != "undefined"){ + window.location='approvalProcess3?approvalTemplateId='+this.form.approvalTemplateId+'&approvalMode='+this.form.approvalMode; + }else{ + this.$notify({ type: 'danger', message: '无审批流程!' }); + } + }, onConfirmTemplate(data){ selectApprovalByTemplateId(data.id).then(res => { this.showtemplate = false; diff --git a/src/views/yinnong/bankAgriculture/paymentApproval/approvalModify3.vue b/src/views/yinnong/bankAgriculture/paymentApproval/approvalModify3.vue index b82c1771..82ea545f 100644 --- a/src/views/yinnong/bankAgriculture/paymentApproval/approvalModify3.vue +++ b/src/views/yinnong/bankAgriculture/paymentApproval/approvalModify3.vue @@ -9,6 +9,9 @@ +

基础信息

@@ -334,6 +337,13 @@ this.getFileList(); }, methods: { + goFlow(){ + if(this.form.approvalMode == '1' && this.form.approvalTemplateId != undefined && this.form.approvalTemplateId != "undefined"){ + window.location='approvalProcess3?approvalTemplateId='+this.form.approvalTemplateId+'&approvalMode='+this.form.approvalMode; + }else{ + this.$notify({ type: 'danger', message: '无审批流程!' }); + } + }, getDictionaries(){ getTransfer(this.$route.query.id).then((response) => { this.getDicts("capital_expenditure_type").then((res) => { diff --git a/src/views/yinnong/bankAgriculture/paymentApproval/approvalModify4.vue b/src/views/yinnong/bankAgriculture/paymentApproval/approvalModify4.vue index 6df9d462..4fc53524 100644 --- a/src/views/yinnong/bankAgriculture/paymentApproval/approvalModify4.vue +++ b/src/views/yinnong/bankAgriculture/paymentApproval/approvalModify4.vue @@ -9,6 +9,9 @@ +

基础信息

@@ -415,6 +418,13 @@ this.getFileList(); }, methods: { + goFlow(){ + if(this.form.approvalMode == '1' && this.form.approvalTemplateId != undefined && this.form.approvalTemplateId != "undefined"){ + window.location='approvalProcess3?approvalTemplateId='+this.form.approvalTemplateId+'&approvalMode='+this.form.approvalMode; + }else{ + this.$notify({ type: 'danger', message: '无审批流程!' }); + } + }, getDictionaries(){ getTransfer(this.$route.query.id).then((response) => { this.getDicts("capital_expenditure_type").then((res) => { diff --git a/src/views/yinnong/bankAgriculture/paymentApproval/approvalModify5.vue b/src/views/yinnong/bankAgriculture/paymentApproval/approvalModify5.vue index aa2e3804..02a97f21 100644 --- a/src/views/yinnong/bankAgriculture/paymentApproval/approvalModify5.vue +++ b/src/views/yinnong/bankAgriculture/paymentApproval/approvalModify5.vue @@ -9,6 +9,9 @@ +

基础信息

@@ -341,6 +344,13 @@ this.getFileList(); }, methods: { + goFlow(){ + if(this.form.approvalMode == '1' && this.form.approvalTemplateId != undefined && this.form.approvalTemplateId != "undefined"){ + window.location='approvalProcess3?approvalTemplateId='+this.form.approvalTemplateId+'&approvalMode='+this.form.approvalMode; + }else{ + this.$notify({ type: 'danger', message: '无审批流程!' }); + } + }, getDictionaries(){ getTransfer(this.$route.query.id).then((response) => { this.getDicts("capital_expenditure_type").then((res) => { diff --git a/src/views/yinnong/bankAgriculture/paymentApproval/approvalProcess.vue b/src/views/yinnong/bankAgriculture/paymentApproval/approvalProcess.vue index c290d293..740c570b 100644 --- a/src/views/yinnong/bankAgriculture/paymentApproval/approvalProcess.vue +++ b/src/views/yinnong/bankAgriculture/paymentApproval/approvalProcess.vue @@ -57,7 +57,7 @@ -

审批流程

+

审批流程

@@ -124,15 +124,18 @@ export default { if(this.form.auditStatus != 0){ this.getTransferProcess(this.$route.query.id); } - selectApprovalByTemplateId(this.form.approvalTemplateId).then(rs => { - this.approvalTemplateDeptList = rs.approvalDepts; - this.approvalTemplateDetailList = rs.approvalDetails; - if(this.form.approveLevel === "1"){ - this.approvalTemplateDetailList.push({"approvalLevel":"3"}); - }else if(this.form.approveLevel === "2"){ - this.approvalTemplateDetailList.push({"approvalLevel":"4"}); - } - }) + if(this.form.approvalMode == 1){ + selectApprovalByTemplateId(this.form.approvalTemplateId).then(rs => { + this.approvalTemplateDeptList = rs.approvalDepts; + this.approvalTemplateDetailList = rs.approvalDetails; + console.log("this.approvalTemplateDetailList:"+this.approvalTemplateDetailList); + if(this.form.approveLevel === "1"){ + this.approvalTemplateDetailList.push({"approvalLevel":"3"}); + }else if(this.form.approveLevel === "2"){ + this.approvalTemplateDetailList.push({"approvalLevel":"4"}); + } + }) + } 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 d646b30e..6c27426d 100644 --- a/src/views/yinnong/bankAgriculture/paymentApproval/approvalProcess2.vue +++ b/src/views/yinnong/bankAgriculture/paymentApproval/approvalProcess2.vue @@ -57,7 +57,7 @@
-

审批流程

+

审批流程

@@ -129,15 +129,18 @@ export default { if(this.form.auditStatus != 0){ this.getTransferProcess1(this.$route.query.id); } - selectApprovalByTemplateId(this.form.approvalTemplateId).then(rs => { - this.approvalTemplateDeptList = rs.approvalDepts; - this.approvalTemplateDetailList = rs.approvalDetails; - if(this.form.approveLevel === "1"){ - this.approvalTemplateDetailList.push({"approvalLevel":"3"}); - }else if(this.form.approveLevel === "2"){ - this.approvalTemplateDetailList.push({"approvalLevel":"4"}); - } - }) + if(this.form.approvalMode == 1){ + selectApprovalByTemplateId(this.form.approvalTemplateId).then(rs => { + this.approvalTemplateDeptList = rs.approvalDepts; + this.approvalTemplateDetailList = rs.approvalDetails; + console.log("this.approvalTemplateDetailList:"+this.approvalTemplateDetailList); + if(this.form.approveLevel === "1"){ + this.approvalTemplateDetailList.push({"approvalLevel":"3"}); + }else if(this.form.approveLevel === "2"){ + this.approvalTemplateDetailList.push({"approvalLevel":"4"}); + } + }) + } if(this.form.capitalExpenditureType==2){ this.capitalExpenditureOpen = true let param={ diff --git a/src/views/yinnong/bankAgriculture/paymentApproval/approvalProcess3.vue b/src/views/yinnong/bankAgriculture/paymentApproval/approvalProcess3.vue new file mode 100644 index 00000000..451e9ef7 --- /dev/null +++ b/src/views/yinnong/bankAgriculture/paymentApproval/approvalProcess3.vue @@ -0,0 +1,128 @@ + + + + +