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

fix:考勤组编辑
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
Details

Browse Source
This commit is contained in:
dev_ljl 2025-07-29 17:26:45 +08:00
parent 4f156a3f58
commit 62f1d43ac5
3 changed files with 33 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/web-antd/src/api/property/attendanceManagement/attendanceGroupSettings/model.d.ts vendored
View File

@ -29,6 +29,8 @@ export interface GroupVO {
attendanceList:any[];
scheduleCycleList:any[];
}
export interface GroupForm extends BaseEntity {

14
apps/web-antd/src/views/property/attendanceManagement/attendanceGroupSettings/attendance-group-detail.vue
View File

@ -65,7 +65,19 @@ async function handleOpenChange(open: boolean) {
})
groupDetail.value.isAutomatic=true
}else {
cycleData.value=[];
cycleData.value=res.scheduleCycleList;
cycleData.value.forEach(item => {
if(item.shiftId){
const shift = res.attendanceList.find(i => item.shiftId == i.id);
let str = ''
if (shift.isRest) {
str = `${shift.name}：${shift.startTime}~${shift.restStartTime} ${shift.restEndTime}~${shift.endTime}`;
} else {
str = `${shift.name}：${shift.startTime}~${shift.endTime}`;
}
item.shiftValue=str
}
})
}
modalApi.modalLoading(false);
}

20
apps/web-antd/src/views/property/attendanceManagement/attendanceGroupSettings/group-modal.vue
View File

@ -96,7 +96,22 @@ const [BasicModal, modalApi] = useVbenModal({
settingData.checkInData = record.clockDateList.filter(item => item.mustNoCheck == 1)
settingData.weekdayData = record.weekList
settingData.weekdayData.forEach(item => {
if (item.shiftId) {
const shift = record.attendanceList.find(i => item.shiftId == i.id);
let str = ''
if (shift.isRest) {
str = `${shift.name}：${shift.startTime}~${shift.restStartTime} ${shift.restEndTime}~${shift.endTime}`;
} else {
str = `${shift.name}：${shift.startTime}~${shift.endTime}`;
}
item.shiftValue = str
}
})
} else {
settingData.cycleData=record.scheduleCycleList
settingData.cycleData.forEach(item => {
if(item.shiftId){
item.scheduleId=item.shiftId
const shift = record.attendanceList.find(i => item.shiftId == i.id);
let str = ''
if (shift.isRest) {
@ -107,8 +122,7 @@ const [BasicModal, modalApi] = useVbenModal({
item.shiftValue=str
}
})
} else {
shiftList.value=record.attendanceList
}
await formApi.setValues(record);
} else {
@ -179,6 +193,8 @@ async function handleClosed() {
checkInData: [],
shiftId: '',
});
shiftInfo.value = undefined
shiftList.value = []
}
const [HolidayCalendar, holidayApi] = useVbenModal({