by2025/admin-vben5
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

master #3

Merged
bichangxiong merged 19 commits from master into prod 2025-08-29 18:46:27 +08:00
Conversation 0 Commits 19 Files Changed 17 +3
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 7db1f717e9 - Show all commits

3
apps/web-antd/src/views/property/attendanceManagement/workforceManagement/data.ts
View File

@@ -328,6 +328,9 @@ export const workforceDayDetailColumns: VxeGridProps['columns'] = [
width: 'auto', width: 'auto',
slots: { slots: {
default: ({ row }) => { default: ({ row }) => {
if (!row.shift) {
return '/';
}
if (row.shift.startTime && row.shift.endTime) { if (row.shift.startTime && row.shift.endTime) {
if (row.shift.restEndTime && row.shift.restStartTime) { if (row.shift.restEndTime && row.shift.restStartTime) {
return `${row.shift.startTime}～${row.shift.endTime} ${row.shift.restStartTime}～${row.shift.restEndTime}`; return `${row.shift.startTime}～${row.shift.endTime} ${row.shift.restStartTime}～${row.shift.restEndTime}`;