From 762ee921146f8557c2b9ce96df36ad85959c0f18 Mon Sep 17 00:00:00 2001
From: wupengfei <834520024@qq.com>
Date: 星期五, 24 十月 2025 11:30:19 +0800
Subject: [PATCH] fix: bug
---
apps/bMiniApp/src/subpackages/task/taskUserSubmitCheckHistories/InnerPage.vue | 55 +++++++++++++++++++++++++++++++------------------------
1 files changed, 31 insertions(+), 24 deletions(-)
diff --git a/apps/bMiniApp/src/subpackages/task/taskUserSubmitCheckHistories/InnerPage.vue b/apps/bMiniApp/src/subpackages/task/taskUserSubmitCheckHistories/InnerPage.vue
index 0d74f59..e44ff6e 100644
--- a/apps/bMiniApp/src/subpackages/task/taskUserSubmitCheckHistories/InnerPage.vue
+++ b/apps/bMiniApp/src/subpackages/task/taskUserSubmitCheckHistories/InnerPage.vue
@@ -1,5 +1,8 @@
<template>
<LoadingLayout>
+ <ContentView>
+ <ChunkTitle :title="title" />
+ </ContentView>
<ProTabs
v-model="queryState.type"
name="taskUserSubmitCheckHistories-tab"
@@ -11,27 +14,22 @@
>
<ProTabPane :title="`鍏ㄩ儴`" :pane-key="0"></ProTabPane>
<ProTabPane
- :title="EnumTaskUserSubmitCheckHistoryTypeText[EnumTaskUserSubmitCheckHistoryType.CheckIn]"
- :pane-key="EnumTaskUserSubmitCheckHistoryType.CheckIn"
- ></ProTabPane>
- <ProTabPane
- :title="EnumTaskUserSubmitCheckHistoryTypeText[EnumTaskUserSubmitCheckHistoryType.CheckOut]"
- :pane-key="EnumTaskUserSubmitCheckHistoryType.CheckOut"
+ :title="
+ EnumGetCheckReceiveTaskCheckInUsersQueryStatusText[
+ EnumGetCheckReceiveTaskCheckInUsersQueryStatus.CheckOut
+ ]
+ "
+ :pane-key="EnumGetCheckReceiveTaskCheckInUsersQueryStatus.CheckOut"
></ProTabPane>
<ProTabPane
:title="
- EnumTaskUserSubmitCheckHistoryTypeText[EnumTaskUserSubmitCheckHistoryType.UnCheckIn]
+ EnumGetCheckReceiveTaskCheckInUsersQueryStatusText[
+ EnumGetCheckReceiveTaskCheckInUsersQueryStatus.UnCheck
+ ]
"
- :pane-key="EnumTaskUserSubmitCheckHistoryType.UnCheckIn"
- ></ProTabPane>
- <ProTabPane
- :title="
- EnumTaskUserSubmitCheckHistoryTypeText[EnumTaskUserSubmitCheckHistoryType.UnCheckOut]
- "
- :pane-key="EnumTaskUserSubmitCheckHistoryType.UnCheckOut"
+ :pane-key="EnumGetCheckReceiveTaskCheckInUsersQueryStatus.UnCheck"
></ProTabPane>
</ProTabs>
- <ChunkTitle :title="title" />
<InfiniteLoading
scrollViewClassName="common-infinite-scroll-list"
v-bind="infiniteLoadingProps"
@@ -43,8 +41,7 @@
:gender="item.gender"
:isReal="item.isReal"
:contactPhoneNumber="item.contactPhoneNumber"
- :type="item.type"
- :checkTime="item.checkTime"
+ @click="goDetail(item)"
/>
</template>
</InfiniteLoading>
@@ -55,13 +52,14 @@
import Taro from '@tarojs/taro';
import * as taskCheckReceiveServices from '@12333/services/apiV2/taskCheckReceive';
import { useInfiniteLoading } from '@12333/hooks';
-import TaskCheckHistoryCard from '../components/TaskCheckHistoryCard.vue';
-import { ProTabs, ProTabPane } from '@12333/components';
+import { ProTabs, ProTabPane, TaskCheckHistoryCard } from '@12333/components';
import {
EnumTaskUserSubmitCheckHistoryTypeText,
EnumTaskUserSubmitCheckHistoryTypeColor,
EnumTaskUserSubmitCheckHistoryType,
WeekCN,
+ EnumGetCheckReceiveTaskCheckInUsersQueryStatus,
+ EnumGetCheckReceiveTaskCheckInUsersQueryStatusText,
} from '@12333/constants';
import { Message, setOSSLink } from '@12333/utils';
import dayjs from 'dayjs';
@@ -77,28 +75,37 @@
const title = `${dayjs(date).format('YYYY骞碝M鏈圖D鏃�')} 鏄熸湡${WeekCN[dayjs(date).day()]}`;
const queryState = reactive({
- type: 0 as any as EnumTaskUserSubmitCheckHistoryType,
+ type: 0 as any as EnumGetCheckReceiveTaskCheckInUsersQueryStatus,
});
const { infiniteLoadingProps } = useInfiniteLoading(
async ({ pageParam }) => {
- let params: API.GetCheckReceiveTaskUserSubmitCheckHistoriesQuery = {
+ let params: API.GetCheckReceiveTaskCheckInUsersQuery = {
pageModel: {
rows: 20,
page: pageParam,
},
taskInfoId: id,
date: dayjs(date).format('YYYY-MM-DD'),
- type: queryState.type,
};
- let res = await taskCheckReceiveServices.getCheckReceiveTaskUserSubmitCheckHistories(params, {
+ if (Number(queryState.type) !== 0) {
+ params.status = queryState.type;
+ }
+
+ let res = await taskCheckReceiveServices.getCheckReceiveTaskCheckInUsers(params, {
showLoading: false,
});
return res;
},
{
- queryKey: ['taskCheckReceiveServices/getCheckReceiveTaskUserSubmitCheckHistories', queryState],
+ queryKey: ['taskCheckReceiveServices/getCheckReceiveTaskCheckInUsers', queryState],
}
);
+
+function goDetail(item: API.GetCheckReceiveTaskCheckInUsersQueryResultItem) {
+ Taro.navigateTo({
+ url: `${RouterPath.taskUserSubmitCheckHistoriesDetail}?id=${id}&date=${date}&taskInfoUserId=${item.id}`,
+ });
+}
</script>
--
Gitblit v1.9.1