diff --git a/apps/web-antd/src/views/property/attendanceManagement/attendanceGroupSettings/attendance-group-detail.vue b/apps/web-antd/src/views/property/attendanceManagement/attendanceGroupSettings/attendance-group-detail.vue
index 7037f95a..5c656941 100644
--- a/apps/web-antd/src/views/property/attendanceManagement/attendanceGroupSettings/attendance-group-detail.vue
+++ b/apps/web-antd/src/views/property/attendanceManagement/attendanceGroupSettings/attendance-group-detail.vue
@@ -213,7 +213,7 @@ async function showHoliday() {
{{ '第' + (index + 1) + '天' }}
- {{record.shiftId}}
+ {{record.shiftValue}}
diff --git a/apps/web-antd/src/views/property/attendanceManagement/attendanceGroupSettings/group-modal.vue b/apps/web-antd/src/views/property/attendanceManagement/attendanceGroupSettings/group-modal.vue
index b5d4123f..10663dcb 100644
--- a/apps/web-antd/src/views/property/attendanceManagement/attendanceGroupSettings/group-modal.vue
+++ b/apps/web-antd/src/views/property/attendanceManagement/attendanceGroupSettings/group-modal.vue
@@ -111,7 +111,6 @@ const [BasicModal, modalApi] = useVbenModal({
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) {
@@ -135,7 +134,7 @@ const [BasicModal, modalApi] = useVbenModal({
shiftId: null,
})
})
- settingData.cycleData = [{scheduleId: ''}, {scheduleId: ''}];
+ settingData.cycleData = [{shiftId: ''}, {shiftId: ''}];
}
await markInitialized();
modalApi.modalLoading(false);
@@ -154,7 +153,7 @@ async function handleConfirm() {
if (data.attendanceType == 1) {
let hasError = true;
settingData.cycleData.some((item, index) => {
- if (!item.scheduleId) {
+ if (!item.shiftId) {
hasError = false
message.warning('请选择周期天数对应班次。');
return;
@@ -252,7 +251,7 @@ function handleShiftList(list: any[]) {
function addCycleHandle() {
if (settingData.cycleData.length < 31) {
settingData.cycleData.push({
- scheduleId: '',
+ shiftId: '',
})
} else {
message.warning('周期天数最多31天。');
@@ -492,7 +491,7 @@ function getUnCheckInData(val: any) {