From ef6fb5968914c3396d1e448c193459f0cc468618 Mon Sep 17 00:00:00 2001 From: zhengyiming <540361168@qq.com> Date: 星期五, 08 八月 2025 16:50:14 +0800 Subject: [PATCH] Merge branch 'master' of http://120.26.58.240:8888/r/flexJobMiniApp --- apps/bMiniApp/src/subpackages/task/taskManage/InnerPage.vue | 4 +++- apps/bMiniApp/src/subpackages/jobApplicationManage/jobApplicationManage/InnerPage.vue | 4 +++- packages/hooks/task.ts | 13 ++++++++++--- 3 files changed, 16 insertions(+), 5 deletions(-) diff --git a/apps/bMiniApp/src/subpackages/jobApplicationManage/jobApplicationManage/InnerPage.vue b/apps/bMiniApp/src/subpackages/jobApplicationManage/jobApplicationManage/InnerPage.vue index 3a23ff1..cd00822 100644 --- a/apps/bMiniApp/src/subpackages/jobApplicationManage/jobApplicationManage/InnerPage.vue +++ b/apps/bMiniApp/src/subpackages/jobApplicationManage/jobApplicationManage/InnerPage.vue @@ -58,7 +58,9 @@ name: 'InnerPage', }); -const { queryMenuState, infiniteLoadingProps, invalidateQueries } = useTaskList(); +const { queryMenuState, infiniteLoadingProps, invalidateQueries } = useTaskList({ + releaseStatus: EnumTaskReleaseStatus.InProcess, +}); const releaseing = computed(() => { return infiniteLoadingProps.value?.listData?.pages?.[0]?.objectData?.releaseing ?? 0; diff --git a/apps/bMiniApp/src/subpackages/task/taskManage/InnerPage.vue b/apps/bMiniApp/src/subpackages/task/taskManage/InnerPage.vue index 047fe29..ea537b6 100644 --- a/apps/bMiniApp/src/subpackages/task/taskManage/InnerPage.vue +++ b/apps/bMiniApp/src/subpackages/task/taskManage/InnerPage.vue @@ -56,7 +56,9 @@ name: 'InnerPage', }); -const { queryMenuState, infiniteLoadingProps } = useTaskList(); +const { queryMenuState, infiniteLoadingProps } = useTaskList({ + status: EnumTaskStatus.Wait, +}); const hasCount = computed(() => { return infiniteLoadingProps.value?.listData?.pages?.[0]?.objectData?.hasCount ?? 0; diff --git a/packages/hooks/task.ts b/packages/hooks/task.ts index b0c4928..edb5783 100644 --- a/packages/hooks/task.ts +++ b/packages/hooks/task.ts @@ -20,10 +20,17 @@ type UseTaskListOptions = { cityCode?: MaybeRef<string>; enabled?: MaybeRef<boolean>; + releaseStatus?: MaybeRef<EnumTaskReleaseStatus>; + status?: MaybeRef<EnumTaskStatus>; }; export function useTaskList(options: UseTaskListOptions = {}) { - const { cityCode = '', enabled = true } = options; + const { + cityCode = '', + enabled = true, + status = '' as any as EnumTaskStatus, + releaseStatus = '' as any as EnumTaskReleaseStatus, + } = options; const searchValue = ref(''); @@ -31,8 +38,8 @@ genderLimit: '' as any as EnumUserGender, settlementCycle: '' as any as EnumSettlementCycle, benefitCodes: '', - status: '' as any as EnumTaskStatus, - releaseStatus: EnumTaskReleaseStatus.InProcess, + status: status, + releaseStatus: releaseStatus, }); const queryState = reactive({ -- Gitblit v1.9.1