From 7039c7f1a1feacc5479cbe7b886f239dea3ef1e6 Mon Sep 17 00:00:00 2001
From: wupengfei <834520024@qq.com>
Date: 星期一, 10 十一月 2025 14:05:08 +0800
Subject: [PATCH] Merge branch 'dev-1.3.0.1' of http://120.26.58.240:8888/r/flexJobMiniApp into dev-1.3.0.1
---
apps/bMiniApp/src/subpackages/task/components/TaskCheckCard.vue | 83 ++++++++++++++++++-----------------------
1 files changed, 37 insertions(+), 46 deletions(-)
diff --git a/apps/bMiniApp/src/subpackages/task/components/TaskCheckCard.vue b/apps/bMiniApp/src/subpackages/task/components/TaskCheckCard.vue
index da9bebf..e6a1e19 100644
--- a/apps/bMiniApp/src/subpackages/task/components/TaskCheckCard.vue
+++ b/apps/bMiniApp/src/subpackages/task/components/TaskCheckCard.vue
@@ -1,5 +1,5 @@
<template>
- <div class="task-check-card-wrapper" @click.stop="emit('checkReceive')">
+ <div class="task-check-card-wrapper">
<TaskCheckPersonalView
class="task-check-card-view"
:avatar="avatar"
@@ -8,51 +8,38 @@
:isReal="isReal"
:contactPhoneNumber="contactPhoneNumber"
>
- <template #actions>
- <template v-if="checkReceiveMethod === EnumTaskCheckReceiveMethod.CheckIn">
- <!-- <nut-button
- v-if="!checkInTime"
+ <template
+ #actions
+ v-if="
+ checkReceiveStatus === EnumTaskCheckReceiveStatus.WaitCheckReceive ||
+ checkReceiveStatus === EnumTaskCheckReceiveStatus.WaitSubmit
+ "
+ >
+ <template v-if="OrderUtils.isContainCheckIn(checkReceiveMethods)">
+ <nut-button
+ v-if="
+ !checkHistoryType || checkHistoryType === EnumTaskUserSubmitCheckHistoryType.CheckIn
+ "
type="primary"
class="task-check-card-phone-btn"
- @click.stop="emit('checkInOrOut', CheckInOrOutEventEnum.CheckIn)"
- >绛惧埌</nut-button
+ @click.stop="handleMore"
+ >鎿嶄綔</nut-button
>
<nut-button
- v-else-if="!checkOutTime"
+ v-else
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"
+ @click.stop="emit('checkReceive')"
>楠屾敹</nut-button
>
- <div v-else class="task-check-card-phone-status" :style="{ color: Colors.Success }">
- {{ EnumTaskCheckReceiveStatusText[checkReceiveStatus] }}
- </div>
</template>
+ <nut-button
+ v-else
+ type="primary"
+ class="task-check-card-phone-btn"
+ @click.stop="emit('checkReceive')"
+ >楠屾敹</nut-button
+ >
</template>
</TaskCheckPersonalView>
</div>
@@ -67,11 +54,13 @@
EnumTaskCheckReceiveMethod,
EnumGetCheckReceiveTasksQueryResultItemCheckStatus,
EnumTaskUserSubmitCheckReceiveStatus,
+ EnumTaskUserSubmitCheckHistoryType,
} from '@12333/constants';
import { TaskCheckPersonalView } from '@12333/components';
import { CheckInOrOutEventEnum } from '../constants';
import { Portal } from 'senin-mini/components';
import { ActionSheet } from '@nutui/nutui-taro';
+import { OrderUtils } from '@12333/utils';
defineOptions({
name: 'TaskCheckCard',
@@ -97,22 +86,20 @@
checkReceiveMethods?: EnumTaskCheckReceiveMethod[];
submitCheckReceiveStatus?: EnumTaskUserSubmitCheckReceiveStatus;
+
+ checkHistoryType?: EnumTaskUserSubmitCheckHistoryType;
};
const props = withDefaults(defineProps<Props>(), {});
const emit = defineEmits<{
(e: 'checkReceive'): void;
- (e: 'checkInOrOut', ev: EnumTaskUserSubmitCheckReceiveStatus): void;
+ (e: 'checkInOrOut', ev: EnumTaskUserSubmitCheckHistoryType): void;
}>();
const menuList = computed(() => {
let _menuList = [];
- if (props.checkReceiveMethod === EnumTaskCheckReceiveMethod.CheckIn) {
- _menuList.push({
- name: '鏈埌宀�',
- value: ManageActions.OutWork,
- });
+ if (OrderUtils.isContainCheckIn(props.checkReceiveMethods)) {
if (!props.checkInTime) {
_menuList.push({
name: '绛惧埌',
@@ -124,6 +111,10 @@
value: ManageActions.CheckOut,
});
}
+ _menuList.push({
+ name: '鏈埌宀�',
+ value: ManageActions.OutWork,
+ });
}
return _menuList;
@@ -154,13 +145,13 @@
function handleEmit(action: { name: string; value: number }) {
switch (action.value) {
case ManageActions.CheckIn:
- emit('checkInOrOut', EnumTaskUserSubmitCheckReceiveStatus.WaitCheckReceive);
+ emit('checkInOrOut', EnumTaskUserSubmitCheckHistoryType.CheckIn);
break;
case ManageActions.CheckOut:
- emit('checkInOrOut', EnumTaskUserSubmitCheckReceiveStatus.Success);
+ emit('checkInOrOut', EnumTaskUserSubmitCheckHistoryType.CheckOut);
break;
case ManageActions.OutWork:
- emit('checkInOrOut', EnumTaskUserSubmitCheckReceiveStatus.Fail);
+ emit('checkInOrOut', EnumTaskUserSubmitCheckHistoryType.UnCheckIn);
break;
}
}
--
Gitblit v1.9.1