From c2accc29d778a9631cebcb494586909cba6f9464 Mon Sep 17 00:00:00 2001
From: wupengfei <834520024@qq.com>
Date: 星期日, 19 十月 2025 19:50:55 +0800
Subject: [PATCH] Merge branch 'dev-1.2.0.1' of http://120.26.58.240:8888/r/flexJobMiniApp into dev-1.2.0.1
---
apps/bMiniApp/src/subpackages/task/taskCheckDetail/InnerPage.vue | 7 ++++---
packages/services/apiV2/typings.d.ts | 4 ++++
2 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/apps/bMiniApp/src/subpackages/task/taskCheckDetail/InnerPage.vue b/apps/bMiniApp/src/subpackages/task/taskCheckDetail/InnerPage.vue
index 09dd67b..d7cc662 100644
--- a/apps/bMiniApp/src/subpackages/task/taskCheckDetail/InnerPage.vue
+++ b/apps/bMiniApp/src/subpackages/task/taskCheckDetail/InnerPage.vue
@@ -25,7 +25,7 @@
:checkReceiveStatus="item.checkReceiveStatus"
:checkReceiveMethod="detail?.checkReceiveMethod"
@checkReceive="goTaskDetail(item)"
- @checkInOrOut="checkReceiveTask"
+ @checkInOrOut="(ev) => checkReceiveTask(ev, item.id)"
/>
</template>
</InfiniteLoading>
@@ -95,10 +95,11 @@
}
}
-async function checkReceiveTask(ev: CheckInOrOutEventEnum) {
+async function checkReceiveTask(ev: CheckInOrOutEventEnum, taskInfoUserId: string) {
try {
let params: API.CheckReceiveTaskCommand = {
- id: id,
+ taskInfoUserId: taskInfoUserId,
+ date: dayjs(date).format('YYYY-MM-DD'),
};
if (ev === CheckInOrOutEventEnum.CheckIn) {
params.checkInTime = dayjs().format('YYYY-MM-DD HH:mm:ss');
diff --git a/packages/services/apiV2/typings.d.ts b/packages/services/apiV2/typings.d.ts
index b417c8a..6cda5f1 100644
--- a/packages/services/apiV2/typings.d.ts
+++ b/packages/services/apiV2/typings.d.ts
@@ -446,6 +446,10 @@
interface CheckReceiveTaskCommand {
/** 鎻愪氦Id */
id?: string;
+ /** 浠诲姟浜哄憳Id */
+ taskInfoUserId?: string;
+ /** 鏃ユ湡 */
+ date?: string;
/** 绛惧埌鏃堕棿 */
checkInTime?: string;
/** 绛惧嚭鏃堕棿 */
--
Gitblit v1.9.1