From e87846bfc7e467836d958632b15a22a901eb51d2 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期四, 09 一月 2025 15:33:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/projectProcess/detail/index.vue | 109 +++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 74 insertions(+), 35 deletions(-)
diff --git a/src/views/projectProcess/detail/index.vue b/src/views/projectProcess/detail/index.vue
index c3415ed..207b6a4 100644
--- a/src/views/projectProcess/detail/index.vue
+++ b/src/views/projectProcess/detail/index.vue
@@ -6,7 +6,7 @@
<h2>椤圭洰鍚嶇О锛歿{detailData.projectName}}</h2>
</div>
<div class="project-info">
- <div class="project-info-item"></div>
+ <div class="project-info-item">娴佺▼鍚嶇О锛歿{queryParams.processName}}</div>
<div class="project-info-item">椤圭洰浠ｇ爜锛歿{detailData.projectCode}}</div>
<div class="project-info-item">
<div style="color: black">
@@ -48,8 +48,8 @@
>
</el-table-column>
<el-table-column
- prop="processName"
- label="娴佺▼鍚嶇О"
+ prop="promoterUnitName"
+ label="鍙戣捣鍗曚綅"
>
</el-table-column>
<el-table-column
@@ -58,21 +58,36 @@
>
</el-table-column>
<el-table-column
- prop="promoterUnitName"
- label="鍙戣捣鍗曚綅"
+ align="center"
+ prop="handlerType"
+ label="澶勭悊鏂圭被鍨�"
>
+ <template slot-scope="scope">
+ <el-tag v-if="scope.row.handlerType === 'USER'">浜哄憳璐﹀彿</el-tag>
+ <el-tag type="success" v-else-if="scope.row.handlerType === 'DEPT'">鍗曚綅</el-tag>
+ <el-tag type="info" v-else-if="scope.row.handlerType === 'ROLE'">瑙掕壊</el-tag>
+ </template>
</el-table-column>
<el-table-column
prop="handlerUnitName"
label="澶勭悊鍗曚綅"
+ :formatter="unitFormatter"
+ >
+ </el-table-column>
+ <el-table-column
+ prop="handlerName"
+ label="鍊欓�夊鐞嗕汉"
+ :formatter="candidateFormatter"
>
</el-table-column>
<el-table-column
prop="handlerName"
label="瀹為檯澶勭悊浜�"
+ :formatter="finalFinishedFormatter"
>
</el-table-column>
<el-table-column
+ align="center"
prop="taskStatus"
label="浠诲姟鐘舵��"
>
@@ -111,7 +126,7 @@
} from "@/api/projectProcess/projectProcess";
export default {
- name: "index",
+ name: "Detail",
data() {
return {
loading: false,
@@ -127,24 +142,54 @@
currentPage: 1,
projectId: null,
processDefId: null,
+ processName: '' // 娴佺▼鍚嶇О
}
}
},
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
this.loading = true
this.getProjectProcessInfo()
},
methods: {
+ unitFormatter(row) {
+ if (row.handlerType === 'USER') {
+ return null;
+ } else if (row.handlerType === 'DEPT') {
+ return row.handlerUnitName.join("銆�")
+ } else if (row.handlerType === 'ROLE') {
+ return row.handlerUnitName.join('銆�')
+ }
+ },
+ candidateFormatter(row) {
+ if (row.handlerType === 'USER') {
+ return row.handlerName.join('銆�')
+ } else if (row.handlerType === 'DEPT') {
+ return row.handlerUnitName.join('銆�')
+ } else if (row.handlerType === 'ROLE') {
+ return row.handlerUnitName.join('銆�')
+ }
+ },
+ finalFinishedFormatter(row) {
+ // 涓嶆槸宸插畬鎴愮殑鐘舵�佹病鏈夊疄闄呭鐞嗕汉锛屽凡瀹屾垚鐨勭姸鎬佸彧鏈変竴涓汉
+ if (row.taskStatus !== '宸插畬鎴�') {
+ return null
+ } else {
+ return row.handlerName
+ }
+ },
showHandle(row) {
- console.log(this.$store.state.user, "鐢ㄦ埛淇℃伅")
if (row.taskStatus === '寰呭姙') {
if (row.handlerType === "USER") {
- return this.$store.state.user.id === row.handlerId
+ console.log(row.handlerId.indexOf(this.$store.state.user.id) !== -1, "鎴戞槸涓嶆槸")
+ return row.handlerId.indexOf(this.$store.state.user.id) !== -1
} 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 row.handlerUnitId.indexOf(this.$store.state.user.deptId) !== -1
+ // return this.$store.state.user.name === '甯傚彂灞曟敼闈╁' || this.$store.state.user.name === '甯備綇寤哄眬'
} else if (row.handlerType === "ROLE") {
return this.$auth.hasRole(row.handlerUnitName)
}
@@ -153,56 +198,50 @@
}
},
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
+ flowName: this.queryParams.processName,
+ projectName: this.detailData.projectName,
+ 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: {
+ projectName: this.detailData.projectName,
+ flowName: this.queryParams.processName,
procInsId: row.processInsId,
deployId: row.deployId,
- taskId: row.taskId
+ taskId: row.taskId,
+ goBackParams: this.queryParams
}})
},
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