考勤-班次管理

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

@@ -1,8 +1,6 @@
 import type { ShiftVO, ShiftForm, ShiftQuery } from './model';
-
 import type { ID, IDS } from '#/api/common';
 import type { PageResult } from '#/api/common';
-
 import { commonExport } from '#/api/helper';
 import { requestClient } from '#/api/request';
 

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

@@ -40,7 +40,6 @@ export interface ShiftVO {
    * 休息结束时间
    */
   restEndTime: string;
-
 }
 
 export interface ShiftForm extends BaseEntity {
@@ -83,7 +82,6 @@ export interface ShiftForm extends BaseEntity {
    * 休息结束时间
    */
   restEndTime?: string;
-
 }
 
 export interface ShiftQuery extends PageQuery {

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

@@ -17,6 +17,7 @@ import shiftModal from './shift-modal.vue';
 import shiftDetail from './shift-detail.vue';
 import { columns, querySchema } from './data';
 import {TableSwitch} from "#/components/table";
+import { $t } from '#/locales';
 
 const formOptions: VbenFormProps = {
   commonConfig: {

apps/web-antd/src/views/property/attendanceManagement/shiftSetting/shift-detail.vue

@@ -3,15 +3,9 @@ import type {ShiftVO} from '#/api/property/attendanceManagement/shiftSetting/mod
 import {shallowRef} from 'vue';
 import {useVbenModal} from '@vben/common-ui';
 import {Descriptions, DescriptionsItem} from 'ant-design-vue';
-import dayjs from 'dayjs';
-import duration from 'dayjs/plugin/duration';
-import relativeTime from 'dayjs/plugin/relativeTime';
 import {shiftInfo} from '#/api/property/attendanceManagement/shiftSetting';
 import {renderDict} from "#/utils/render";
 
-dayjs.extend(duration);
-dayjs.extend(relativeTime);
-
 const [BasicModal, modalApi] = useVbenModal({
   onOpenChange: handleOpenChange,
   onClosed() {
@@ -40,7 +34,7 @@ async function handleOpenChange(open: boolean) {
         {{ shiftSettingDetail.name }}
       </DescriptionsItem>
       <DescriptionsItem label="考勤时间">
-        {{ shiftSettingDetail.startTime ? shiftSettingDetail.startTime + '-' + shiftSettingDetail.endTime : '-' }}
+        {{ shiftSettingDetail.startTime + '-' + shiftSettingDetail.endTime }}
       </DescriptionsItem>
       <DescriptionsItem label="是否休息">
         {{ shiftSettingDetail.isRest===0 ? '不休息' : '休息' }}

apps/web-antd/src/views/property/attendanceManagement/shiftSetting/shift-modal.vue

@@ -4,28 +4,23 @@ import dayjs from 'dayjs';
 import { useVbenModal } from '@vben/common-ui';
 import { $t } from '@vben/locales';
 import { cloneDeep } from '@vben/utils';
-
 import { useVbenForm } from '#/adapter/form';
 import { shiftAdd, shiftInfo, shiftUpdate } from '#/api/property/attendanceManagement/shiftSetting';
 import { defaultFormValueGetter, useBeforeCloseDiff } from '#/utils/popup';
-
 import { modalSchema } from './data';
 import {TimeRangePicker} from "ant-design-vue";
 
 const emit = defineEmits<{ reload: [] }>();
-
 const isUpdate = ref(false);
+
 const title = computed(() => {
   return isUpdate.value ? $t('pages.common.edit') : $t('pages.common.add');
 });
 
 const [BasicForm, formApi] = useVbenForm({
   commonConfig: {
-    // 默认占满两列
     formItemClass: 'col-span-2',
-    // 默认label宽度 px
     labelWidth: 100,
-    // 通用配置项 会影响到所有表单项
     componentProps: {
       class: 'w-full',
     }
@@ -43,7 +38,6 @@ const { onBeforeClose, markInitialized, resetInitialized } = useBeforeCloseDiff(
 );
 
 const [BasicModal, modalApi] = useVbenModal({
-  // 在这里更改宽度
   class: 'w-[550px]',
   fullscreenButton: false,
   onBeforeClose,
@@ -54,16 +48,13 @@ const [BasicModal, modalApi] = useVbenModal({
       return null;
     }
     modalApi.modalLoading(true);
-
     const { id } = modalApi.getData() as { id?: number | string };
     isUpdate.value = !!id;
-
     if (isUpdate.value && id) {
       const record = await shiftInfo(id);
       await formApi.setValues(record);
     }
     await markInitialized();
-
     modalApi.modalLoading(false);
   },
 });
@@ -75,7 +66,6 @@ async function handleConfirm() {
     if (!valid) {
       return;
     }
-    // getValues获取为一个readonly的对象 需要修改必须先深拷贝一次
     const data = cloneDeep(await formApi.getValues());
     data.startTime = dayjs(data.attendanceTimeRange[0]).format('HH:mm:ss');
     data.endTime = dayjs(data.attendanceTimeRange[1]).format('HH:mm:ss');
@@ -86,7 +76,7 @@ async function handleConfirm() {
     await (isUpdate.value ? shiftUpdate(data) : shiftAdd(data));
     resetInitialized();
     emit('reload');
-    modalApi.close();
+    await modalApi.close();
   } catch (error) {
     console.error(error);
   } finally {