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(() => {}) ) }