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 | 44 ++++++++++++++++++++++++++++----------------
1 files changed, 28 insertions(+), 16 deletions(-)
diff --git a/apps/bMiniApp/src/subpackages/task/taskCheck/InnerPage.vue b/apps/bMiniApp/src/subpackages/task/taskCheck/InnerPage.vue
index 45989d8..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="queryState.date"></Calendar>
<ProTabs
- v-model="queryState.status"
+ v-model="queryState.checkReceiveStatus"
name="task-tab"
:showPaneContent="false"
class="task-tabs"
@@ -9,16 +9,26 @@
title-gutter="8"
title-scroll
>
- <ProTabPane :title="`寰呴獙鏀禶" :pane-key="10"></ProTabPane>
- <ProTabPane :title="`宸查獙鏀禶" :pane-key="20"></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="queryState.status"
+ :key="queryState.checkReceiveStatus"
>
<template #renderItem="{ item }">
- <MyTaskCard @click="goSubmitTaskDetail(item)" />
+ <MyTaskCard
+ :name="item.name"
+ :beginTime="item.beginTime"
+ :endTime="item.endTime"
+ :addressName="item.addressName"
+ @click="goSubmitTaskDetail(item)"
+ />
</template>
</InfiniteLoading>
</template>
@@ -26,41 +36,43 @@
<script setup lang="ts">
import { MyTaskCard, ProTabs, ProTabPane, Calendar } from '@12333/components';
import Taro from '@tarojs/taro';
-import { useInfiniteLoading } from '@12333/hooks';
-import { OrderInputType } from '@12333/constants';
-import * as flexWorkerServices from '@12333/services/api/FlexWorker';
+import { EnumTaskCheckReceiveStatus } from '@12333/constants';
+import { useInfiniteLoading, useTaskList } from '@12333/hooks';
+import * as taskCheckReceiveServices from '@12333/services/apiV2/taskCheckReceive';
+import dayjs from 'dayjs';
defineOptions({
name: 'InnerPage',
});
const queryState = reactive({
- status: 10,
- date: new Date(),
+ date: dayjs().toDate(),
+ checkReceiveStatus: EnumTaskCheckReceiveStatus.WaitSubmit,
});
const { infiniteLoadingProps } = useInfiniteLoading(
({ pageParam }) => {
- let params: API.GetFlexTaskListInput = {
+ let params: API.GetCheckReceiveTasksQuery = {
pageModel: {
rows: 20,
page: pageParam,
- orderInput: [{ property: 'lastShelfTime', order: OrderInputType.Desc }],
},
+ date: dayjs(queryState.date).format('YYYY-MM-DD'),
+ checkReceiveStatus: queryState.checkReceiveStatus,
};
- return flexWorkerServices.getFlexTaskByArrange(params, {
+ return taskCheckReceiveServices.getCheckReceiveTasks(params, {
showLoading: false,
});
},
{
- queryKey: ['flexWorkerServices/getFlexTaskByArrange', queryState],
+ queryKey: ['taskCheckReceiveServices/getCheckReceiveTasks', queryState],
}
);
-function goSubmitTaskDetail(item: API.GetFlexTaskListOutput) {
+function goSubmitTaskDetail(item: API.GetCheckReceiveTasksQueryResultItem) {
Taro.navigateTo({
- url: `${RouterPath.taskCheckDetail}?id=${item.id}`,
+ url: `${RouterPath.taskCheckDetail}?taskId=${item.id}`,
});
}
</script>
--
Gitblit v1.9.1