From fb531cbb7ceca6e4c28288b5a988a2700a065c59 Mon Sep 17 00:00:00 2001
From: wupengfei <834520024@qq.com>
Date: 星期一, 11 八月 2025 15:55:34 +0800
Subject: [PATCH] Merge branch 'master' of http://120.26.58.240:8888/r/flexJobMiniApp
---
apps/bMiniApp/src/subpackages/task/taskCheck/InnerPage.vue | 55 ++++++++++++++++++-------------------------------------
1 files changed, 18 insertions(+), 37 deletions(-)
diff --git a/apps/bMiniApp/src/subpackages/task/taskCheck/InnerPage.vue b/apps/bMiniApp/src/subpackages/task/taskCheck/InnerPage.vue
index aba6805..2010249 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>
+ <Calendar v-model="queryMenuState.time"></Calendar>
<ProTabs
- v-model="queryState.status"
+ v-model="queryMenuState.checkReceiveStatus"
name="task-tab"
:showPaneContent="false"
class="task-tabs"
@@ -9,20 +9,21 @@
title-gutter="8"
title-scroll
>
- <ProTabPane title="寰呴獙鏀�" pane-key="10"></ProTabPane>
- <ProTabPane title="宸查獙鏀�" pane-key="20"></ProTabPane>
+ <ProTabPane :title="`寰呮彁浜" :pane-key="EnumTaskCheckReceiveStatus.Wait"></ProTabPane>
+ <ProTabPane :title="`寰呴獙鏀禶" :pane-key="EnumTaskCheckReceiveStatus.Wait"></ProTabPane>
+ <ProTabPane :title="`宸查獙鏀禶" :pane-key="EnumTaskCheckReceiveStatus.Completed"></ProTabPane>
</ProTabs>
<InfiniteLoading
scrollViewClassName="common-infinite-scroll-list"
v-bind="infiniteLoadingProps"
- :key="queryState.status"
+ :key="queryMenuState.checkReceiveStatus"
>
<template #renderItem="{ item }">
<MyTaskCard
- :taskName="item.taskName"
- :startDate="item.startDate"
- :endDate="item.endDate"
- :address="item.address"
+ :name="item.name"
+ :beginTime="item.beginTime"
+ :endTime="item.endTime"
+ :addressName="item.addressName"
@click="goSubmitTaskDetail(item)"
/>
</template>
@@ -32,42 +33,22 @@
<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 { useTaskList } from '@12333/hooks';
defineOptions({
name: 'InnerPage',
});
-const queryState = reactive({
- status: '10',
- date: new Date(),
+const { queryMenuState, infiniteLoadingProps } = useTaskList({
+ defaultQueryMenuState: {
+ checkReceiveStatus: EnumTaskCheckReceiveStatus.Wait,
+ },
});
-const { infiniteLoadingProps } = useInfiniteLoading(
- ({ pageParam }) => {
- let params: API.GetFlexTaskListInput = {
- isOverCheck: queryState.status === '20',
- pageModel: {
- rows: 20,
- page: pageParam,
- orderInput: [{ property: 'creationTime', order: OrderInputType.Desc }],
- },
- };
-
- return flexWorkerServices.getFlexTaskByIsOverCheck(params, {
- showLoading: false,
- });
- },
- {
- queryKey: ['flexWorkerServices/getFlexTaskByIsOverCheck', queryState],
- }
-);
-
-function goSubmitTaskDetail(item: API.GetFlexTaskListOutput) {
+function goSubmitTaskDetail(item: API.GetTaskInfosQueryResultItem) {
Taro.navigateTo({
- url: `${RouterPath.taskCheckDetail}?taskId=${item.taskId}`,
+ url: `${RouterPath.taskCheckDetail}?taskId=${item.id}`,
});
}
</script>
--
Gitblit v1.9.1