From be607308e10347b8af900c4bf7a715023b9395e8 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期五, 21 三月 2025 16:04:42 +0800
Subject: [PATCH] 首页消息
---
src/views/projectProcess/detail/index.vue | 101 +++++++++++++++++++++-----------------------------
1 files changed, 43 insertions(+), 58 deletions(-)
diff --git a/src/views/projectProcess/detail/index.vue b/src/views/projectProcess/detail/index.vue
index 95a42ab..388a05a 100644
--- a/src/views/projectProcess/detail/index.vue
+++ b/src/views/projectProcess/detail/index.vue
@@ -18,11 +18,11 @@
</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(3, 'todo')" :class="{'item-warm': true, 'current-color': true, 'active': 3 === selectTabId}">褰撳墠鐜妭</div>
+ <div @click="changeTab(2, 'todo')" :class="{'item-warm': true, 'todo-color': true, 'active': 2 === selectTabId}">寰呭姙浜嬮」<span v-if="detailData && detailData.statistics">锛坽{detailData.statistics.todoTaskNum}}锛�</span></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}">鎸夋椂瀹屾垚<span v-if="detailData && detailData.statistics">锛坽{detailData.statistics.timelyFinishedTaskNum}}锛�</span></div>
<div @click="changeTab(6, 'overtime')" :class="{'item-warm': true, 'overtime-color': true, 'active': 6 === selectTabId}">瓒呮椂浜嬮」锛�0锛�</div>
+ <div @click="changeTab(3, 'wait')" :class="{'item-warm': true, 'wait-color': true, 'active': 3 === selectTabId}">瀹圭己浜嬮」</div>
<!-- <div @click="changeTab(7, 'willOvertime')" :class="{'item-warm': true, 'willOvertime-color': true, 'active': 7 === selectTabId}">涓存湡浜嬮」锛�0锛�</div>-->
<div @click="changeTab(8, 'urge')" :class="{'item-warm': true, 'urge-color': true, 'active': 8 === selectTabId}">鐫ｅ姙浜嬮」锛�0锛�</div>
</div>
@@ -73,45 +73,6 @@
:formatter="candidateFormatter"
>
</el-table-column>
-<!-- <el-table-column-->
-<!-- prop="promoterUnitName"-->
-<!-- label="鍙戣捣鍗曚綅"-->
-<!-- >-->
-<!-- </el-table-column>-->
-<!-- <el-table-column-->
-<!-- prop="promoterName"-->
-<!-- label="鍙戣捣浜�"-->
-<!-- >-->
-<!-- </el-table-column>-->
-<!-- <el-table-column-->
-<!-- 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"
@@ -415,14 +376,11 @@
}
},
showHandle(row) {
- if (row.taskStatus === '寰呭姙' || row.taskStatus === '鎸傝捣') {
+ if (row.taskStatus === '寰呭姙' || row.taskStatus === '鎸傝捣' || row.taskStatus === '瀹圭己') {
if (row.handlerType === "USER") {
- 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") {
- 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 === '甯備綇寤哄眬'
+ return row.handlerUnitId.indexOf(this.$store.state.user.deptId) !== -1 || row.handlerUnitId.some(id => this.$store.state.user.childDeptIds.indexOf(id) !== -1)
} else if (row.handlerType === "ROLE") {
return row.handlerUnitId.some(roleId => this.$store.state.user.roleIds.indexOf(roleId) !== -1)
}
@@ -431,13 +389,7 @@
}
},
goToDo(row) {
- // 鏌ヨ璇ヤ换鍔℃槸鍚﹂厤缃簡闇�瑕佸鎵�
- let params = {
- processDefId: row.processDefId,
- taskId: row.taskId
- }
- getTaskIsAuditing(params).then(res => {
- console.log("row",row)
+ if (row.taskStatus === '瀹圭己') {
this.$router.push({
path: '/flowable/task/myProcess/send/index',
query: {
@@ -448,12 +400,38 @@
flowName: this.queryParams.processName,
projectName: this.detailData.projectName,
taskId: row.taskId,
- showAuditing: res.data,
+ showAuditing: false,
projectId: this.queryParams.projectId,
+ isWait: true,
goBackParams: this.queryParams
}
})
- })
+ } else {
+ // 鏌ヨ璇ヤ换鍔℃槸鍚﹂厤缃簡闇�瑕佸鎵�
+ let params = {
+ processDefId: row.processDefId,
+ 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,
+ projectId: this.queryParams.projectId,
+ isWait: false,
+ goBackParams: this.queryParams
+ }
+ })
+ })
+ }
},
goToProcessDetail(row) {
this.$router.push({ path: '/flowable/task/myProcess/detail/index',
@@ -567,6 +545,9 @@
.all-color {
background-color: rgb(180, 253, 255);
}
+.todo-color {
+ background-color: rgb(66, 174, 243);
+}
.current-color {
background-color: rgb(127, 131, 247);
@@ -580,14 +561,18 @@
background-color: rgb(204, 247, 131);
}
.overtime-color {
- background-color: rgb(129, 179, 55);
- color: white;
+ background-color: #e8e866;
}
+
+.wait-color {
+ background-color: orange;
+}
+
.willOvertime-color {
background-color: rgb(255, 248, 29);
}
.urge-color {
- background-color: rgb(0, 0, 0);
+ background-color: red;
color: white;
}
.active {
--
Gitblit v1.8.0