From fabe25575a7b8c8d4bef61c4ef4deaa7dc219cfe Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期一, 03 三月 2025 01:20:00 +0800
Subject: [PATCH] Merge branch 'dev'
---
src/views/projectProcess/detail/index.vue | 12 +++---------
1 files changed, 3 insertions(+), 9 deletions(-)
diff --git a/src/views/projectProcess/detail/index.vue b/src/views/projectProcess/detail/index.vue
index d7d4f59..412ab09 100644
--- a/src/views/projectProcess/detail/index.vue
+++ b/src/views/projectProcess/detail/index.vue
@@ -23,7 +23,7 @@
<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(7, 'willOvertime')" :class="{'item-warm': true, 'willOvertime-color': true, 'active': 7 === selectTabId}">涓存湡浜嬮」锛�0锛�</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>
<div style="display: flex;justify-content: center;align-items: center;margin-top: 20px; position: relative">
@@ -391,19 +391,13 @@
if (row.taskStatus != '宸插畬鎴�') {
return null
}
- if (row.handlerType === 'USER') {
- return null;
- } else if (row.handlerType === 'DEPT') {
- return row.handlerUnitName.join("銆�")
- } else if (row.handlerType === 'ROLE') {
- return row.handlerUnitName.join('銆�')
- }
+ return row.handlerUnitName.join("銆�")
},
candidateFormatter(row) {
if (row.taskStatus != '宸插畬鎴�') {
return null
}
- return row.handlerName.join('銆�')
+ return row.handlerName.join("銆�")
// if (row.handlerType === 'USER') {
// return row.handlerName.join('銆�')
// } else if (row.handlerType === 'DEPT') {
--
Gitblit v1.8.0