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 | 69 ++++++++++++++++++++++++----------
1 files changed, 49 insertions(+), 20 deletions(-)
diff --git a/apps/bMiniApp/src/subpackages/task/taskCheck/InnerPage.vue b/apps/bMiniApp/src/subpackages/task/taskCheck/InnerPage.vue
index a8ed12a..355261a 100644
--- a/apps/bMiniApp/src/subpackages/task/taskCheck/InnerPage.vue
+++ b/apps/bMiniApp/src/subpackages/task/taskCheck/InnerPage.vue
@@ -1,5 +1,5 @@
<template>
- <Calendar v-model="queryState.date"></Calendar>
+ <Calendar key="calendar" v-model="queryState.date"></Calendar>
<ProTabs
v-model="queryState.checkReceiveStatus"
name="task-tab"
@@ -16,28 +16,31 @@
></ProTabPane>
<ProTabPane :title="`宸查獙鏀禶" :pane-key="EnumTaskCheckReceiveStatus.Completed"></ProTabPane>
</ProTabs>
- <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 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 { EnumTaskCheckReceiveStatus } from '@12333/constants';
+import { EnumTaskCheckReceiveStatus, EnumTaskCheckReceiveMethod } from '@12333/constants';
import { useCheckReceiveTasks } from '@12333/hooks';
+import dayjs from 'dayjs';
defineOptions({
name: 'InnerPage',
@@ -46,8 +49,34 @@
const { queryState, infiniteLoadingProps } = useCheckReceiveTasks();
function goSubmitTaskDetail(item: API.GetCheckReceiveTasksQueryResultItem) {
- Taro.navigateTo({
- url: `${RouterPath.taskCheckDetail}?id=${item.id}&date=${queryState.date}&checkReceiveStatus=${queryState.checkReceiveStatus}`,
- });
+ 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')}`,
+ });
+ } else {
+ Taro.navigateTo({
+ url: `${RouterPath.taskCheckDetail}?id=${item.id}&date=${dayjs(queryState.date).format(
+ 'YYYY-MM-DD'
+ )}&checkReceiveStatus=${queryState.checkReceiveStatus}`,
+ });
+ }
}
</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