From 90d2baa0f9ce23436659123d84bbb5fd00a276a1 Mon Sep 17 00:00:00 2001
From: wupengfei <834520024@qq.com>
Date: 星期一, 10 十一月 2025 15:48:12 +0800
Subject: [PATCH] fix: bug
---
src/constants/task.ts | 6 ++++++
src/views/EmploymentManage/components/CheckManageDialog.vue | 34 ++++++++++++++++++++++++++++++----
.eslintrc-auto-import.json | 1 +
auto-imports.d.ts | 2 ++
4 files changed, 39 insertions(+), 4 deletions(-)
diff --git a/.eslintrc-auto-import.json b/.eslintrc-auto-import.json
index a665acf..ba6ef6d 100644
--- a/.eslintrc-auto-import.json
+++ b/.eslintrc-auto-import.json
@@ -110,6 +110,7 @@
"EnumTaskUserSignContractStatusText": true,
"EnumTaskUserSignContractStatusTextForFilter": true,
"EnumTaskUserSubmitCheckHistoryType": true,
+ "EnumTaskUserSubmitCheckHistoryTypeText": true,
"EnumTaskUserSubmitCheckReceiveStatus": true,
"EnumTaskUserSubmitCheckReceiveStatusText": true,
"EnumUserBankCardAccess": true,
diff --git a/auto-imports.d.ts b/auto-imports.d.ts
index e7f2579..77c382f 100644
--- a/auto-imports.d.ts
+++ b/auto-imports.d.ts
@@ -115,6 +115,7 @@
const EnumTaskUserSignContractStatusText: typeof import('./src/constants/enterpriseEmployee')['EnumTaskUserSignContractStatusText']
const EnumTaskUserSignContractStatusTextForFilter: typeof import('./src/constants/enterpriseEmployee')['EnumTaskUserSignContractStatusTextForFilter']
const EnumTaskUserSubmitCheckHistoryType: typeof import('./src/constants/apiEnum')['EnumTaskUserSubmitCheckHistoryType']
+ const EnumTaskUserSubmitCheckHistoryTypeText: typeof import('./src/constants/task')['EnumTaskUserSubmitCheckHistoryTypeText']
const EnumTaskUserSubmitCheckReceiveStatus: typeof import('./src/constants/apiEnum')['EnumTaskUserSubmitCheckReceiveStatus']
const EnumTaskUserSubmitCheckReceiveStatusText: typeof import('./src/constants/task')['EnumTaskUserSubmitCheckReceiveStatusText']
const EnumUserBankCardAccess: typeof import('./src/constants/apiEnum')['EnumUserBankCardAccess']
@@ -441,6 +442,7 @@
readonly EnumTaskUserSignContractStatusText: UnwrapRef<typeof import('./src/constants/enterpriseEmployee')['EnumTaskUserSignContractStatusText']>
readonly EnumTaskUserSignContractStatusTextForFilter: UnwrapRef<typeof import('./src/constants/enterpriseEmployee')['EnumTaskUserSignContractStatusTextForFilter']>
readonly EnumTaskUserSubmitCheckHistoryType: UnwrapRef<typeof import('./src/constants/apiEnum')['EnumTaskUserSubmitCheckHistoryType']>
+ readonly EnumTaskUserSubmitCheckHistoryTypeText: UnwrapRef<typeof import('./src/constants/task')['EnumTaskUserSubmitCheckHistoryTypeText']>
readonly EnumTaskUserSubmitCheckReceiveStatus: UnwrapRef<typeof import('./src/constants/apiEnum')['EnumTaskUserSubmitCheckReceiveStatus']>
readonly EnumTaskUserSubmitCheckReceiveStatusText: UnwrapRef<typeof import('./src/constants/task')['EnumTaskUserSubmitCheckReceiveStatusText']>
readonly EnumUserBankCardAccess: UnwrapRef<typeof import('./src/constants/apiEnum')['EnumUserBankCardAccess']>
diff --git a/src/constants/task.ts b/src/constants/task.ts
index b9f1f04..c73b326 100644
--- a/src/constants/task.ts
+++ b/src/constants/task.ts
@@ -182,3 +182,9 @@
[EnumTaskSettlementAuditStatus.Pass]: '瀹℃牳閫氳繃',
[EnumTaskSettlementAuditStatus.Fail]: '椹冲洖',
};
+
+export const EnumTaskUserSubmitCheckHistoryTypeText = {
+ [EnumTaskUserSubmitCheckHistoryType.CheckIn]: '绛惧埌',
+ [EnumTaskUserSubmitCheckHistoryType.CheckOut]: '绛惧嚭',
+ [EnumTaskUserSubmitCheckHistoryType.UnCheckIn]: '鏈埌宀�',
+};
diff --git a/src/views/EmploymentManage/components/CheckManageDialog.vue b/src/views/EmploymentManage/components/CheckManageDialog.vue
index 4fdb43f..27b25bb 100644
--- a/src/views/EmploymentManage/components/CheckManageDialog.vue
+++ b/src/views/EmploymentManage/components/CheckManageDialog.vue
@@ -79,6 +79,11 @@
enCode: 'checkReceiveTime',
name: '楠屾敹鏃堕棿',
},
+ {
+ id: '6',
+ enCode: 'userOperator',
+ name: '楠屾敹浜�',
+ },
]);
const checkInColumns = defineColumns([
@@ -89,21 +94,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: '鎿嶄綔浜�',
},
@@ -215,8 +235,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