fix:考勤组编辑

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 {

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);
 }

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({