From 2d186e743eb24fd44fba02e2146e55273a66f153 Mon Sep 17 00:00:00 2001
From: wupengfei <834520024@qq.com>
Date: 星期三, 12 十一月 2025 17:53:47 +0800
Subject: [PATCH] feat: 1.3.0.2
---
src/views/EmploymentManage/components/CheckManageDialog.vue | 43 +++++++++++++++++++++++++++++++++++++------
1 files changed, 37 insertions(+), 6 deletions(-)
diff --git a/src/views/EmploymentManage/components/CheckManageDialog.vue b/src/views/EmploymentManage/components/CheckManageDialog.vue
index 4fdb43f..c0b155b 100644
--- a/src/views/EmploymentManage/components/CheckManageDialog.vue
+++ b/src/views/EmploymentManage/components/CheckManageDialog.vue
@@ -39,6 +39,7 @@
type Form = {
id: string;
checkReceiveMethods: EnumTaskCheckReceiveMethod[];
+ isInternal: boolean;
isDetail: boolean;
};
@@ -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: '鎿嶄綔浜�',
},
@@ -137,7 +158,9 @@
!(
row.checkReceiveStatus === EnumTaskUserSubmitCheckReceiveStatus.WaitSubmit ||
row.checkReceiveStatus === EnumTaskUserSubmitCheckReceiveStatus.WaitCheckReceive
- ) || form.value.isDetail,
+ ) ||
+ form.value.isDetail ||
+ !form.value.isInternal,
},
},
{
@@ -153,7 +176,9 @@
!(
row.checkReceiveStatus === EnumTaskUserSubmitCheckReceiveStatus.WaitSubmit ||
row.checkReceiveStatus === EnumTaskUserSubmitCheckReceiveStatus.WaitCheckReceive
- ) || form.value.isDetail,
+ ) ||
+ form.value.isDetail ||
+ !form.value.isInternal,
},
},
{
@@ -215,8 +240,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