From 60060b2987b01ba5f1fca7f91472bc4ea331f3fa Mon Sep 17 00:00:00 2001
From: wupengfei <834520024@qq.com>
Date: 星期一, 15 十二月 2025 16:35:24 +0800
Subject: [PATCH] fix: bug
---
apps/bMiniApp/src/subpackages/task/taskCheckDetail/InnerPage.vue | 60 +++++++++++++++++++++++++-----------------------------------
1 files changed, 25 insertions(+), 35 deletions(-)
diff --git a/apps/bMiniApp/src/subpackages/task/taskCheckDetail/InnerPage.vue b/apps/bMiniApp/src/subpackages/task/taskCheckDetail/InnerPage.vue
index 77591a8..1cde4ba 100644
--- a/apps/bMiniApp/src/subpackages/task/taskCheckDetail/InnerPage.vue
+++ b/apps/bMiniApp/src/subpackages/task/taskCheckDetail/InnerPage.vue
@@ -16,17 +16,18 @@
<template #renderItem="{ item }">
<TaskCheckCard
:avatar="setOSSLink(item.avatar)"
- :name="item.name"
+ :name="item.name ?? ''"
:gender="item.gender"
:isReal="item.isReal"
:checkInTime="item.checkInTime"
:checkOutTime="item.checkOutTime"
:contactPhoneNumber="item.contactPhoneNumber"
:checkReceiveStatus="item.checkReceiveStatus"
- :checkReceiveMethod="detail?.checkReceiveMethod"
+ :checkReceiveMethods="detail?.checkReceiveMethods"
:submitCheckReceiveStatus="item.submitCheckReceiveStatus"
+ :checkHistoryType="item.checkHistoryType"
@checkReceive="goTaskDetail(item)"
- @checkInOrOut="(ev) => checkReceiveTask(ev, item.id)"
+ @checkInOrOut="(ev) => checkReceiveTask(ev, item)"
/>
</template>
</InfiniteLoading>
@@ -38,15 +39,15 @@
import * as taskCheckReceiveServices from '@12333/services/apiV2/taskCheckReceive';
import { useInfiniteLoading } from '@12333/hooks';
import TaskCheckCard from '../components/TaskCheckCard.vue';
-import { MyTaskCard } from '@12333/components';
+import { MyTaskCard, NumberInput, ChunkTitle } from '@12333/components';
import {
EnumTaskCheckReceiveMethod,
EnumTaskCheckReceiveStatus,
+ EnumTaskUserSubmitCheckHistoryType,
EnumTaskUserSubmitCheckReceiveStatus,
} from '@12333/constants';
-import { Message, setOSSLink } from '@12333/utils';
+import { Message, setOSSLink, toRound } from '@12333/utils';
import dayjs from 'dayjs';
-import { CheckInOrOutEventEnum } from '../constants';
defineOptions({
name: 'InnerPage',
@@ -83,41 +84,30 @@
);
function goTaskDetail(item: API.GetCheckReceiveTaskQueryResultItem) {
- if (detail.value.checkReceiveMethod !== EnumTaskCheckReceiveMethod.CheckIn) {
- if (item.checkReceiveStatus === EnumTaskCheckReceiveStatus.Completed) {
- Taro.navigateTo({
- url: `${RouterPath.taskCheckedDetail}?id=${item.id}`,
- });
- }
- if (
- item.checkReceiveStatus === EnumTaskCheckReceiveStatus.WaitCheckReceive ||
- item.checkReceiveStatus === EnumTaskCheckReceiveStatus.WaitSubmit
- ) {
- Taro.navigateTo({
- url: `${RouterPath.taskHandleCheckDetail}?id=${item.id}&date=${date}`,
- });
- }
- }
+ Taro.navigateTo({
+ url: `${RouterPath.taskHandleCheckDetail}?id=${item.id}&date=${date}&taskInfoId=${id}`,
+ });
}
-async function checkReceiveTask(ev: EnumTaskUserSubmitCheckReceiveStatus, taskInfoUserId: string) {
+async function checkReceiveTask(
+ ev: EnumTaskUserSubmitCheckHistoryType,
+ item: API.GetCheckReceiveTaskQueryResultItem
+) {
try {
let params: API.CheckReceiveTaskCommand = {
- taskInfoUserId: taskInfoUserId,
+ taskInfoUserId: item.id,
date: dayjs(date).format('YYYY-MM-DD'),
+ checkHistoryType: ev,
};
- if (ev === EnumTaskUserSubmitCheckReceiveStatus.WaitCheckReceive) {
- params.checkInTime = dayjs().format('YYYY-MM-DD HH:mm:ss');
- 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) {
- Message.success('鎻愪氦鎴愬姛');
+ let res: any = await taskCheckReceiveServices.checkReceiveTask(params, {
+ getResponse: true,
+ });
+ if (res?.success) {
+ if (res?.extras?.message) {
+ Message.success(res.extras.message);
+ } else {
+ Message.success('鎻愪氦鎴愬姛');
+ }
infiniteLoadingProps.value?.refetch?.();
}
} catch (error) {}
--
Gitblit v1.10.0