From c4a05d1cd214627d1f62a71b72f7f32087cee92d Mon Sep 17 00:00:00 2001
From: zhengyiming <540361168@qq.com>
Date: 星期三, 22 十月 2025 19:50:55 +0800
Subject: [PATCH] Merge branch 'master' of http://120.26.58.240:8888/r/flexJobMiniApp
---
apps/bMiniApp/src/subpackages/task/taskCheckDetail/InnerPage.vue | 17 +++++++++++++----
1 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/apps/bMiniApp/src/subpackages/task/taskCheckDetail/InnerPage.vue b/apps/bMiniApp/src/subpackages/task/taskCheckDetail/InnerPage.vue
index d7cc662..77591a8 100644
--- a/apps/bMiniApp/src/subpackages/task/taskCheckDetail/InnerPage.vue
+++ b/apps/bMiniApp/src/subpackages/task/taskCheckDetail/InnerPage.vue
@@ -24,6 +24,7 @@
:contactPhoneNumber="item.contactPhoneNumber"
:checkReceiveStatus="item.checkReceiveStatus"
:checkReceiveMethod="detail?.checkReceiveMethod"
+ :submitCheckReceiveStatus="item.submitCheckReceiveStatus"
@checkReceive="goTaskDetail(item)"
@checkInOrOut="(ev) => checkReceiveTask(ev, item.id)"
/>
@@ -38,7 +39,11 @@
import { useInfiniteLoading } from '@12333/hooks';
import TaskCheckCard from '../components/TaskCheckCard.vue';
import { MyTaskCard } from '@12333/components';
-import { EnumTaskCheckReceiveMethod, EnumTaskCheckReceiveStatus } from '@12333/constants';
+import {
+ EnumTaskCheckReceiveMethod,
+ EnumTaskCheckReceiveStatus,
+ EnumTaskUserSubmitCheckReceiveStatus,
+} from '@12333/constants';
import { Message, setOSSLink } from '@12333/utils';
import dayjs from 'dayjs';
import { CheckInOrOutEventEnum } from '../constants';
@@ -95,16 +100,20 @@
}
}
-async function checkReceiveTask(ev: CheckInOrOutEventEnum, taskInfoUserId: string) {
+async function checkReceiveTask(ev: EnumTaskUserSubmitCheckReceiveStatus, taskInfoUserId: string) {
try {
let params: API.CheckReceiveTaskCommand = {
taskInfoUserId: taskInfoUserId,
date: dayjs(date).format('YYYY-MM-DD'),
};
- if (ev === CheckInOrOutEventEnum.CheckIn) {
+ if (ev === EnumTaskUserSubmitCheckReceiveStatus.WaitCheckReceive) {
params.checkInTime = dayjs().format('YYYY-MM-DD HH:mm:ss');
- } else if (ev === CheckInOrOutEventEnum.CheckOut) {
+ params.checkReceiveStatus = ev;
+ } else if (ev === EnumTaskUserSubmitCheckReceiveStatus.Success) {
params.checkOutTime = dayjs().format('YYYY-MM-DD HH:mm:ss');
+ params.checkReceiveStatus = ev;
+ } else if (ev === EnumTaskUserSubmitCheckReceiveStatus.Fail) {
+ params.checkReceiveStatus = ev;
}
let res = await taskCheckReceiveServices.checkReceiveTask(params);
if (res) {
--
Gitblit v1.9.1