From fb243f3345c6f3ed7e7c8c2d98c39b5afc782b9a Mon Sep 17 00:00:00 2001 From: wupengfei <834520024@qq.com> Date: 星期一, 20 十月 2025 10:24:40 +0800 Subject: [PATCH] Merge branch 'master' of http://120.26.58.240:8888/r/flexJobMiniApp --- apps/bMiniApp/src/subpackages/task/taskCheck/InnerPage.vue | 22 ++++++++++++++++++---- 1 files changed, 18 insertions(+), 4 deletions(-) diff --git a/apps/bMiniApp/src/subpackages/task/taskCheck/InnerPage.vue b/apps/bMiniApp/src/subpackages/task/taskCheck/InnerPage.vue index a8ed12a..a4fc732 100644 --- a/apps/bMiniApp/src/subpackages/task/taskCheck/InnerPage.vue +++ b/apps/bMiniApp/src/subpackages/task/taskCheck/InnerPage.vue @@ -36,8 +36,9 @@ <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 +47,21 @@ 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> -- Gitblit v1.9.1