From ba48054b6f2680cfa1a0b3b912880925a8b5861b Mon Sep 17 00:00:00 2001 From: zhengyiming <540361168@qq.com> Date: 星期三, 13 八月 2025 15:33:47 +0800 Subject: [PATCH] fix: 验收管理 --- packages/hooks/task.ts | 69 ++++++++++++++++++++++++++++++++-- 1 files changed, 65 insertions(+), 4 deletions(-) diff --git a/packages/hooks/task.ts b/packages/hooks/task.ts index b0c4928..d092212 100644 --- a/packages/hooks/task.ts +++ b/packages/hooks/task.ts @@ -2,6 +2,7 @@ import { EnumPagedListOrder, EnumSettlementCycle, + EnumTaskCheckReceiveStatus, EnumTaskRecommendStatus, EnumTaskReleaseStatus, EnumTaskStatus, @@ -11,6 +12,8 @@ import { trim } from '@12333/utils'; import { MaybeRef, reactive, ref, unref } from 'vue'; import * as taskServices from '@12333/services/apiV2/task'; +import dayjs from 'dayjs'; +import * as taskCheckReceiveServices from '@12333/services/apiV2/taskCheckReceive'; export enum HomeOrderType { Recommend = 'Recommend', @@ -20,10 +23,24 @@ type UseTaskListOptions = { cityCode?: MaybeRef<string>; enabled?: MaybeRef<boolean>; + + defaultQueryMenuState?: { + releaseStatus?: EnumTaskReleaseStatus; + status?: EnumTaskStatus; + genderLimit?: EnumUserGender; + settlementCycle?: EnumSettlementCycle; + checkReceiveStatus?: EnumTaskCheckReceiveStatus; + benefitCodes?: string; + enterpriseId?: string; + time?: Date; + }; }; +/** + * @description 浠匔绔娇鐢� + */ export function useTaskList(options: UseTaskListOptions = {}) { - const { cityCode = '', enabled = true } = options; + const { cityCode = '', enabled = true, defaultQueryMenuState = {} } = options; const searchValue = ref(''); @@ -32,7 +49,11 @@ settlementCycle: '' as any as EnumSettlementCycle, benefitCodes: '', status: '' as any as EnumTaskStatus, - releaseStatus: EnumTaskReleaseStatus.InProcess, + releaseStatus: '' as any as EnumTaskReleaseStatus, + checkReceiveStatus: '' as any as EnumTaskCheckReceiveStatus, + enterpriseId: '', + time: '' as any as Date, + ...defaultQueryMenuState, }); const queryState = reactive({ @@ -63,14 +84,22 @@ genderLimit: queryMenuState.genderLimit, status: queryMenuState.status, releaseStatus: queryMenuState.releaseStatus, + checkReceiveStatus: queryMenuState.checkReceiveStatus, + enterpriseId: queryMenuState.enterpriseId, + beginTime: queryMenuState.time + ? dayjs(queryMenuState.time).format('YYYY-MM-DD 00:00:00') + : '', + endTime: queryMenuState.time + ? dayjs(queryMenuState.time).format('YYYY-MM-DD 23:59:59') + : '', }; - return taskServices.getTaskInfos(params, { + return taskServices.getOpenTaskInfos(params, { showLoading: false, }); }, { - queryKey: ['taskServices/getTaskInfos', queryState, queryMenuState, cityCode], + queryKey: ['taskServices/getOpenTaskInfos', queryState, queryMenuState, cityCode], enabled: enabled, } ); @@ -84,3 +113,35 @@ invalidateQueries, }; } + +export function useCheckReceiveTasks() { + const queryState = reactive({ + date: dayjs().toDate(), + checkReceiveStatus: EnumTaskCheckReceiveStatus.WaitSubmit, + }); + + const { infiniteLoadingProps } = useInfiniteLoading( + ({ pageParam }) => { + let params: API.GetCheckReceiveTasksQuery = { + pageModel: { + rows: 20, + page: pageParam, + }, + date: dayjs(queryState.date).format('YYYY-MM-DD'), + checkReceiveStatus: queryState.checkReceiveStatus, + }; + + return taskCheckReceiveServices.getCheckReceiveTasks(params, { + showLoading: false, + }); + }, + { + queryKey: ['taskCheckReceiveServices/getCheckReceiveTasks', queryState], + } + ); + + return { + queryState, + infiniteLoadingProps, + }; +} -- Gitblit v1.9.1