diff --git a/jero-web/src/views/processCenter/processForm/taskListProcess/index.vue b/jero-web/src/views/processCenter/processForm/taskListProcess/index.vue index 92f24d749..26060f554 100644 --- a/jero-web/src/views/processCenter/processForm/taskListProcess/index.vue +++ b/jero-web/src/views/processCenter/processForm/taskListProcess/index.vue @@ -324,14 +324,19 @@ putAction(this.url.dreSubmit, query).then((res) => { if (res.success) { this.$message.success(this.$t('OperationSuccessful')) - - this.$router.push({ - path: '/ProjectDetails', - query: { - type: '103', - ...this.$route.query - } - }) + if (this.$route.query.router) { + this.$router.push({ + path: '/projectRegulationTasks' + }) + } else { + this.$router.push({ + path: '/ProjectDetails', + query: { + type: '103', + ...this.$route.query + } + }) + } // setTimeout(() => { // this.loading = false // window.close() @@ -375,13 +380,19 @@ if (res.success) { setTimeout(() => { this.loading = false - this.$router.push({ - path: '/ProjectDetails', - query: { - type: '103', - ...this.$route.query - } - }) + if (this.$route.query.router) { + this.$router.push({ + path: '/projectRegulationTasks' + }) + } else { + this.$router.push({ + path: '/ProjectDetails', + query: { + type: '103', + ...this.$route.query + } + }) + } }, 1000) } }) diff --git a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/SentList.vue b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/SentList.vue index ee8dbc592..eb14bf25b 100644 --- a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/SentList.vue +++ b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/SentList.vue @@ -144,6 +144,7 @@ }, viewClick(row) { let query = {} + row.router = this.$route.path if (row.flowType == '1') { query = { taskDefinitionKey: row.taskDefinitionKey, @@ -176,6 +177,7 @@ row.taskId = '' } query = { + router: row.router, taskIds: row.taskId, actiProcInstId: row.actiProcInstId, projectTaskInventoryId: row.projectLawsInventoryId, @@ -209,6 +211,7 @@ row.taskId = '' } query = { + router: row.router, taskIds: row.taskId, actiProcInstId: row.actiProcInstId, projectTaskInventoryId: row.projectLawsInventoryId, @@ -242,6 +245,7 @@ row.taskId = '' } query = { + router: row.router, taskIds: row.taskId, actiProcInstId: row.actiProcInstId, id: row.projectLibraryId, diff --git a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/dealtWith.vue b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/dealtWith.vue index 7e5df27af..0b13ca53e 100644 --- a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/dealtWith.vue +++ b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/dealtWith.vue @@ -137,6 +137,7 @@ }, ProcessingClick(row) { let query = {} + row.router = this.$route.path if (row.flowType == '1') { query = { taskDefinitionKey: row.taskDefinitionKey, @@ -169,6 +170,7 @@ row.taskId = '' } query = { + router: row.router, taskIds: row.taskId, actiProcInstId: row.actiProcInstId, projectTaskInventoryId: row.projectLawsInventoryId, @@ -202,6 +204,7 @@ row.taskId = '' } query = { + router: row.router, taskIds: row.taskId, actiProcInstId: row.actiProcInstId, projectTaskInventoryId: row.projectLawsInventoryId, @@ -235,6 +238,7 @@ row.taskId = '' } query = { + router: row.router, taskIds: row.taskId, actiProcInstId: row.actiProcInstId, id: row.projectLibraryId, diff --git a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/doneList.vue b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/doneList.vue index 6b0459add..aca73eb2f 100644 --- a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/doneList.vue +++ b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/doneList.vue @@ -144,6 +144,7 @@ }, viewClick(row) { let query = {} + row.router = this.$route.path if (row.flowType == '1') { query = { taskDefinitionKey:row.taskDefinitionKey, @@ -176,6 +177,7 @@ row.taskId = '' } query = { + router: row.router, taskIds:row.taskId, actiProcInstId: row.actiProcInstId, projectTaskInventoryId: row.projectLawsInventoryId, @@ -209,6 +211,7 @@ row.taskId = '' } query = { + router: row.router, taskIds:row.taskId, actiProcInstId: row.actiProcInstId, projectTaskInventoryId: row.projectLawsInventoryId, @@ -242,6 +245,7 @@ row.taskId = '' } query = { + router: row.router, taskIds: row.taskId, actiProcInstId: row.actiProcInstId, id: row.projectLibraryId,