From 0088d05b69bea0f7877a8ca1f1a0d850b20ee097 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期三, 25 十二月 2024 11:15:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/projectProcess/detail/index.vue | 51 ++++++++++++++++++++-------------------------------
1 files changed, 20 insertions(+), 31 deletions(-)
diff --git a/src/views/projectProcess/detail/index.vue b/src/views/projectProcess/detail/index.vue
index c3415ed..352f65f 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
@@ -131,6 +131,7 @@
}
},
mounted() {
+ console.log(this.$route.query, "鍙傛暟")
this.queryParams.projectId = this.$route.query.projectId
this.queryParams.processDefId = this.$route.query.processDefId
this.loading = true
@@ -143,8 +144,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,45 +155,32 @@
}
},
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,
+ goBackParams: this.queryParams
}
})
- // } 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',
query: {
procInsId: row.processInsId,
deployId: row.deployId,
- taskId: row.taskId
+ taskId: row.taskId,
+ goBackParams: this.queryParams
}})
},
search() {
--
Gitblit v1.8.0