From 948e7181f540f4f51fd9fecb67b5b0b2ca25b0c5 Mon Sep 17 00:00:00 2001 From: zhoulingpo Date: Tue, 25 Apr 2023 20:31:14 +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=B5=81=E7=A8=8B=E4=BC=A0=E5=8F=82=E6=96=B9=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/store/index.js | 9 +++++-- src/views/permissionApplication/examine.vue | 8 +++---- src/views/permissionApplication/launch.vue | 18 +++++++------- .../processCenter/finishProcess.vue | 24 +++++++++---------- .../userCenter/processCenter/gencyProcess.vue | 24 +++++++++---------- .../processCenter/monitorProcesses.vue | 10 +++++--- .../monitorProcesses/monitorDetail.vue | 12 +++++----- .../monitorProcesses/monitorModal.vue | 2 +- .../userCenter/processCenter/sentProcess.vue | 9 +++++-- 9 files changed, 65 insertions(+), 51 deletions(-) diff --git a/src/store/index.js b/src/store/index.js index 9d56789..ab2cfcb 100644 --- a/src/store/index.js +++ b/src/store/index.js @@ -12,15 +12,20 @@ export default new Vuex.Store({ menuData: [], pathUrl: '', menuName: '', - activeTab: '' + activeTab: '', + handleProcess: '' }, getters: { menuData: (state) => state.menuData, menuName: (state) => state.menuName, userInfo: (state) => state.userInfo, - activeTab: (state) =>state.activeTab + activeTab: (state) =>state.activeTab, + handleProcess: (state) =>state.handleProcess }, mutations: { + setHandleProcess(state, data){ + state.handleProcess = data + }, setActiveTabIndex(state, data){ state.activeTab = data }, diff --git a/src/views/permissionApplication/examine.vue b/src/views/permissionApplication/examine.vue index 6b94235..cad5239 100644 --- a/src/views/permissionApplication/examine.vue +++ b/src/views/permissionApplication/examine.vue @@ -142,10 +142,10 @@ export default { } }, created () { - this.taskId=this.$route.query.taskId - this.prcNum=this.$route.query.prcNum - this.prcId=this.$route.query.prcId - this.prcName=this.$route.query.prcName + this.taskId=this.$store.getters.handleProcess.taskId + this.prcNum=this.$store.getters.handleProcess.prcNum + this.prcId=this.$store.getters.handleProcess.prcId + this.prcName=this.$store.getters.handleProcess.prcName let params={ prcId: this.prcId, prcType: this.prcType diff --git a/src/views/permissionApplication/launch.vue b/src/views/permissionApplication/launch.vue index 524da9c..8c6236e 100644 --- a/src/views/permissionApplication/launch.vue +++ b/src/views/permissionApplication/launch.vue @@ -201,11 +201,11 @@ export default { } this.handleReset() } - if (this.$route.query.taskDefinitionKey == 'aid4') { - this.taskId = this.$route.query.taskId - this.prcNum = this.$route.query.prcNum - this.prcId = this.$route.query.prcId - this.prcName = this.$route.query.prcName + if (this.$store.getters.handleProcess.taskDefinitionKey == 'aid4') { + this.taskId = this.$store.getters.handleProcess.taskId + this.prcNum = this.$store.getters.handleProcess.prcNum + this.prcId = this.$store.getters.handleProcess.prcId + this.prcName = this.$store.getters.handleProcess.prcName this.initShow = true this.formControlname = true @@ -221,10 +221,10 @@ export default { }) } if (this.$route.query.type == 'yiban') { - this.taskId = this.$route.query.taskId - this.prcNum = this.$route.query.prcNum - this.prcId = this.$route.query.prcId - this.prcName = this.$route.query.prcName + this.taskId = this.$store.getters.handleProcess.taskId + this.prcNum = this.$store.getters.handleProcess.prcNum + this.prcId = this.$store.getters.handleProcess.prcId + this.prcName = this.$store.getters.handleProcess.prcName this.formControl = true this.initShow = true this.showTableD = true diff --git a/src/views/userCenter/processCenter/finishProcess.vue b/src/views/userCenter/processCenter/finishProcess.vue index d0690e1..b40dbe8 100644 --- a/src/views/userCenter/processCenter/finishProcess.vue +++ b/src/views/userCenter/processCenter/finishProcess.vue @@ -106,32 +106,32 @@ export default { this.loadData(); }, view(row) { + let params={ + id: this.$route.query.id, + taskId:row.taskId, + type:'yiban', + taskDefinitionKey: row.taskDefinitionKey, + prcNum: row.prcNum, + prcId: row.prcId, + prcName: row.prcName, + } + this.$store.commit('setHandleProcess',params) switch (row.prcType) { case '1' : if (row.taskDefinitionKey == 'aid1' || row.taskDefinitionKey == 'aid3') { this.$router.push({ path: '/permission/launch', query: { - id: 'AEHJB8YNJ3', - taskId:row.taskId, + id: this.$route.query.id, type:'yiban', - taskDefinitionKey: row.taskDefinitionKey, - prcNum: row.prcNum, - prcId: row.prcId, - prcName: row.prcName, } }) }else{ this.$router.push({ path: '/permission/examine', query: { - id: 'AEHJB8YNJ3', - taskId:row.taskId, + id: this.$route.query.id, type:'yiban', - taskDefinitionKey: row.taskDefinitionKey, - prcNum: row.prcNum, - prcId: row.prcId , - prcName: row.prcName } }) } diff --git a/src/views/userCenter/processCenter/gencyProcess.vue b/src/views/userCenter/processCenter/gencyProcess.vue index a38d767..14f56ca 100644 --- a/src/views/userCenter/processCenter/gencyProcess.vue +++ b/src/views/userCenter/processCenter/gencyProcess.vue @@ -96,30 +96,30 @@ export default { this.loadData(); }, handle(row) { + let params={ + id: this.$route.query.id, + taskId:row.taskId, + type:'yiban', + taskDefinitionKey: row.taskDefinitionKey, + prcNum: row.prcNum, + prcId: row.prcId, + prcName: row.prcName, + } + this.$store.commit('setHandleProcess',params) switch (row.prcType) { case '1' : if (row.taskDefinitionKey == 'aid4') { this.$router.push({ path: '/permission/launch', query: { - id: 'AEHJB8YNJ3', - taskId:row.taskId, - prcNum: row.prcNum, - prcId: row.prcId, - prcName: row.prcName, - taskDefinitionKey: row.taskDefinitionKey + id: this.$route.query.id } }) }else{ this.$router.push({ path: '/permission/examine', query: { - id: 'AEHJB8YNJ3', - taskId:row.taskId, - prcNum: row.prcNum, - prcId: row.prcId, - prcName: row.prcName, - taskDefinitionKey: row.taskDefinitionKey + id: this.$route.query.id } }) } diff --git a/src/views/userCenter/processCenter/monitorProcesses.vue b/src/views/userCenter/processCenter/monitorProcesses.vue index 60cb9f1..8042419 100644 --- a/src/views/userCenter/processCenter/monitorProcesses.vue +++ b/src/views/userCenter/processCenter/monitorProcesses.vue @@ -106,13 +106,17 @@ export default { this.loadData(); }, view(row) { + let params={ + id: this.$route.query.id, + prcNum: row.prcNum, + prcType: row.prcType, + prcId: row.prcId, + } + this.$store.commit('setHandleProcess',params) this.$router.push({ path: 'monitorViews', query:{ id: this.$route.query.id, - prcNum: row.prcNum, - prcType: row.prcType, - prcId: row.prcId, tabsName: 'MonitorProcess' } }) diff --git a/src/views/userCenter/processCenter/monitorProcesses/monitorDetail.vue b/src/views/userCenter/processCenter/monitorProcesses/monitorDetail.vue index 47c4fde..c0ff838 100644 --- a/src/views/userCenter/processCenter/monitorProcesses/monitorDetail.vue +++ b/src/views/userCenter/processCenter/monitorProcesses/monitorDetail.vue @@ -122,7 +122,7 @@ export default { methods: { exportStandard (){ let exportName='' - let pramas={prcNum: this.$route.query.prcNum, + let pramas={prcNum: this.$store.getters.handleProcess.prcNum, sortWord: this.shunxu ? this.paixu : '', shunxu: this.shunxu, exportName: exportName} @@ -233,7 +233,7 @@ export default { if(check.length > 0){ this.$message.warning("请选择状态为未完成的数据") }else{ - this.$refs.monitorModal.open(this.checkIds,this.checkList[0].taskId,this.checkList[0].assigneeId) + this.$refs.monitorModal.open(this.checkIds[0].taskId,this.prcId,this.checkList[0].assigneeId) } } }, @@ -280,10 +280,10 @@ export default { }, props: {}, mounted () { - this.tabsName=this.$route.query.tabsName - this.prcType=this.$route.query.prcType - this.prcNum=this.$route.query.prcNum - this.prcId=this.$route.query.prcId + this.tabsName=this.$store.getters.handleProcess.tabsName + this.prcType=this.$store.getters.handleProcess.prcType + this.prcNum=this.$store.getters.handleProcess.prcNum + this.prcId=this.$store.getters.handleProcess.prcId this.processNum() this.processTable() } diff --git a/src/views/userCenter/processCenter/monitorProcesses/monitorModal.vue b/src/views/userCenter/processCenter/monitorProcesses/monitorModal.vue index 4eabd3b..2508d2f 100644 --- a/src/views/userCenter/processCenter/monitorProcesses/monitorModal.vue +++ b/src/views/userCenter/processCenter/monitorProcesses/monitorModal.vue @@ -111,7 +111,7 @@ export default { this.$message.warning("当前任务受理人就是您选择的人员") } else { this.$api.process.changeAssignee({ - taskId: this.taskId.join(','), + taskId: this.taskId, assignee: assignee, userId: userId, pId: this.pId diff --git a/src/views/userCenter/processCenter/sentProcess.vue b/src/views/userCenter/processCenter/sentProcess.vue index 5f155b7..138690e 100644 --- a/src/views/userCenter/processCenter/sentProcess.vue +++ b/src/views/userCenter/processCenter/sentProcess.vue @@ -161,12 +161,17 @@ export default { this.loadData(); }, view(row) { + let params={ + id: this.$route.query.id, + prcNum: row.prcNum, + prcType: row.prcType, + tabsName: 'AlreadyProcess' + } + this.$store.commit('setHandleProcess',params) this.$router.push({ path: 'monitorViews', query: { id: this.$route.query.id, - prcNum: row.prcNum, - prcType: row.prcType, tabsName: 'AlreadyProcess' } })