From 92b51e47eb0e53e1e8e13aa0f9135603e1bb03a0 Mon Sep 17 00:00:00 2001
From: zhengyiming <540361168@qq.com>
Date: 星期日, 19 十月 2025 14:38:36 +0800
Subject: [PATCH] fix: 验收管理
---
apps/bMiniApp/src/subpackages/task/taskCheck/InnerPage.vue | 45 +++++++++++++++++++++++++++++----------------
1 files changed, 29 insertions(+), 16 deletions(-)
diff --git a/apps/bMiniApp/src/subpackages/task/taskCheck/InnerPage.vue b/apps/bMiniApp/src/subpackages/task/taskCheck/InnerPage.vue
index 2010249..b8760a6 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="queryMenuState.time"></Calendar>
+ <Calendar v-model="queryState.date"></Calendar>
<ProTabs
- v-model="queryMenuState.checkReceiveStatus"
+ v-model="queryState.checkReceiveStatus"
name="task-tab"
:showPaneContent="false"
class="task-tabs"
@@ -9,14 +9,17 @@
title-gutter="8"
title-scroll
>
- <ProTabPane :title="`寰呮彁浜" :pane-key="EnumTaskCheckReceiveStatus.Wait"></ProTabPane>
- <ProTabPane :title="`寰呴獙鏀禶" :pane-key="EnumTaskCheckReceiveStatus.Wait"></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="queryMenuState.checkReceiveStatus"
+ :key="queryState.checkReceiveStatus"
>
<template #renderItem="{ item }">
<MyTaskCard
@@ -33,22 +36,32 @@
<script setup lang="ts">
import { MyTaskCard, ProTabs, ProTabPane, Calendar } from '@12333/components';
import Taro from '@tarojs/taro';
-import { EnumTaskCheckReceiveStatus } from '@12333/constants';
-import { useTaskList } from '@12333/hooks';
+import { EnumTaskCheckReceiveStatus, EnumTaskCheckReceiveMethod } from '@12333/constants';
+import { useCheckReceiveTasks } from '@12333/hooks';
+import dayjs from 'dayjs';
defineOptions({
name: 'InnerPage',
});
-const { queryMenuState, infiniteLoadingProps } = useTaskList({
- defaultQueryMenuState: {
- checkReceiveStatus: EnumTaskCheckReceiveStatus.Wait,
- },
-});
+const { queryState, infiniteLoadingProps } = useCheckReceiveTasks();
-function goSubmitTaskDetail(item: API.GetTaskInfosQueryResultItem) {
- Taro.navigateTo({
- url: `${RouterPath.taskCheckDetail}?taskId=${item.id}`,
- });
+function goSubmitTaskDetail(item: API.GetCheckReceiveTasksQueryResultItem) {
+ if (
+ item.checkReceiveMethod === EnumTaskCheckReceiveMethod.CheckIn &&
+ dayjs(queryState.date).isBefore(dayjs())
+ ) {
+ 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