From b3dc565fe8a341bdb069b8f0feb912cd751a589f Mon Sep 17 00:00:00 2001
From: wupengfei <834520024@qq.com>
Date: 星期四, 14 八月 2025 09:12:27 +0800
Subject: [PATCH] Merge branch 'master' of http://120.26.58.240:8888/r/flexJobMiniApp
---
apps/bMiniApp/src/subpackages/task/taskCheck/InnerPage.vue | 53 ++++++++++++++++++++---------------------------------
1 files changed, 20 insertions(+), 33 deletions(-)
diff --git a/apps/bMiniApp/src/subpackages/task/taskCheck/InnerPage.vue b/apps/bMiniApp/src/subpackages/task/taskCheck/InnerPage.vue
index b30a8be..a8ed12a 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,18 @@
<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 orderServices from '@12333/services/api/Order';
+import { EnumTaskCheckReceiveStatus } from '@12333/constants';
+import { useCheckReceiveTasks } from '@12333/hooks';
defineOptions({
name: 'InnerPage',
});
-const queryState = reactive({
- status: 10,
- date: new Date(),
-});
+const { queryState, infiniteLoadingProps } = useCheckReceiveTasks();
-const { infiniteLoadingProps } = useInfiniteLoading(
- ({ pageParam }) => {
- let params: API.FrontOrderListInput = {
- pageModel: {
- rows: 20,
- page: pageParam,
- orderInput: [{ property: 'lastShelfTime', order: OrderInputType.Desc }],
- },
- };
-
- return orderServices.getFrontOrderList(params, {
- showLoading: false,
- });
- },
- {
- queryKey: ['orderServices/getFrontOrderList', queryState],
- }
-);
-
-function goSubmitTaskDetail(item: API.FrontOrderList) {
+function goSubmitTaskDetail(item: API.GetCheckReceiveTasksQueryResultItem) {
Taro.navigateTo({
- url: `${RouterPath.taskCheckDetail}?id=${item.id}`,
+ url: `${RouterPath.taskCheckDetail}?id=${item.id}&date=${queryState.date}&checkReceiveStatus=${queryState.checkReceiveStatus}`,
});
}
</script>
--
Gitblit v1.9.1