From 62f1d43ac50d590595b00b4a0b3276aa94732e60 Mon Sep 17 00:00:00 2001
From: dev_ljl <2590379346@qq.com>
Date: Tue, 29 Jul 2025 17:26:45 +0800
Subject: [PATCH 1/2] =?UTF-8?q?fix:=E8=80=83=E5=8B=A4=E7=BB=84=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/model.d.ts        |  2 ++
 .../attendance-group-detail.vue               | 14 ++++++++++++-
 .../attendanceGroupSettings/group-modal.vue   | 20 +++++++++++++++++--
 3 files changed, 33 insertions(+), 3 deletions(-)

diff --git a/apps/web-antd/src/api/property/attendanceManagement/attendanceGroupSettings/model.d.ts b/apps/web-antd/src/api/property/attendanceManagement/attendanceGroupSettings/model.d.ts
index 21ade3dc..940efe53 100644
--- a/apps/web-antd/src/api/property/attendanceManagement/attendanceGroupSettings/model.d.ts
+++ b/apps/web-antd/src/api/property/attendanceManagement/attendanceGroupSettings/model.d.ts
@@ -29,6 +29,8 @@ export interface GroupVO {
 
   attendanceList:any[];
 
+  scheduleCycleList:any[];
+
 }
 
 export interface GroupForm extends BaseEntity {
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 95c1db8e..7037f95a 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
@@ -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);
 }
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 25246edf..b5d4123f 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
@@ -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({

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 2/2] =?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">