From 53605d638044f3129cb622d44bd6c2026b7978cd Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期四, 16 一月 2025 22:41:31 +0800
Subject: [PATCH] Merge branch 'master' of http://42.193.1.25:9521/r/project_management-vue
---
src/views/projectProcess/detail/index.vue | 24 ++++++++++++++++--------
1 files changed, 16 insertions(+), 8 deletions(-)
diff --git a/src/views/projectProcess/detail/index.vue b/src/views/projectProcess/detail/index.vue
index 207b6a4..3c05cf5 100644
--- a/src/views/projectProcess/detail/index.vue
+++ b/src/views/projectProcess/detail/index.vue
@@ -18,7 +18,7 @@
</div>
<div class="search-warp">
<div @click="changeTab(1, 'all')" :class="{'item-warm': true, 'all-color': true, 'active': 1 === selectTabId}">鍏ㄩ儴浜嬮」<span v-if="detailData && detailData.statistics">锛坽{detailData.statistics.totalTaskNum}}锛�</span></div>
- <div @click="changeTab(2, 'todo')" :class="{'item-warm': true, 'all-color': true, 'active': 2 === selectTabId}">浠ｅ姙浜嬮」<span v-if="detailData && detailData.statistics">锛坽{detailData.statistics.todoTaskNum}}锛�</span></div>
+ <div @click="changeTab(2, 'todo')" :class="{'item-warm': true, 'all-color': true, 'active': 2 === selectTabId}">寰呭姙浜嬮」<span v-if="detailData && detailData.statistics">锛坽{detailData.statistics.todoTaskNum}}锛�</span></div>
<div @click="changeTab(3, 'todo')" :class="{'item-warm': true, 'current-color': true, 'active': 3 === selectTabId}">褰撳墠鐜妭</div>
<div @click="changeTab(4, 'remaining')" :class="{'item-warm': true, 'remaining-color': true, 'active': 4 === selectTabId}">鍓╀綑浜嬮」<span v-if="detailData && detailData.statistics">锛坽{detailData.statistics.remainingTaskNum}}锛�</span></div>
<div @click="changeTab(5, 'timely')" :class="{'item-warm': true, 'timely-color': true, 'active': 5 === selectTabId}">鎸夋椂瀹屾垚锛�0锛�</div>
@@ -148,9 +148,16 @@
},
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()
},
@@ -178,7 +185,7 @@
if (row.taskStatus !== '宸插畬鎴�') {
return null
} else {
- return row.handlerName
+ return row.actualHandlerUserName
}
},
showHandle(row) {
@@ -204,11 +211,13 @@
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,
@@ -246,11 +255,12 @@
this.getList()
},
getList() {
+ this.tableLoading = true
// 鑾峰彇浠诲姟鍒楄〃
getProjectProcessDetailTaskList(this.queryParams).then(res => {
+ this.tableLoading =false
this.taskList = res.data
this.total = res.total
- this.tableLoading =false
})
},
// 鏌ヨ璇︽儏
@@ -263,14 +273,12 @@
})
},
changeTab(id, event) {
- this.tableLoading = true
let beforeId = this.selectTabId
this.selectTabId = id
this.queryParams.taskType = event
if (beforeId !== id) {
this.getList()
}
-
}
}
}
--
Gitblit v1.8.0