From 579bbf7f5e190c190eaef16adc1c92ce85f6e107 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期二, 10 十二月 2024 14:21:06 +0800
Subject: [PATCH] 流程推进详情页:待办按钮的显隐逻辑完善
---
src/store/modules/user.js | 6 ++++++
src/views/projectProcess/detail/index.vue | 46 ++++++++++++++++------------------------------
2 files changed, 22 insertions(+), 30 deletions(-)
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index cdbab1e..115cb18 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -7,6 +7,7 @@
id: '',
name: '',
avatar: '',
+ deptId: null,
roles: [],
permissions: []
},
@@ -26,6 +27,9 @@
},
SET_ROLES: (state, roles) => {
state.roles = roles
+ },
+ SET_DEPT: (state, deptId) => {
+ state.deptId = deptId
},
SET_PERMISSIONS: (state, permissions) => {
state.permissions = permissions
@@ -64,7 +68,9 @@
}
commit('SET_ID', user.userId)
commit('SET_NAME', user.userName)
+ commit('SET_DEPT', user.deptId)
commit('SET_AVATAR', avatar)
+
resolve(res)
}).catch(error => {
reject(error)
diff --git a/src/views/projectProcess/detail/index.vue b/src/views/projectProcess/detail/index.vue
index c3415ed..c21ec20 100644
--- a/src/views/projectProcess/detail/index.vue
+++ b/src/views/projectProcess/detail/index.vue
@@ -53,13 +53,13 @@
>
</el-table-column>
<el-table-column
- prop="promoterName"
- label="鍙戣捣浜�"
+ prop="promoterUnitName"
+ label="鍙戣捣鍗曚綅"
>
</el-table-column>
<el-table-column
- prop="promoterUnitName"
- label="鍙戣捣鍗曚綅"
+ prop="promoterName"
+ label="鍙戣捣浜�"
>
</el-table-column>
<el-table-column
@@ -143,8 +143,9 @@
if (row.handlerType === "USER") {
return this.$store.state.user.id === row.handlerId
} else if (row.handlerType === "DEPT") {
- // return this.$store.state.user.id === row.handlerId
- return this.$store.state.user.name === '甯傚彂灞曟敼闈╁' || this.$store.state.user.name === '甯備綇寤哄眬'
+ console.log(this.$store.state.user.deptId, "閮ㄩ棬id", row.handlerUnitId)
+ return this.$store.state.user.deptId === row.handlerUnitId
+ // return this.$store.state.user.name === '甯傚彂灞曟敼闈╁' || this.$store.state.user.name === '甯備綇寤哄眬'
} else if (row.handlerType === "ROLE") {
return this.$auth.hasRole(row.handlerUnitName)
}
@@ -153,38 +154,23 @@
}
},
goToDo(row) {
- // TODO 杩欓噷鐨勫垽鏂潯浠舵牴鎹疄闄呮儏鍐佃缃�
- // let params = {
- // processDefId: row.processDefId,
- // taskId: row.taskId
- // }
- // getTaskIsAuditing(params).then(res => {
- //
- // })
- // if (this.showHandle(row)) {
- console.log("zhe")
+ // 鏌ヨ璇ヤ换鍔℃槸鍚﹂厤缃簡闇�瑕佸鎵�
+ let params = {
+ processDefId: row.processDefId,
+ taskId: row.taskId
+ }
+ getTaskIsAuditing(params).then(res => {
this.$router.push({
path: '/flowable/task/myProcess/send/index',
query: {
deployId: row.deployId,
procDefId: row.processDefId,
processName: row.taskName,
- taskId: row.taskId
+ taskId: row.taskId,
+ showAuditing: res.data
}
})
- // } else {
- // this.$router.push({
- // path: '/flowable/task/todo/detail/index',
- // query: {
- // taskName: row.taskName,
- // startUser: row.promoterName,
- // deployId: row.deployId,
- // taskId: row.taskId,
- // procInsId: row.processInsId,
- // executionId: row.executionId
- // }
- // })
- // }
+ })
},
goToProcessDetail(row) {
this.$router.push({ path: '/flowable/task/myProcess/detail/index',
--
Gitblit v1.8.0