From 1fe1b13f0a4e78efe95cc8f34480104903615219 Mon Sep 17 00:00:00 2001 From: zhoulingpo Date: Sat, 6 May 2023 09:46:15 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=BF=AE=E6=94=B9=E3=80=91=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E6=89=80=E6=9C=89=E8=8A=82=E7=82=B9=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/ProcessMixin.vue | 4 ++++ .../components/reportTable.vue | 4 ++-- src/views/permissionApplication/launch.vue | 4 ++-- .../reportProcess/components/reportForm.vue | 6 +++++ src/views/reportProcess/examine.vue | 6 ++--- src/views/reportProcess/launch.vue | 4 ++-- .../processCenter/finishProcess.vue | 24 +++++++++++++++++-- .../userCenter/processCenter/gencyProcess.vue | 24 +++++++++++++++++-- .../monitorProcesses/monitorModal.vue | 2 +- .../userCenter/processCenter/sentProcess.vue | 4 ++-- 10 files changed, 66 insertions(+), 16 deletions(-) diff --git a/src/components/ProcessMixin.vue b/src/components/ProcessMixin.vue index 796e336..ce98f8c 100644 --- a/src/components/ProcessMixin.vue +++ b/src/components/ProcessMixin.vue @@ -12,6 +12,10 @@ label: '权限申请流程', value: '1' }, + { + label: '报告上传流程', + value: '2' + }, ], formDisableFlag: false, nowOrder: '', diff --git a/src/views/permissionApplication/components/reportTable.vue b/src/views/permissionApplication/components/reportTable.vue index f1cb5d4..7faec31 100644 --- a/src/views/permissionApplication/components/reportTable.vue +++ b/src/views/permissionApplication/components/reportTable.vue @@ -156,7 +156,7 @@ export default { cancelButtonText: '取消', type: 'warning' }).then(() => { - if (this.$route.query.taskDefinitionKey == 'aid4' ){ + if (this.$route.query.taskDefinitionKey == 'reEdit' ){ // 有idde console.log(this.value) debugger @@ -217,7 +217,7 @@ export default { cancelButtonText: '取消', type: 'warning' }).then(() => { - if (this.$route.query.taskDefinitionKey == 'aid4' ){ + if (this.$route.query.taskDefinitionKey == 'reEdit' ){ if(row.id && row.id !=''){ // this.$api.permissionProcess.deletReport({ids:[row.id]}).then(()=>{ this.$emit('updateTable',this.value.filter(item => item.id !== row.id),[row.reportId]) diff --git a/src/views/permissionApplication/launch.vue b/src/views/permissionApplication/launch.vue index 2d10ca8..7e1997c 100644 --- a/src/views/permissionApplication/launch.vue +++ b/src/views/permissionApplication/launch.vue @@ -236,7 +236,7 @@ export default { }) } - if (this.$route.query.taskDefinitionKey == 'aid4' ) { + if (this.$route.query.taskDefinitionKey == 'reEdit' ) { this.taskId = this.$store.getters.handleProcess.taskId this.prcNum = this.$store.getters.handleProcess.prcNum this.prcId = this.$store.getters.handleProcess.prcId @@ -376,7 +376,7 @@ export default { }, handleReset() { this.processForm.prcName = '' - if(this.$route.query.taskDefinitionKey == 'aid4'){ + if(this.$route.query.taskDefinitionKey == 'reEdit'){ this.processForm.prcName = this.prcName } this.applicationForm = { diff --git a/src/views/reportProcess/components/reportForm.vue b/src/views/reportProcess/components/reportForm.vue index 9a2a3c2..6403ff5 100644 --- a/src/views/reportProcess/components/reportForm.vue +++ b/src/views/reportProcess/components/reportForm.vue @@ -244,6 +244,12 @@ export default { fileList:[] } }, + watch:{ + processForm(val){ + debugger + this.form=this.processForm + } + }, methods: { loadMore(){ this.q.pageNo++ diff --git a/src/views/reportProcess/examine.vue b/src/views/reportProcess/examine.vue index a0240b5..e1ddbf6 100644 --- a/src/views/reportProcess/examine.vue +++ b/src/views/reportProcess/examine.vue @@ -102,7 +102,7 @@ export default { }, PERMISSION, submitjson:{}, - prcType:1 + prcType:2 } }, created () { @@ -110,7 +110,7 @@ export default { this.prcNum=this.$store.getters.handleProcess.prcNum this.prcId=this.$store.getters.handleProcess.prcId this.prcName=this.$store.getters.handleProcess.prcName - this.$set(this.processForm,'prcName',this.prcName) + let params={ prcId: this.prcId, @@ -121,7 +121,7 @@ export default { } this.getProcessDetail(params).then(res=>{ this.processForm = JSON.parse(this.processOld.dataJson) - + this.$set(this.processForm,'prcName',this.prcName) this.disabled=false this.formControl= true if(this.$route.query.type=='yiban'){ diff --git a/src/views/reportProcess/launch.vue b/src/views/reportProcess/launch.vue index 284260c..5e5c882 100644 --- a/src/views/reportProcess/launch.vue +++ b/src/views/reportProcess/launch.vue @@ -188,7 +188,7 @@ export default { }) } - if (this.$route.query.taskDefinitionKey == 'aid4' ) { + if (this.$route.query.taskDefinitionKey == 'reEdit' ) { this.taskId = this.$store.getters.handleProcess.taskId this.prcNum = this.$store.getters.handleProcess.prcNum this.prcId = this.$store.getters.handleProcess.prcId @@ -231,7 +231,7 @@ export default { methods: { handleReset() { this.processForm.prcName = '' - if(this.$route.query.taskDefinitionKey == 'aid4'){ + if(this.$route.query.taskDefinitionKey == 'reEdit'){ this.processForm.prcName = this.prcName } this.applicationForm = { diff --git a/src/views/userCenter/processCenter/finishProcess.vue b/src/views/userCenter/processCenter/finishProcess.vue index dec8084..321e193 100644 --- a/src/views/userCenter/processCenter/finishProcess.vue +++ b/src/views/userCenter/processCenter/finishProcess.vue @@ -118,7 +118,7 @@ export default { this.$store.commit('setHandleProcess',params) switch (row.prcType) { case '1' : - if (row.taskDefinitionKey == 'aid1' || row.taskDefinitionKey == 'aid4') { + if (row.taskDefinitionKey == 'start' || row.taskDefinitionKey == 'reEdit') { this.$router.push({ path: '/permission/launch', query: { @@ -136,7 +136,27 @@ export default { taskDefinitionKey:row.taskDefinitionKey } }) - } + };break; + case '2' : + if (row.taskDefinitionKey == 'start' || row.taskDefinitionKey == 'reEdit') { + this.$router.push({ + path: '/reportprocess/launch', + query: { + id: this.$route.query.id, + type:'yiban', + taskDefinitionKey:row.taskDefinitionKey + } + }) + }else{ + this.$router.push({ + path: '/reportprocess/examine', + query: { + id: this.$route.query.id, + type:'yiban', + taskDefinitionKey:row.taskDefinitionKey + } + }) + };break; } }, } diff --git a/src/views/userCenter/processCenter/gencyProcess.vue b/src/views/userCenter/processCenter/gencyProcess.vue index 564a99d..ca3e83e 100644 --- a/src/views/userCenter/processCenter/gencyProcess.vue +++ b/src/views/userCenter/processCenter/gencyProcess.vue @@ -109,7 +109,7 @@ export default { switch (row.prcType) { case '1' : debugger - if (row.taskDefinitionKey == 'aid4') { + if (row.taskDefinitionKey == 'reEdit') { this.$router.push({ path: '/permission/launch', query: { @@ -127,7 +127,27 @@ export default { prcName: row.prcName } }) - } + };break; + case '2' : + if (row.taskDefinitionKey == 'start' || row.taskDefinitionKey == 'reEdit') { + this.$router.push({ + path: '/reportprocess/launch', + query: { + id: this.$route.query.id, + prcName: row.prcName, + taskDefinitionKey:row.taskDefinitionKey + } + }) + }else{ + this.$router.push({ + path: '/reportprocess/examine', + query: { + id: this.$route.query.id, + prcName: row.prcName, + taskDefinitionKey:row.taskDefinitionKey + } + }) + };break; } }, }, diff --git a/src/views/userCenter/processCenter/monitorProcesses/monitorModal.vue b/src/views/userCenter/processCenter/monitorProcesses/monitorModal.vue index 1d4109b..38fbeef 100644 --- a/src/views/userCenter/processCenter/monitorProcesses/monitorModal.vue +++ b/src/views/userCenter/processCenter/monitorProcesses/monitorModal.vue @@ -121,7 +121,7 @@ export default { pId: this.pId } if(this.prcType == '1'){ - if(this.aid=='aid2'){ + if(this.aid=='oneApply'){ params.replaceMap="oneApprove:"+ this.form.assignee+','+"oneApproveName:"+ this.form.assigneeName }else{ params.replaceMap="twoApprove:"+ this.form.assignee+','+"twoApproveName:"+ this.form.assigneeName diff --git a/src/views/userCenter/processCenter/sentProcess.vue b/src/views/userCenter/processCenter/sentProcess.vue index 138690e..f7011bc 100644 --- a/src/views/userCenter/processCenter/sentProcess.vue +++ b/src/views/userCenter/processCenter/sentProcess.vue @@ -106,8 +106,8 @@ export default { res.isViewDetails = 1 res.prcType = prcType res.prcNum = row.prcNum - if (res.taskDefinitionKey == 'aid1' || - res.taskDefinitionKey == 'aid4' ) { + if (res.taskDefinitionKey == 'start' || + res.taskDefinitionKey == 'reEdit' ) { this.$router.push({ path: '/permission/launch', query: res,