From ba48054b6f2680cfa1a0b3b912880925a8b5861b Mon Sep 17 00:00:00 2001 From: zhengyiming <540361168@qq.com> Date: 星期三, 13 八月 2025 15:33:47 +0800 Subject: [PATCH] fix: 验收管理 --- apps/bMiniApp/src/subpackages/task/taskCheck/InnerPage.vue | 46 +++++++++++++++++++++++++++++++++++----------- 1 files changed, 35 insertions(+), 11 deletions(-) diff --git a/apps/bMiniApp/src/subpackages/task/taskCheck/InnerPage.vue b/apps/bMiniApp/src/subpackages/task/taskCheck/InnerPage.vue index 2010249..bbcb6a8 100644 --- a/apps/bMiniApp/src/subpackages/task/taskCheck/InnerPage.vue +++ b/apps/bMiniApp/src/subpackages/task/taskCheck/InnerPage.vue @@ -1,7 +1,7 @@ <template> - <Calendar v-model="queryMenuState.time"></Calendar> + <Calendar v-model="queryState.date"></Calendar> <ProTabs - v-model="queryMenuState.checkReceiveStatus" + v-model="queryState.checkReceiveStatus" name="task-tab" :showPaneContent="false" class="task-tabs" @@ -9,14 +9,17 @@ title-gutter="8" title-scroll > - <ProTabPane :title="`寰呮彁浜" :pane-key="EnumTaskCheckReceiveStatus.Wait"></ProTabPane> - <ProTabPane :title="`寰呴獙鏀禶" :pane-key="EnumTaskCheckReceiveStatus.Wait"></ProTabPane> + <ProTabPane :title="`寰呮彁浜" :pane-key="EnumTaskCheckReceiveStatus.WaitSubmit"></ProTabPane> + <ProTabPane + :title="`寰呴獙鏀禶" + :pane-key="EnumTaskCheckReceiveStatus.WaitCheckReceive" + ></ProTabPane> <ProTabPane :title="`宸查獙鏀禶" :pane-key="EnumTaskCheckReceiveStatus.Completed"></ProTabPane> </ProTabs> <InfiniteLoading scrollViewClassName="common-infinite-scroll-list" v-bind="infiniteLoadingProps" - :key="queryMenuState.checkReceiveStatus" + :key="queryState.checkReceiveStatus" > <template #renderItem="{ item }"> <MyTaskCard @@ -34,19 +37,40 @@ import { MyTaskCard, ProTabs, ProTabPane, Calendar } from '@12333/components'; import Taro from '@tarojs/taro'; import { EnumTaskCheckReceiveStatus } from '@12333/constants'; -import { useTaskList } from '@12333/hooks'; +import { useInfiniteLoading, useTaskList } from '@12333/hooks'; +import * as taskCheckReceiveServices from '@12333/services/apiV2/taskCheckReceive'; +import dayjs from 'dayjs'; defineOptions({ name: 'InnerPage', }); -const { queryMenuState, infiniteLoadingProps } = useTaskList({ - defaultQueryMenuState: { - checkReceiveStatus: EnumTaskCheckReceiveStatus.Wait, - }, +const queryState = reactive({ + date: dayjs().toDate(), + checkReceiveStatus: EnumTaskCheckReceiveStatus.WaitSubmit, }); -function goSubmitTaskDetail(item: API.GetTaskInfosQueryResultItem) { +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], + } +); + +function goSubmitTaskDetail(item: API.GetCheckReceiveTasksQueryResultItem) { Taro.navigateTo({ url: `${RouterPath.taskCheckDetail}?taskId=${item.id}`, }); -- Gitblit v1.9.1