Merge branch 'master' of http://47.109.37.87:3000/by2025/admin-vben5

apps/web-antd/src/api/property/attendanceManagement/attendanceGroupSettings/index.ts

@@ -27,10 +27,12 @@ export function groupExport(params?: GroupQuery) {
 /**
  * 查询考勤组基本信息详情
  * @param id id
+ * @param attendanceType 类型
  * @returns 考勤组基本信息详情
  */
-export function groupInfo(id: ID) {
-  return requestClient.get<GroupVO>(`/property/group/${id}`);
+export function groupInfo(id: ID,attendanceType:string) {
+  let params={attendanceType}
+  return requestClient.get<GroupVO>(`/property/group/${id}`,{params});
 }
 
 /**
@@ -54,10 +56,12 @@ export function groupUpdate(data: GroupForm) {
 /**
  * 删除考勤组基本信息
  * @param id id
+ * @param attendanceType 类型
  * @returns void
  */
-export function groupRemove(id: ID | IDS) {
-  return requestClient.deleteWithMsg<void>(`/property/group/${id}`);
+export function groupRemove(id: ID | IDS,attendanceType:string) {
+  let params={attendanceType}
+  return requestClient.deleteWithMsg<void>(`/property/group/${id}`,{params});
 }
 
 /**

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

@@ -44,8 +44,8 @@ async function handleOpenChange(open: boolean) {
     return null;
   }
   modalApi.modalLoading(true);
-  const { id } = modalApi.getData() as { id: number | string };
-  groupDetail.value = await groupInfo(id);
+  const {id,attendanceType} = modalApi.getData() as { id?: number | string,attendanceType?:string };
+  groupDetail.value = await groupInfo(id,attendanceType);
   modalApi.modalLoading(false);
 }
 
@@ -75,11 +75,7 @@ async function showHoliday() {
         </DescriptionsItem>
         <DescriptionsItem label="考勤类型">
           <component
-            :is="
-              groupDetail.attendanceType
-                ? renderDict(groupDetail.attendanceType, 'wy_kqlx')
-                : ''
-            "
+            :is="renderDict(groupDetail.attendanceType, 'wy_kqlx')"
           />
         </DescriptionsItem>
         <DescriptionsItem label="状态">

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

@@ -65,7 +65,7 @@ const {onBeforeClose, markInitialized, resetInitialized} = useBeforeCloseDiff(
   },
 );
 
-onMounted(()=>{
+onMounted(() => {
   getDictOptions('wy_kqgzr')
 })
 
@@ -81,10 +81,13 @@ const [BasicModal, modalApi] = useVbenModal({
       return null;
     }
     modalApi.modalLoading(true);
-    const {id} = modalApi.getData() as { id?: number | string };
+    const {id, attendanceType} = modalApi.getData() as {
+      id?: number | string,
+      attendanceType?: string
+    };
     isUpdate.value = !!id;
     if (isUpdate.value && id) {
-      const record = await groupInfo(id);
+      const record = await groupInfo(id, attendanceType);
       await formApi.setValues(record);
     } else {
       getDictOptions('wy_kqgzr').forEach(item => {
@@ -113,9 +116,10 @@ async function handleConfirm() {
     // getValues获取为一个readonly的对象 需要修改必须先深拷贝一次
     const data = cloneDeep(await formApi.getValues());
     if (data.attendanceType == 1) {
-      let hasError = false;
-      settingData.cycleData.forEach((item, index) => {
+      let hasError = true;
+      settingData.cycleData.some((item, index) => {
         if (!item.scheduleId) {
+          hasError=false
           message.warning('请选择周期天数对应班次。');
           return;
         }
@@ -125,6 +129,7 @@ async function handleConfirm() {
         return;
       }
       data.numList = settingData.cycleData
+      data.mustNoCheck = settingData.isAutomatic ? 1 : 0
     } else {
       data.weekSetList = settingData.weekdayData
       data.clockDate = settingData.checkInData.concat(settingData.unCheckInData)
@@ -432,7 +437,7 @@ function getUnCheckInData(val: any) {
               <Select
                 ref="select"
                 style="width: 100%"
-                v-model:value="record.shiftId"
+                v-model:value="record.scheduleId"
                 placeholder="请选择班次"
               >
                 <SelectOption v-for="item in shiftList" :value="item.id">

apps/web-antd/src/views/property/attendanceManagement/attendanceGroupSettings/index.vue

@@ -88,12 +88,12 @@ function handleAdd() {
 }
 
 async function handleEdit(row: Required<GroupForm>) {
-  modalApi.setData({ id: row.id });
+  modalApi.setData({ id: row.id,attendanceType:row.attendanceType });
   modalApi.open();
 }
 
 async function handleInfo(row: Required<GroupForm>) {
-  detailApi.setData({ id: row.id });
+  detailApi.setData({ id: row.id,attendanceType:row.attendanceType });
   detailApi.open();
 }