From 0c12b28f7a09c837ca55e725cbc05037ba6fdaeb Mon Sep 17 00:00:00 2001 From: Your Name Date: Wed, 7 Jan 2026 17:25:44 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=BE=85=E6=88=91?= =?UTF-8?q?=E5=AE=A1=E6=A0=B8=E6=A0=87=E7=AD=BE=E9=A1=B5=E6=95=B0=E9=87=8F?= =?UTF-8?q?=E8=AE=A1=E7=AE=97=EF=BC=8C=E5=90=8C=E6=97=B6=E5=8C=85=E5=90=AB?= =?UTF-8?q?=E4=B8=BB=E4=BB=BB=E5=8A=A1=E5=92=8C=E5=AD=90=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E7=BB=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/views/TaskHall.vue | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/frontend/src/views/TaskHall.vue b/frontend/src/views/TaskHall.vue index 43cd1cc..a6e880f 100644 --- a/frontend/src/views/TaskHall.vue +++ b/frontend/src/views/TaskHall.vue @@ -4611,13 +4611,21 @@ const loadAllTabCounts = async () => { }).catch(() => {}) ) - // 6. 待我审核任务数量(仅部门负责人) + // 6. 待我审核任务数量(仅部门负责人)- 需要同时计算主任务和子任务组 if (isDepartmentLeader.value) { promises.push( - taskApi.getPendingApprovalTasks().then(res => { - if (res.code === 200) { - pendingApprovalTotal.value = (res.data || []).length + Promise.all([ + taskApi.getPendingApprovalTasks(), + taskApi.getPendingApprovalTaskGroups() + ]).then(([tasksRes, groupsRes]) => { + let count = 0 + if (tasksRes.code === 200) { + count += (tasksRes.data || []).length } + if (groupsRes.code === 200) { + count += (groupsRes.data || []).length + } + pendingApprovalTotal.value = count }).catch(() => {}) ) }