From 876a44a82852df5845bf9105e80c98a051f863ff Mon Sep 17 00:00:00 2001
From: wupengfei <834520024@qq.com>
Date: 星期三, 12 十一月 2025 17:55:20 +0800
Subject: [PATCH] feat: 1.3.0.2

---
 apps/underTakeMiniApp/src/subpackages/task/components/TaskCheckCard.vue |   81 +++++++++++++++++++++-------------------
 1 files changed, 42 insertions(+), 39 deletions(-)

diff --git a/apps/underTakeMiniApp/src/subpackages/task/components/TaskCheckCard.vue b/apps/underTakeMiniApp/src/subpackages/task/components/TaskCheckCard.vue
index 4465026..c879a59 100644
--- a/apps/underTakeMiniApp/src/subpackages/task/components/TaskCheckCard.vue
+++ b/apps/underTakeMiniApp/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"
@@ -9,47 +9,44 @@
       :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"
-          >
+        <template
+          v-if="
+            (checkReceiveStatus === EnumTaskCheckReceiveStatus.WaitCheckReceive ||
+              checkReceiveStatus === EnumTaskCheckReceiveStatus.WaitSubmit) &&
+            isInternal
+          "
+        >
+          <template v-if="OrderUtils.isContainCheckIn(checkReceiveMethods)">
             <nut-button
-              v-if="!checkInTime || !checkOutTime"
+              v-if="
+                !checkHistoryType || checkHistoryType === EnumTaskUserSubmitCheckHistoryType.CheckIn
+              "
               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>
+            <nut-button
+              v-else
+              type="primary"
+              class="task-check-card-phone-btn"
+              @click.stop="emit('checkReceive')"
+              >楠屾敹</nut-button
+            >
           </template>
-        </template>
-        <template v-else>
           <nut-button
-            v-if="checkReceiveStatus === EnumTaskCheckReceiveStatus.WaitCheckReceive"
+            v-else
             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 }">
+        </template>
+        <template v-else>
+          <div
+            class="task-check-card-phone-status"
+            :style="{ color: EnumTaskCheckReceiveStatusColor[checkReceiveStatus] }"
+          >
             {{ EnumTaskCheckReceiveStatusText[checkReceiveStatus] }}
           </div>
         </template>
@@ -67,6 +64,8 @@
   EnumTaskCheckReceiveMethod,
   EnumGetCheckReceiveTasksQueryResultItemCheckStatus,
   EnumTaskUserSubmitCheckReceiveStatus,
+  EnumTaskUserSubmitCheckHistoryType,
+  EnumTaskCheckReceiveStatusColor,
 } from '@12333/constants';
 import { TaskCheckPersonalView } from '@12333/components';
 import { CheckInOrOutEventEnum } from '../constants';
@@ -98,22 +97,22 @@
   checkReceiveMethods?: EnumTaskCheckReceiveMethod[];
 
   submitCheckReceiveStatus?: EnumTaskUserSubmitCheckReceiveStatus;
+
+  checkHistoryType?: EnumTaskUserSubmitCheckHistoryType;
+
+  isInternal?: boolean;
 };
 
 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: '绛惧埌',
@@ -125,6 +124,10 @@
         value: ManageActions.CheckOut,
       });
     }
+    _menuList.push({
+      name: '鏈埌宀�',
+      value: ManageActions.OutWork,
+    });
   }
 
   return _menuList;
@@ -155,13 +158,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