From b7e2d1894e482071bb42417704c8401a64cdb79a Mon Sep 17 00:00:00 2001
From: dev_ljl <2590379346@qq.com>
Date: Wed, 30 Jul 2025 09:40:01 +0800
Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E8=80=83=E5=8B=A4=E7=BB=84?=
 =?UTF-8?q?=E6=8E=92=E7=8F=AD=E5=88=B6=E4=BF=9D=E5=AD=98=E3=80=81=E7=BC=96?=
 =?UTF-8?q?=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../attendanceGroupSettings/attendance-group-detail.vue  | 2 +-
 .../attendanceGroupSettings/group-modal.vue              | 9 ++++-----
 2 files changed, 5 insertions(+), 6 deletions(-)

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() {
                 <span>{{ '第' + (index + 1) + '天' }}</span>
               </template>
               <template v-if="column.dataIndex === 'shiftId'">
-                {{record.shiftId}}
+                {{record.shiftValue}}
               </template>
             </template>
           </Table>
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) {
               <Select
                 ref="select"
                 style="width: 100%"
-                v-model:value="record.scheduleId"
+                v-model:value="record.shiftId"
                 placeholder="请选择班次"
               >
                 <SelectOption v-for="item in shiftList" :value="item.id">