1、logo替换

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

@@ -21,6 +21,8 @@ export interface GroupVO {
    */
   attendanceType: number;
 
+  isAutomatic: number;
+
 }
 
 export interface GroupForm extends BaseEntity {

apps/web-antd/src/preferences.ts

@@ -1,5 +1,5 @@
 import { defineOverridesPreferences } from '@vben/preferences';
-
+import logo from '../src/assets/logo.png'
 /**
  * @description 项目配置文件
  * 只需要覆盖项目中的一部分配置，不需要的配置不用覆盖，会自动使用默认配置
@@ -62,8 +62,8 @@ export const overridesPreferences = defineOverridesPreferences({
    *
    * !!! 更改配置后请清空浏览器缓存
    */
-  // logo: {
-  //   enable: true,
-  //   source: '',
-  // },
+  logo: {
+    enable: true,
+    source: logo,
+  },
 });

apps/web-antd/src/views/property/attendanceManagement/attendanceGroupSettings/check-in-date.vue

@@ -45,7 +45,7 @@ const [BasicModal, modalApi] = useVbenModal({
     }
     modalApi.modalLoading(true);
     const {check} = modalApi.getData() as { check?: boolean };
-    isClockIn.value = check;
+    isClockIn.value = check || false;
     await markInitialized();
     modalApi.modalLoading(false);
   },

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

@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import {computed, reactive, ref} from 'vue';
+import {computed, onMounted, reactive, ref} from 'vue';
 
 import {useVbenModal} from '@vben/common-ui';
 import {$t} from '@vben/locales';
@@ -36,10 +36,10 @@ const title = computed(() => {
 });
 const settingData = reactive({
   isAutomatic: true,
-  weekdayData: [],
-  cycleData: [],
-  unCheckInData: [],
-  checkInData: [],
+  weekdayData: [] as any[],
+  cycleData: [] as any[],
+  unCheckInData: [] as any[],
+  checkInData: [] as any[],
   shiftId: ''
 })
 const [BasicForm, formApi] = useVbenForm({
@@ -65,6 +65,10 @@ const {onBeforeClose, markInitialized, resetInitialized} = useBeforeCloseDiff(
   },
 );
 
+onMounted(()=>{
+  getDictOptions('wy_kqgzr')
+})
+
 const [BasicModal, modalApi] = useVbenModal({
   fullscreenButton: false,
   fullscreen: true,
@@ -83,19 +87,15 @@ const [BasicModal, modalApi] = useVbenModal({
       const record = await groupInfo(id);
       await formApi.setValues(record);
     } else {
-      const dictOptions = getDictOptions('wy_kqgzr');
-      console.log(dictOptions)
-      if (dictOptions) {
-        dictOptions.forEach(item => {
-          settingData.weekdayData.push({
-            dayOfWeek: item.value,
-            label: item.label,
-            shiftValue: '休息',
-            isRest: 1,
-            id: null,
-          })
+      getDictOptions('wy_kqgzr').forEach(item => {
+        settingData.weekdayData.push({
+          dayOfWeek: item.value,
+          label: item.label,
+          shiftValue: '休息',
+          isRest: 1,
+          id: null,
         })
-      }
+      })
       settingData.cycleData = [{id: ''}, {id: ''}];
     }
     await markInitialized();

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

@@ -12,7 +12,6 @@ dayjs.extend(relativeTime);
 import type {HouseChargeVO} from "#/api/property/costManagement/houseCharge/model";
 import {getHoliday} from "#/api/property/attendanceManagement/attendanceGroupSettings";
 import {Calendar, Tag} from 'ant-design-vue'
-import type {Holiday} from "#/api/property/attendanceManagement/attendanceGroupSettings/model";
 
 const [BasicModal, modalApi] = useVbenModal({
   onOpenChange: handleOpenChange,
@@ -25,7 +24,7 @@ const houseChargeDetail = shallowRef<null | HouseChargeVO>(null);
 
 const holidayData = ref<any>({})
 
-const year = ref<string>(new Date().getFullYear())
+const year = ref<string>(new Date().getFullYear().toString())
 
 async function handleOpenChange(open: boolean) {
   if (!open) {