From 36f2c20ea3df022390b677e782d8a4cd25f21f69 Mon Sep 17 00:00:00 2001
From: zhengyiming <540361168@qq.com>
Date: 星期三, 22 十月 2025 17:02:25 +0800
Subject: [PATCH] Merge branch 'master' of http://120.26.58.240:8888/r/flexJobMiniApp
---
apps/bMiniApp/src/subpackages/task/taskCheck/InnerPage.vue | 105 ++++++++++++++++++++++++++++------------------------
1 files changed, 57 insertions(+), 48 deletions(-)
diff --git a/apps/bMiniApp/src/subpackages/task/taskCheck/InnerPage.vue b/apps/bMiniApp/src/subpackages/task/taskCheck/InnerPage.vue
index aba6805..355261a 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 key="calendar" v-model="queryState.date"></Calendar>
<ProTabs
- v-model="queryState.status"
+ v-model="queryState.checkReceiveStatus"
name="task-tab"
:showPaneContent="false"
class="task-tabs"
@@ -9,65 +9,74 @@
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"
- >
- <template #renderItem="{ item }">
- <MyTaskCard
- :taskName="item.taskName"
- :startDate="item.startDate"
- :endDate="item.endDate"
- :address="item.address"
- @click="goSubmitTaskDetail(item)"
- />
- </template>
- </InfiniteLoading>
+ <div class="task-list-container">
+ <InfiniteLoading
+ scrollViewClassName="common-infinite-scroll-list"
+ v-bind="infiniteLoadingProps"
+ :key="queryState.checkReceiveStatus"
+ >
+ <template #renderItem="{ item }">
+ <MyTaskCard
+ :name="item.name"
+ :beginTime="item.beginTime"
+ :endTime="item.endTime"
+ :addressName="item.addressName"
+ @click="goSubmitTaskDetail(item)"
+ />
+ </template>
+ </InfiniteLoading>
+ </div>
</template>
<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, EnumTaskCheckReceiveMethod } from '@12333/constants';
+import { useCheckReceiveTasks } from '@12333/hooks';
+import dayjs from 'dayjs';
defineOptions({
name: 'InnerPage',
});
-const queryState = reactive({
- status: '10',
- date: new Date(),
-});
+const { queryState, infiniteLoadingProps } = useCheckReceiveTasks();
-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,
+function goSubmitTaskDetail(item: API.GetCheckReceiveTasksQueryResultItem) {
+ if (
+ item.checkReceiveMethod === EnumTaskCheckReceiveMethod.CheckIn &&
+ dayjs(queryState.date).isBefore(dayjs(), 'day')
+ ) {
+ Taro.navigateTo({
+ url: `${RouterPath.taskUserSubmitCheckHistories}?id=${item.id}&date=${dayjs(
+ queryState.date
+ ).format('YYYY-MM-DD')}`,
});
- },
- {
- queryKey: ['flexWorkerServices/getFlexTaskByIsOverCheck', queryState],
+ } else {
+ Taro.navigateTo({
+ url: `${RouterPath.taskCheckDetail}?id=${item.id}&date=${dayjs(queryState.date).format(
+ 'YYYY-MM-DD'
+ )}&checkReceiveStatus=${queryState.checkReceiveStatus}`,
+ });
}
-);
-
-function goSubmitTaskDetail(item: API.GetFlexTaskListOutput) {
- Taro.navigateTo({
- url: `${RouterPath.taskCheckDetail}?taskId=${item.taskId}`,
- });
}
</script>
+
+<style lang="scss">
+@import '@/styles/common.scss';
+
+.taskCheck-page-wrapper {
+ .task-list-container {
+ flex: 1;
+ min-height: 0;
+ display: flex;
+ flex-direction: column;
+ }
+}
+</style>
--
Gitblit v1.9.1