From 78e5ece58bf05ed6f344239f40b49dbe90956cce Mon Sep 17 00:00:00 2001 From: fuliqi <fuliqi@qq.com> Date: 星期二, 14 一月 2025 17:54:01 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- src/views/projectProcess/detail/index.vue | 23 ++++++++++++++++++++--- 1 files changed, 20 insertions(+), 3 deletions(-) diff --git a/src/views/projectProcess/detail/index.vue b/src/views/projectProcess/detail/index.vue index 7398d8a..adf4bc1 100644 --- a/src/views/projectProcess/detail/index.vue +++ b/src/views/projectProcess/detail/index.vue @@ -148,9 +148,17 @@ }, mounted() { console.log(this.$route.query, "鍙傛暟") - this.queryParams.projectId = this.$route.query.projectId - this.queryParams.processDefId = this.$route.query.processDefId - this.queryParams.processName = this.$route.query.processName + + let params = JSON.parse(sessionStorage.getItem("projectProDetail")) + console.log(params, "鍙傛暟") + if (!params || ! params.projectId) { + this.queryParams.projectId = this.$route.query.projectId + this.queryParams.processDefId = this.$route.query.processDefId + this.queryParams.processName = this.$route.query.processName + sessionStorage.setItem("projectProDetail", JSON.stringify(this.queryParams)) + } else { + this.queryParams = params + } this.loading = true this.getProjectProcessInfo() }, @@ -204,12 +212,16 @@ taskId: row.taskId } getTaskIsAuditing(params).then(res => { + console.log("row",row) this.$router.push({ path: '/flowable/task/myProcess/send/index', query: { deployId: row.deployId, procDefId: row.processDefId, + procInsId: row.processInsId, processName: row.taskName, + flowName: this.queryParams.processName, + projectName: this.detailData.projectName, taskId: row.taskId, showAuditing: res.data, goBackParams: this.queryParams @@ -220,6 +232,8 @@ goToProcessDetail(row) { this.$router.push({ path: '/flowable/task/myProcess/detail/index', query: { + projectName: this.detailData.projectName, + flowName: this.queryParams.processName, procInsId: row.processInsId, deployId: row.deployId, taskId: row.taskId, @@ -228,13 +242,16 @@ }, search() { this.queryParams.currentPage = 1; + this.tableLoading = true this.getList() }, sizeChange(pageSize) { + this.tableLoading = true this.queryParams.pageSize = pageSize; this.getList() }, pageChange(pageNum) { + this.tableLoading = true this.queryParams.currentPage = pageNum; this.getList() }, -- Gitblit v1.8.0