From 39fe8d064f84088d1f8a897495fa05baf671bba8 Mon Sep 17 00:00:00 2001
From: zhengyiming <540361168@qq.com>
Date: 星期一, 10 十一月 2025 18:34:48 +0800
Subject: [PATCH] fix: bug
---
apps/underTakeMiniApp/src/subpackages/task/components/TaskCheckCard.vue | 79 ++++++++++-----------------------------
1 files changed, 21 insertions(+), 58 deletions(-)
diff --git a/apps/underTakeMiniApp/src/subpackages/task/components/TaskCheckCard.vue b/apps/underTakeMiniApp/src/subpackages/task/components/TaskCheckCard.vue
index 4465026..eb1e5e3 100644
--- a/apps/underTakeMiniApp/src/subpackages/task/components/TaskCheckCard.vue
+++ b/apps/underTakeMiniApp/src/subpackages/task/components/TaskCheckCard.vue
@@ -9,50 +9,12 @@
:contactPhoneNumber="contactPhoneNumber"
>
<template #actions>
- <template v-if="OrderUtils.isContainCheckIn(checkReceiveMethods)">
- <!-- <nut-button
- v-if="!checkInTime"
- type="primary"
- class="task-check-card-phone-btn"
- @click.stop="emit('checkInOrOut', CheckInOrOutEventEnum.CheckIn)"
- >绛惧埌</nut-button
- >
- <nut-button
- v-else-if="!checkOutTime"
- type="primary"
- class="task-check-card-phone-btn"
- @click.stop="emit('checkInOrOut', CheckInOrOutEventEnum.CheckOut)"
- >绛惧嚭</nut-button
- >
- <div v-else class="task-check-card-phone-status" :style="{ color: Colors.Success }">
- {{ EnumTaskCheckReceiveStatusText[checkReceiveStatus] }}
- </div> -->
- <template
- v-if="props.submitCheckReceiveStatus !== EnumTaskUserSubmitCheckReceiveStatus.Fail"
- >
- <nut-button
- v-if="!checkInTime || !checkOutTime"
- type="primary"
- class="task-check-card-phone-btn"
- @click.stop="handleMore"
- >鎿嶄綔</nut-button
- >
- <div v-else class="task-check-card-phone-status" :style="{ color: Colors.Success }">
- {{ EnumTaskCheckReceiveStatusText[checkReceiveStatus] }}
- </div>
- </template>
- </template>
- <template v-else>
- <nut-button
- v-if="checkReceiveStatus === EnumTaskCheckReceiveStatus.WaitCheckReceive"
- type="primary"
- class="task-check-card-phone-btn"
- >楠屾敹</nut-button
- >
- <div v-else class="task-check-card-phone-status" :style="{ color: Colors.Success }">
- {{ EnumTaskCheckReceiveStatusText[checkReceiveStatus] }}
- </div>
- </template>
+ <div
+ class="task-check-card-phone-status"
+ :style="{ color: EnumTaskCheckReceiveStatusColor[checkReceiveStatus] }"
+ >
+ {{ EnumTaskCheckReceiveStatusText[checkReceiveStatus] }}
+ </div>
</template>
</TaskCheckPersonalView>
</div>
@@ -67,6 +29,7 @@
EnumTaskCheckReceiveMethod,
EnumGetCheckReceiveTasksQueryResultItemCheckStatus,
EnumTaskUserSubmitCheckReceiveStatus,
+ EnumTaskCheckReceiveStatusColor,
} from '@12333/constants';
import { TaskCheckPersonalView } from '@12333/components';
import { CheckInOrOutEventEnum } from '../constants';
@@ -109,23 +72,23 @@
const menuList = computed(() => {
let _menuList = [];
- if (props.checkReceiveMethod === EnumTaskCheckReceiveMethod.CheckIn) {
+ // if (props.checkReceiveMethod === EnumTaskCheckReceiveMethod.CheckIn) {
+ _menuList.push({
+ name: '鏈埌宀�',
+ value: ManageActions.OutWork,
+ });
+ if (!props.checkInTime) {
_menuList.push({
- name: '鏈埌宀�',
- value: ManageActions.OutWork,
+ name: '绛惧埌',
+ value: ManageActions.CheckIn,
});
- if (!props.checkInTime) {
- _menuList.push({
- name: '绛惧埌',
- value: ManageActions.CheckIn,
- });
- } else if (!props.checkOutTime) {
- _menuList.push({
- name: '绛惧嚭',
- value: ManageActions.CheckOut,
- });
- }
+ } else if (!props.checkOutTime) {
+ _menuList.push({
+ name: '绛惧嚭',
+ value: ManageActions.CheckOut,
+ });
}
+ // }
return _menuList;
});
--
Gitblit v1.9.1