From 354fa08d53f4cd97014bfb0008c8c5f0326bbdd3 Mon Sep 17 00:00:00 2001 From: zhengyiming <540361168@qq.com> Date: 星期一, 11 八月 2025 09:38:35 +0800 Subject: [PATCH] Merge branch 'master' of http://120.26.58.240:8888/r/flexJobMiniApp --- apps/bMiniApp/src/subpackages/task/taskManage/InnerPage.vue | 25 ++++++++++++++++--------- 1 files changed, 16 insertions(+), 9 deletions(-) diff --git a/apps/bMiniApp/src/subpackages/task/taskManage/InnerPage.vue b/apps/bMiniApp/src/subpackages/task/taskManage/InnerPage.vue index 9944fd9..b877a4a 100644 --- a/apps/bMiniApp/src/subpackages/task/taskManage/InnerPage.vue +++ b/apps/bMiniApp/src/subpackages/task/taskManage/InnerPage.vue @@ -8,8 +8,11 @@ title-gutter="8" title-scroll > - <ProTabPane :title="`寰呭畨鎺�(${notCount})`" :pane-key="EnumTaskStatus.Wait"></ProTabPane> - <ProTabPane :title="`宸插畨鎺�(${hasCount})`" :pane-key="EnumTaskStatus.Complete"></ProTabPane> + <ProTabPane :title="`寰呭畨鎺�(${waitAssignCount})`" :pane-key="EnumTaskStatus.Wait"></ProTabPane> + <ProTabPane + :title="`宸插畨鎺�(${completedAssignCount})`" + :pane-key="EnumTaskStatus.Complete" + ></ProTabPane> </ProTabs> <InfiniteLoading scrollViewClassName="common-infinite-scroll-list" @@ -50,19 +53,23 @@ import { JobApplicationCard, ProTabs, ProTabPane } from '@12333/components'; import Taro from '@tarojs/taro'; import { EnumTaskStatus, BillingMethodEnumUnit, Colors } from '@12333/constants'; -import { useTaskList } from '@/hooks/task'; +import { useTaskList } from '@12333/hooks'; defineOptions({ name: 'InnerPage', }); -const { queryMenuState, infiniteLoadingProps } = useTaskList(); - -const hasCount = computed(() => { - return infiniteLoadingProps.value?.listData?.pages?.[0]?.objectData?.hasCount ?? 0; +const { queryMenuState, infiniteLoadingProps } = useTaskList({ + defaultQueryMenuState: { + status: EnumTaskStatus.Wait, + }, }); -const notCount = computed(() => { - return infiniteLoadingProps.value?.listData?.pages?.[0]?.objectData?.notCount ?? 0; + +const completedAssignCount = computed(() => { + return infiniteLoadingProps.value?.listData?.pages?.[0]?.objectData?.completedAssignCount ?? 0; +}); +const waitAssignCount = computed(() => { + return infiniteLoadingProps.value?.listData?.pages?.[0]?.objectData?.waitAssignCount ?? 0; }); function goSubmitTaskDetail(item: API.GetTaskInfosQueryResultItem) { -- Gitblit v1.9.1