From 4b605424c769f0ef5f02eb1abdf8bd5b7d558161 Mon Sep 17 00:00:00 2001
From: zhengyiming <540361168@qq.com>
Date: 星期五, 28 十一月 2025 15:19:50 +0800
Subject: [PATCH] fix: s

---
 src/views/EmploymentManage/components/CheckManageDialog.vue |   51 ++++++++++++++++++++++++++++++++++++++++++---------
 1 files changed, 42 insertions(+), 9 deletions(-)

diff --git a/src/views/EmploymentManage/components/CheckManageDialog.vue b/src/views/EmploymentManage/components/CheckManageDialog.vue
index 4fdb43f..bf67829 100644
--- a/src/views/EmploymentManage/components/CheckManageDialog.vue
+++ b/src/views/EmploymentManage/components/CheckManageDialog.vue
@@ -1,6 +1,6 @@
 <template>
   <ProDialog :title="title" v-model="visible" destroy-on-close draggable>
-    <ProTabs v-model="tabType" hasBorder v-if="form.checkReceiveMethods?.length > 1">
+    <ProTabs v-model="form.tabType" hasBorder v-if="form.checkReceiveMethods?.length > 1">
       <ProTabPane lazy label="绛惧埌璁板綍" name="signRecord"></ProTabPane>
       <ProTabPane lazy label="鎻愪氦璁板綍" name="submitRecord"></ProTabPane>
     </ProTabs>
@@ -39,12 +39,13 @@
 type Form = {
   id: string;
   checkReceiveMethods: EnumTaskCheckReceiveMethod[];
+  isInternal: boolean;
+  tabType: string;
   isDetail: boolean;
 };
 
 const visible = defineModel({ type: Boolean });
 const form = defineModel<Form>('form');
-const tabType = ref('signRecord');
 
 const title = computed(() => (form.value.isDetail ? '璇︽儏' : '楠屾敹'));
 const emit = defineEmits<{
@@ -79,6 +80,11 @@
     enCode: 'checkReceiveTime',
     name: '楠屾敹鏃堕棿',
   },
+  {
+    id: '6',
+    enCode: 'checkOperator',
+    name: '楠屾敹浜�',
+  },
 ]);
 
 const checkInColumns = defineColumns([
@@ -89,21 +95,36 @@
   },
   {
     id: '2',
+    enCode: 'userCheckInTime',
+    name: '鐢ㄦ埛绛惧埌鏃堕棿',
+  },
+  {
+    id: '3',
+    enCode: 'userCheckOutTime',
+    name: '鐢ㄦ埛绛惧嚭鏃堕棿',
+  },
+  {
+    id: '4',
+    enCode: 'userCheckHistoryType',
+    name: '鐢ㄦ埛楠屾敹鐘舵��',
+  },
+  {
+    id: '5',
     enCode: 'checkInTime',
     name: '绛惧埌鏃堕棿',
   },
   {
-    id: '3',
+    id: '6',
     enCode: 'checkOutTime',
     name: '绛惧嚭鏃堕棿',
   },
   {
-    id: '4',
-    enCode: 'checkOutStatus',
+    id: '7',
+    enCode: 'checkHistoryType',
     name: '楠屾敹鐘舵��',
   },
   {
-    id: '5',
+    id: '8',
     enCode: 'operator',
     name: '鎿嶄綔浜�',
   },
@@ -115,7 +136,7 @@
   } else if (form.value.checkReceiveMethods.every((x) => x == EnumTaskCheckReceiveMethod.Submit)) {
     return submitColumns;
   } else {
-    if (tabType.value == 'signRecord') {
+    if (form.value.tabType === 'signRecord') {
       return checkInColumns;
     } else {
       return submitColumns;
@@ -137,7 +158,10 @@
         !(
           row.checkReceiveStatus === EnumTaskUserSubmitCheckReceiveStatus.WaitSubmit ||
           row.checkReceiveStatus === EnumTaskUserSubmitCheckReceiveStatus.WaitCheckReceive
-        ) || form.value.isDetail,
+        ) ||
+        form.value.isDetail ||
+        form.value.tabType === 'signRecord' ||
+        !form.value.isInternal,
     },
   },
   {
@@ -153,7 +177,10 @@
         !(
           row.checkReceiveStatus === EnumTaskUserSubmitCheckReceiveStatus.WaitSubmit ||
           row.checkReceiveStatus === EnumTaskUserSubmitCheckReceiveStatus.WaitCheckReceive
-        ) || form.value.isDetail,
+        ) ||
+        form.value.isDetail ||
+        form.value.tabType === 'signRecord' ||
+        !form.value.isInternal,
     },
   },
   {
@@ -215,8 +242,14 @@
     columnsRenderProps: {
       createdTime: { type: 'date' },
       checkReceiveTime: { type: 'date' },
+      userCheckInTime: { type: 'date' },
+      userCheckOutTime: { type: 'date' },
+      checkInTime: { type: 'date' },
+      checkOutTime: { type: 'date' },
       date: { type: 'date', format: 'YYYY-MM-DD' },
       checkReceiveStatus: { type: 'enum', valueEnum: EnumTaskUserSubmitCheckReceiveStatusText },
+      userCheckHistoryType: { type: 'enum', valueEnum: EnumTaskUserSubmitCheckHistoryTypeText },
+      checkHistoryType: { type: 'enum', valueEnum: EnumTaskUserSubmitCheckHistoryTypeText },
       files: {
         type: 'url',
         //@ts-ignore

--
Gitblit v1.9.1