From 5e06f2f05feab4d0e4bae091a7154a0ec3a8cf65 Mon Sep 17 00:00:00 2001
From: wupengfei <834520024@qq.com>
Date: 星期四, 23 十月 2025 19:44:59 +0800
Subject: [PATCH] fix: bug
---
apps/bMiniApp/src/subpackages/task/taskUserSubmitCheckHistoriesDetail/InnerPage.vue | 72 ++++++++++
apps/bMiniApp/src/subpackages/task/taskUserSubmitCheckHistoriesDetail/taskUserSubmitCheckHistoriesDetail.vue | 13 +
apps/cMiniApp/src/subpackages/task/taskUserSubmitCheckHistoriesDetail/InnerPage.vue | 72 ++++++++++
packages/services/apiV2/taskCheckReceive.ts | 18 ++
apps/bMiniApp/src/subpackages/task/taskUserSubmitCheckHistoriesDetail/taskUserSubmitCheckHistoriesDetail.config.ts | 3
packages/constants/task.ts | 11 +
apps/bMiniApp/src/constants/router.ts | 1
apps/cMiniApp/src/subpackages/task/taskUserSubmitCheckHistories/InnerPage.vue | 44 +++---
apps/cMiniApp/src/subpackages/task/taskUserSubmitCheckHistoriesDetail/taskUserSubmitCheckHistoriesDetail.vue | 13 +
apps/bMiniApp/project.private.config.json | 7
apps/bMiniApp/src/app.config.ts | 1
apps/cMiniApp/src/subpackages/task/taskUserSubmitCheckHistoriesDetail/taskUserSubmitCheckHistoriesDetail.config.ts | 3
apps/cMiniApp/src/constants/router.ts | 1
packages/services/apiV2/typings.d.ts | 65 ++++++++
apps/cMiniApp/src/app.config.ts | 1
apps/bMiniApp/src/subpackages/task/taskUserSubmitCheckHistories/InnerPage.vue | 45 +++---
packages/constants/apiEnum.ts | 10 +
17 files changed, 330 insertions(+), 50 deletions(-)
diff --git a/apps/bMiniApp/project.private.config.json b/apps/bMiniApp/project.private.config.json
index 0e6bce7..e7a6d11 100644
--- a/apps/bMiniApp/project.private.config.json
+++ b/apps/bMiniApp/project.private.config.json
@@ -17,8 +17,7 @@
"showES6CompileOption": false,
"checkInvalidKey": true,
"ignoreDevUnusedFiles": true,
- "useIsolateContext": true,
- "skylineRenderEnable": false
+ "useIsolateContext": true
},
"condition": {
"miniprogram": {
@@ -27,8 +26,8 @@
"name": "鍙戣柂璇︽儏",
"pathName": "subpackages/payrollManage/payrollManageDetail/payrollManageDetail",
"query": "id=ed553142-801d-40b4-5582-08de0fa2a04b&operatorToken=627f56a2-d8a2-4606-b69f-36eadf770ecb",
- "scene": null,
- "launchMode": "default"
+ "launchMode": "default",
+ "scene": null
}
]
}
diff --git a/apps/bMiniApp/src/app.config.ts b/apps/bMiniApp/src/app.config.ts
index 2b04637..61d04c3 100644
--- a/apps/bMiniApp/src/app.config.ts
+++ b/apps/bMiniApp/src/app.config.ts
@@ -95,6 +95,7 @@
'taskManage/taskManage',
'batchTaskList/batchTaskList',
'taskUserSubmitCheckHistories/taskUserSubmitCheckHistories',
+ 'taskUserSubmitCheckHistoriesDetail/taskUserSubmitCheckHistoriesDetail',
],
},
{
diff --git a/apps/bMiniApp/src/constants/router.ts b/apps/bMiniApp/src/constants/router.ts
index f39368a..d086285 100644
--- a/apps/bMiniApp/src/constants/router.ts
+++ b/apps/bMiniApp/src/constants/router.ts
@@ -52,6 +52,7 @@
taskManage = '/subpackages/task/taskManage/taskManage',
batchTaskList = '/subpackages/task/batchTaskList/batchTaskList',
taskUserSubmitCheckHistories = '/subpackages/task/taskUserSubmitCheckHistories/taskUserSubmitCheckHistories',
+ taskUserSubmitCheckHistoriesDetail = '/subpackages/task/taskUserSubmitCheckHistoriesDetail/taskUserSubmitCheckHistoriesDetail',
jobApplicationManage = '/subpackages/jobApplicationManage/jobApplicationManage/jobApplicationManage',
jobApplicationDetail = '/subpackages/jobApplicationManage/jobApplicationDetail/jobApplicationDetail',
diff --git a/apps/bMiniApp/src/subpackages/task/taskUserSubmitCheckHistories/InnerPage.vue b/apps/bMiniApp/src/subpackages/task/taskUserSubmitCheckHistories/InnerPage.vue
index be949e7..5199f26 100644
--- a/apps/bMiniApp/src/subpackages/task/taskUserSubmitCheckHistories/InnerPage.vue
+++ b/apps/bMiniApp/src/subpackages/task/taskUserSubmitCheckHistories/InnerPage.vue
@@ -14,24 +14,20 @@
>
<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>
<InfiniteLoading
@@ -45,8 +41,7 @@
:gender="item.gender"
:isReal="item.isReal"
:contactPhoneNumber="item.contactPhoneNumber"
- :type="item.type"
- :checkTime="item.checkTime"
+ @click="goDetail(item)"
/>
</template>
</InfiniteLoading>
@@ -63,6 +58,8 @@
EnumTaskUserSubmitCheckHistoryTypeColor,
EnumTaskUserSubmitCheckHistoryType,
WeekCN,
+ EnumGetCheckReceiveTaskCheckInUsersQueryStatus,
+ EnumGetCheckReceiveTaskCheckInUsersQueryStatusText,
} from '@12333/constants';
import { Message, setOSSLink } from '@12333/utils';
import dayjs from 'dayjs';
@@ -78,12 +75,12 @@
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,
@@ -93,16 +90,22 @@
};
if (Number(queryState.type) !== 0) {
- params.type = queryState.type;
+ params.status = queryState.type;
}
- let res = await taskCheckReceiveServices.getCheckReceiveTaskUserSubmitCheckHistories(params, {
+ 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=${item.id}&date=${date}`,
+ });
+}
</script>
diff --git a/apps/bMiniApp/src/subpackages/task/taskUserSubmitCheckHistoriesDetail/InnerPage.vue b/apps/bMiniApp/src/subpackages/task/taskUserSubmitCheckHistoriesDetail/InnerPage.vue
new file mode 100644
index 0000000..3f4ee7c
--- /dev/null
+++ b/apps/bMiniApp/src/subpackages/task/taskUserSubmitCheckHistoriesDetail/InnerPage.vue
@@ -0,0 +1,72 @@
+<template>
+ <LoadingLayout>
+ <!-- <ContentView>
+ <ChunkTitle :title="title" />
+ </ContentView> -->
+ <InfiniteLoading
+ scrollViewClassName="common-infinite-scroll-list"
+ v-bind="infiniteLoadingProps"
+ >
+ <template #renderItem="{ item }">
+ <TaskCheckHistoryCard
+ :avatar="setOSSLink(item.avatar)"
+ :name="item.name"
+ :gender="item.gender"
+ :isReal="item.isReal"
+ :contactPhoneNumber="item.contactPhoneNumber"
+ :type="item.type"
+ :checkTime="item.checkTime"
+ />
+ </template>
+ </InfiniteLoading>
+ </LoadingLayout>
+</template>
+
+<script setup lang="ts">
+import Taro from '@tarojs/taro';
+import * as taskCheckReceiveServices from '@12333/services/apiV2/taskCheckReceive';
+import { useInfiniteLoading } from '@12333/hooks';
+import { TaskCheckHistoryCard } from '@12333/components';
+import { EnumTaskUserSubmitCheckHistoryType, WeekCN } from '@12333/constants';
+import { Message, setOSSLink } from '@12333/utils';
+import dayjs from 'dayjs';
+
+defineOptions({
+ name: 'InnerPage',
+});
+
+const router = Taro.useRouter();
+const id = router.params?.id ?? '';
+const date = router.params?.date ?? '';
+
+const title = `${dayjs(date).format('YYYY骞碝M鏈圖D鏃�')} 鏄熸湡${WeekCN[dayjs(date).day()]}`;
+
+const queryState = reactive({
+ type: 0 as any as EnumTaskUserSubmitCheckHistoryType,
+});
+
+const { infiniteLoadingProps } = useInfiniteLoading(
+ async ({ pageParam }) => {
+ let params: API.GetCheckReceiveTaskUserSubmitCheckHistoriesQuery = {
+ pageModel: {
+ rows: 20,
+ page: pageParam,
+ },
+ taskInfoId: id,
+ date: dayjs(date).format('YYYY-MM-DD'),
+ };
+
+ if (Number(queryState.type) !== 0) {
+ params.type = queryState.type;
+ }
+
+ let res = await taskCheckReceiveServices.getCheckReceiveTaskUserSubmitCheckHistories(params, {
+ showLoading: false,
+ });
+ return res;
+ },
+ {
+ queryKey: ['taskCheckReceiveServices/getCheckReceiveTaskUserSubmitCheckHistories', queryState],
+ }
+);
+</script>
diff --git a/apps/bMiniApp/src/subpackages/task/taskUserSubmitCheckHistoriesDetail/taskUserSubmitCheckHistoriesDetail.config.ts b/apps/bMiniApp/src/subpackages/task/taskUserSubmitCheckHistoriesDetail/taskUserSubmitCheckHistoriesDetail.config.ts
new file mode 100644
index 0000000..305fdb1
--- /dev/null
+++ b/apps/bMiniApp/src/subpackages/task/taskUserSubmitCheckHistoriesDetail/taskUserSubmitCheckHistoriesDetail.config.ts
@@ -0,0 +1,3 @@
+export default definePageConfig({
+ disableScroll: true,
+});
diff --git a/apps/bMiniApp/src/subpackages/task/taskUserSubmitCheckHistoriesDetail/taskUserSubmitCheckHistoriesDetail.vue b/apps/bMiniApp/src/subpackages/task/taskUserSubmitCheckHistoriesDetail/taskUserSubmitCheckHistoriesDetail.vue
new file mode 100644
index 0000000..e435941
--- /dev/null
+++ b/apps/bMiniApp/src/subpackages/task/taskUserSubmitCheckHistoriesDetail/taskUserSubmitCheckHistoriesDetail.vue
@@ -0,0 +1,13 @@
+<template>
+ <PageLayoutWithBg class="taskUserSubmitCheckHistoriesDetail-page-wrapper" title="楠屾敹璇︽儏">
+ <InnerPage />
+ </PageLayoutWithBg>
+</template>
+
+<script setup lang="ts">
+import InnerPage from './InnerPage.vue';
+
+defineOptions({
+ name: 'taskUserSubmitCheckHistoriesDetail',
+});
+</script>
diff --git a/apps/cMiniApp/src/app.config.ts b/apps/cMiniApp/src/app.config.ts
index d661c02..87461fc 100644
--- a/apps/cMiniApp/src/app.config.ts
+++ b/apps/cMiniApp/src/app.config.ts
@@ -121,6 +121,7 @@
'taskSubmitCheck/taskSubmitCheck',
'taskCheckDetail/taskCheckDetail',
'taskUserSubmitCheckHistories/taskUserSubmitCheckHistories',
+ 'taskUserSubmitCheckHistoriesDetail/taskUserSubmitCheckHistoriesDetail',
],
},
{
diff --git a/apps/cMiniApp/src/constants/router.ts b/apps/cMiniApp/src/constants/router.ts
index 60edb1b..66ded17 100644
--- a/apps/cMiniApp/src/constants/router.ts
+++ b/apps/cMiniApp/src/constants/router.ts
@@ -15,6 +15,7 @@
taskSubmitCheck = '/subpackages/task/taskSubmitCheck/taskSubmitCheck',
taskCheckDetail = '/subpackages/task/taskCheckDetail/taskCheckDetail',
taskUserSubmitCheckHistories = '/subpackages/task/taskUserSubmitCheckHistories/taskUserSubmitCheckHistories',
+ taskUserSubmitCheckHistoriesDetail = '/subpackages/task/taskUserSubmitCheckHistoriesDetail/taskUserSubmitCheckHistoriesDetail',
// userInfo = '/subpackages/setting/userInfo/userInfo',
// setting = '/subpackages/setting/setting/setting',
diff --git a/apps/cMiniApp/src/subpackages/task/taskUserSubmitCheckHistories/InnerPage.vue b/apps/cMiniApp/src/subpackages/task/taskUserSubmitCheckHistories/InnerPage.vue
index 89e312e..3fef815 100644
--- a/apps/cMiniApp/src/subpackages/task/taskUserSubmitCheckHistories/InnerPage.vue
+++ b/apps/cMiniApp/src/subpackages/task/taskUserSubmitCheckHistories/InnerPage.vue
@@ -14,24 +14,20 @@
>
<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>
<InfiniteLoading
@@ -45,8 +41,7 @@
:gender="item.gender"
:isReal="item.isReal"
:contactPhoneNumber="item.contactPhoneNumber"
- :type="item.type"
- :checkTime="item.checkTime"
+ @click="goDetail(item)"
/>
</template>
</InfiniteLoading>
@@ -63,6 +58,8 @@
EnumTaskUserSubmitCheckHistoryTypeColor,
EnumTaskUserSubmitCheckHistoryType,
WeekCN,
+ EnumGetCheckReceiveTaskCheckInUsersQueryStatus,
+ EnumGetCheckReceiveTaskCheckInUsersQueryStatusText,
} from '@12333/constants';
import { Message, setOSSLink } from '@12333/utils';
import dayjs from 'dayjs';
@@ -78,12 +75,12 @@
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,
@@ -92,16 +89,21 @@
date: dayjs(date).format('YYYY-MM-DD'),
};
if (Number(queryState.type) !== 0) {
- params.type = queryState.type;
+ params.status = queryState.type;
}
- let res = await taskCheckReceiveServices.getCheckReceiveTaskUserSubmitCheckHistories(params, {
+ let res = await taskCheckReceiveServices.getCheckReceiveTaskCheckInUsers(params, {
showLoading: false,
});
return res;
},
{
- queryKey: ['taskCheckReceiveServices/getCheckReceiveTaskUserSubmitCheckHistories', queryState],
+ queryKey: ['taskCheckReceiveServices/getCheckReceiveTaskCheckInUsers', queryState],
}
);
+function goDetail(item: API.GetCheckReceiveTaskUserSubmitCheckHistoriesQueryResultItem) {
+ Taro.navigateTo({
+ url: `${RouterPath.taskUserSubmitCheckHistoriesDetail}?id=${item.id}&date=${date}`,
+ });
+}
</script>
diff --git a/apps/cMiniApp/src/subpackages/task/taskUserSubmitCheckHistoriesDetail/InnerPage.vue b/apps/cMiniApp/src/subpackages/task/taskUserSubmitCheckHistoriesDetail/InnerPage.vue
new file mode 100644
index 0000000..3f4ee7c
--- /dev/null
+++ b/apps/cMiniApp/src/subpackages/task/taskUserSubmitCheckHistoriesDetail/InnerPage.vue
@@ -0,0 +1,72 @@
+<template>
+ <LoadingLayout>
+ <!-- <ContentView>
+ <ChunkTitle :title="title" />
+ </ContentView> -->
+ <InfiniteLoading
+ scrollViewClassName="common-infinite-scroll-list"
+ v-bind="infiniteLoadingProps"
+ >
+ <template #renderItem="{ item }">
+ <TaskCheckHistoryCard
+ :avatar="setOSSLink(item.avatar)"
+ :name="item.name"
+ :gender="item.gender"
+ :isReal="item.isReal"
+ :contactPhoneNumber="item.contactPhoneNumber"
+ :type="item.type"
+ :checkTime="item.checkTime"
+ />
+ </template>
+ </InfiniteLoading>
+ </LoadingLayout>
+</template>
+
+<script setup lang="ts">
+import Taro from '@tarojs/taro';
+import * as taskCheckReceiveServices from '@12333/services/apiV2/taskCheckReceive';
+import { useInfiniteLoading } from '@12333/hooks';
+import { TaskCheckHistoryCard } from '@12333/components';
+import { EnumTaskUserSubmitCheckHistoryType, WeekCN } from '@12333/constants';
+import { Message, setOSSLink } from '@12333/utils';
+import dayjs from 'dayjs';
+
+defineOptions({
+ name: 'InnerPage',
+});
+
+const router = Taro.useRouter();
+const id = router.params?.id ?? '';
+const date = router.params?.date ?? '';
+
+const title = `${dayjs(date).format('YYYY骞碝M鏈圖D鏃�')} 鏄熸湡${WeekCN[dayjs(date).day()]}`;
+
+const queryState = reactive({
+ type: 0 as any as EnumTaskUserSubmitCheckHistoryType,
+});
+
+const { infiniteLoadingProps } = useInfiniteLoading(
+ async ({ pageParam }) => {
+ let params: API.GetCheckReceiveTaskUserSubmitCheckHistoriesQuery = {
+ pageModel: {
+ rows: 20,
+ page: pageParam,
+ },
+ taskInfoId: id,
+ date: dayjs(date).format('YYYY-MM-DD'),
+ };
+
+ if (Number(queryState.type) !== 0) {
+ params.type = queryState.type;
+ }
+
+ let res = await taskCheckReceiveServices.getCheckReceiveTaskUserSubmitCheckHistories(params, {
+ showLoading: false,
+ });
+ return res;
+ },
+ {
+ queryKey: ['taskCheckReceiveServices/getCheckReceiveTaskUserSubmitCheckHistories', queryState],
+ }
+);
+</script>
diff --git a/apps/cMiniApp/src/subpackages/task/taskUserSubmitCheckHistoriesDetail/taskUserSubmitCheckHistoriesDetail.config.ts b/apps/cMiniApp/src/subpackages/task/taskUserSubmitCheckHistoriesDetail/taskUserSubmitCheckHistoriesDetail.config.ts
new file mode 100644
index 0000000..305fdb1
--- /dev/null
+++ b/apps/cMiniApp/src/subpackages/task/taskUserSubmitCheckHistoriesDetail/taskUserSubmitCheckHistoriesDetail.config.ts
@@ -0,0 +1,3 @@
+export default definePageConfig({
+ disableScroll: true,
+});
diff --git a/apps/cMiniApp/src/subpackages/task/taskUserSubmitCheckHistoriesDetail/taskUserSubmitCheckHistoriesDetail.vue b/apps/cMiniApp/src/subpackages/task/taskUserSubmitCheckHistoriesDetail/taskUserSubmitCheckHistoriesDetail.vue
new file mode 100644
index 0000000..e435941
--- /dev/null
+++ b/apps/cMiniApp/src/subpackages/task/taskUserSubmitCheckHistoriesDetail/taskUserSubmitCheckHistoriesDetail.vue
@@ -0,0 +1,13 @@
+<template>
+ <PageLayoutWithBg class="taskUserSubmitCheckHistoriesDetail-page-wrapper" title="楠屾敹璇︽儏">
+ <InnerPage />
+ </PageLayoutWithBg>
+</template>
+
+<script setup lang="ts">
+import InnerPage from './InnerPage.vue';
+
+defineOptions({
+ name: 'taskUserSubmitCheckHistoriesDetail',
+});
+</script>
diff --git a/packages/constants/apiEnum.ts b/packages/constants/apiEnum.ts
index a8ddffc..4ce08a2 100644
--- a/packages/constants/apiEnum.ts
+++ b/packages/constants/apiEnum.ts
@@ -209,6 +209,14 @@
Completed = 20,
}
+/** 鏌ヨ楠屾敹浠诲姟璇︽儏-绛惧埌绛惧嚭璁板綍 */
+export enum EnumGetCheckReceiveTaskCheckInUsersQueryStatus {
+ /**宸茬鍒� */
+ CheckOut = 10,
+ /**鏈埌宀� */
+ UnCheck = 20,
+}
+
/** 娌″啓娉ㄩ噴 */
export enum EnumGetCheckReceiveTasksQueryResultItemCheckStatus {
/**鏈埌宀� */
@@ -587,7 +595,7 @@
CheckOut = 20,
/**鏈埌宀� */
UnCheckIn = 30,
- /**鏈鍑� */
+ /**鏈埌宀� */
UnCheckOut = 40,
}
diff --git a/packages/constants/task.ts b/packages/constants/task.ts
index bc91100..38a16c4 100644
--- a/packages/constants/task.ts
+++ b/packages/constants/task.ts
@@ -15,6 +15,7 @@
EnumTaskUserSubmitCheckReceiveStatus,
EnumTaskUserSubmitCheckHistoryType,
EnumTaskCheckReceiveMethod,
+ EnumGetCheckReceiveTaskCheckInUsersQueryStatus,
} from './apiEnum';
export const EnumBillingMethodText = {
@@ -173,6 +174,16 @@
[EnumTaskUserSubmitCheckHistoryType.UnCheckOut]: Colors.Info,
};
+export const EnumGetCheckReceiveTaskCheckInUsersQueryStatusText = {
+ [EnumGetCheckReceiveTaskCheckInUsersQueryStatus.CheckOut]: '宸插埌宀�',
+ [EnumGetCheckReceiveTaskCheckInUsersQueryStatus.UnCheck]: '鏈埌宀�',
+};
+
+export const EnumGetCheckReceiveTaskCheckInUsersQueryStatusColor = {
+ [EnumGetCheckReceiveTaskCheckInUsersQueryStatus.CheckOut]: Colors.Success,
+ [EnumGetCheckReceiveTaskCheckInUsersQueryStatus.UnCheck]: Colors.Danger,
+};
+
export const EnumTaskCheckReceiveMethodText = {
[EnumTaskCheckReceiveMethod.CheckIn]: '浜哄伐绛惧埌',
[EnumTaskCheckReceiveMethod.Submit]: '鑷富鎻愪氦',
diff --git a/packages/services/apiV2/taskCheckReceive.ts b/packages/services/apiV2/taskCheckReceive.ts
index aaa88db..a287364 100644
--- a/packages/services/apiV2/taskCheckReceive.ts
+++ b/packages/services/apiV2/taskCheckReceive.ts
@@ -50,6 +50,24 @@
);
}
+/** 鏌ヨ楠屾敹绛惧埌鐢ㄦ埛 POST /api/flexjob/taskCheckReceive/getCheckReceiveTaskCheckInUsers */
+export async function getCheckReceiveTaskCheckInUsers(
+ body: API.GetCheckReceiveTaskCheckInUsersQuery,
+ options?: API.RequestConfig
+) {
+ return request<API.GetCheckReceiveTaskCheckInUsersQueryResult>(
+ '/api/flexjob/taskCheckReceive/getCheckReceiveTaskCheckInUsers',
+ {
+ method: 'POST',
+ headers: {
+ 'Content-Type': 'application/json-patch+json',
+ },
+ data: body,
+ ...(options || {}),
+ }
+ );
+}
+
/** 鏌ヨ楠屾敹浠诲姟鍒嗛〉鍒楄〃 POST /api/flexjob/taskCheckReceive/getCheckReceiveTasks */
export async function getCheckReceiveTasks(
body: API.GetCheckReceiveTasksQuery,
diff --git a/packages/services/apiV2/typings.d.ts b/packages/services/apiV2/typings.d.ts
index a039025..801f430 100644
--- a/packages/services/apiV2/typings.d.ts
+++ b/packages/services/apiV2/typings.d.ts
@@ -593,9 +593,9 @@
/** 瀹炲彂閲戦 */
actualSettlementAmount: number;
/** 鏀舵璐︽埛 */
- receiveAccount: string;
+ receiveAccount?: string;
/** 鎵�灞為摱琛� */
- bank: string;
+ bank?: string;
/** 寮�鎴锋敮琛屽悕绉� */
bankBranch?: string;
}
@@ -853,6 +853,13 @@
None = 10,
/**宸叉姤鍚� */
Completed = 20,
+ }
+
+ enum EnumGetCheckReceiveTaskCheckInUsersQueryStatus {
+ /**宸茬鍒� */
+ CheckOut = 10,
+ /**鏈埌宀� */
+ UnCheck = 20,
}
enum EnumGetCheckReceiveTasksQueryResultItemCheckStatus {
@@ -1200,7 +1207,7 @@
CheckOut = 20,
/**鏈埌宀� */
UnCheckIn = 30,
- /**鏈鍑� */
+ /**鏈埌宀� */
UnCheckOut = 40,
}
@@ -1555,6 +1562,24 @@
/** 閿欒鐮� */
errorCode?: string;
data?: GetBankOcrCommandResult;
+ /** 鎵ц鎴愬姛 */
+ success?: boolean;
+ /** 閿欒淇℃伅 */
+ msg?: any;
+ /** 闄勫姞鏁版嵁 */
+ extras?: any;
+ /** 鏃堕棿鎴� */
+ timestamp?: number;
+ }
+
+ interface FriendlyResultGetCheckReceiveTaskCheckInUsersQueryResult {
+ /** 璺熻釜Id */
+ traceId?: string;
+ /** 鐘舵�佺爜 */
+ code?: number;
+ /** 閿欒鐮� */
+ errorCode?: string;
+ data?: GetCheckReceiveTaskCheckInUsersQueryResult;
/** 鎵ц鎴愬姛 */
success?: boolean;
/** 閿欒淇℃伅 */
@@ -3535,6 +3560,40 @@
number?: string;
}
+ interface GetCheckReceiveTaskCheckInUsersQuery {
+ /** 浠诲姟Id */
+ taskInfoId?: string;
+ /** 鏃ユ湡 */
+ date?: string;
+ status?: EnumGetCheckReceiveTaskCheckInUsersQueryStatus;
+ pageModel?: PagedListQueryPageModel;
+ }
+
+ interface GetCheckReceiveTaskCheckInUsersQueryResult {
+ pageModel?: PagedListQueryResultPageModel;
+ /** 鏁版嵁 */
+ data?: GetCheckReceiveTaskCheckInUsersQueryResultItem[];
+ }
+
+ interface GetCheckReceiveTaskCheckInUsersQueryResultItem {
+ /** 浠诲姟浜哄憳Id */
+ id?: string;
+ /** 澶村儚 */
+ avatar?: string;
+ /** 濮撳悕 */
+ name?: string;
+ /** 韬唤璇佸彿 */
+ identity?: string;
+ gender?: EnumUserGender;
+ /** 骞撮緞 */
+ age?: number;
+ /** 鎵嬫満鍙� */
+ contactPhoneNumber?: string;
+ /** 鏄惁瀹炲悕 */
+ isReal?: boolean;
+ realMethod?: EnumUserRealMethod;
+ }
+
interface GetCheckReceiveTaskQuery {
/** 浠诲姟Id */
taskInfoId?: string;
--
Gitblit v1.9.1