From 171ed8a087fb3064d4b2d71d6b8175e20db4a68b Mon Sep 17 00:00:00 2001
From: FLL <2162874245@qq.com>
Date: Sun, 20 Jul 2025 17:47:41 +0800
Subject: [PATCH] =?UTF-8?q?=E8=80=83=E5=8B=A4-=E7=8F=AD=E6=AC=A1=E7=AE=A1?=
=?UTF-8?q?=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../attendanceManagement/shiftSetting/index.ts | 2 --
.../attendanceManagement/shiftSetting/model.d.ts | 2 --
.../attendanceManagement/shiftSetting/index.vue | 1 +
.../shiftSetting/shift-detail.vue | 8 +-------
.../shiftSetting/shift-modal.vue | 14 ++------------
5 files changed, 4 insertions(+), 23 deletions(-)
diff --git a/apps/web-antd/src/api/property/attendanceManagement/shiftSetting/index.ts b/apps/web-antd/src/api/property/attendanceManagement/shiftSetting/index.ts
index 2ed90e67..98bbe246 100644
--- a/apps/web-antd/src/api/property/attendanceManagement/shiftSetting/index.ts
+++ b/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';
diff --git a/apps/web-antd/src/api/property/attendanceManagement/shiftSetting/model.d.ts b/apps/web-antd/src/api/property/attendanceManagement/shiftSetting/model.d.ts
index 76332c84..a1ae216d 100644
--- a/apps/web-antd/src/api/property/attendanceManagement/shiftSetting/model.d.ts
+++ b/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 {
diff --git a/apps/web-antd/src/views/property/attendanceManagement/shiftSetting/index.vue b/apps/web-antd/src/views/property/attendanceManagement/shiftSetting/index.vue
index c356c100..80471597 100644
--- a/apps/web-antd/src/views/property/attendanceManagement/shiftSetting/index.vue
+++ b/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: {
diff --git a/apps/web-antd/src/views/property/attendanceManagement/shiftSetting/shift-detail.vue b/apps/web-antd/src/views/property/attendanceManagement/shiftSetting/shift-detail.vue
index bef37f0c..706a5e04 100644
--- a/apps/web-antd/src/views/property/attendanceManagement/shiftSetting/shift-detail.vue
+++ b/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 }}
- {{ shiftSettingDetail.startTime ? shiftSettingDetail.startTime + '-' + shiftSettingDetail.endTime : '-' }}
+ {{ shiftSettingDetail.startTime + '-' + shiftSettingDetail.endTime }}
{{ shiftSettingDetail.isRest===0 ? '不休息' : '休息' }}
diff --git a/apps/web-antd/src/views/property/attendanceManagement/shiftSetting/shift-modal.vue b/apps/web-antd/src/views/property/attendanceManagement/shiftSetting/shift-modal.vue
index d9ec6fe3..d404aa5a 100644
--- a/apps/web-antd/src/views/property/attendanceManagement/shiftSetting/shift-modal.vue
+++ b/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 {