From a1e9064bb4c0a41c9a1e389cdd0f0f9bab009309 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期日, 08 十一月 2026 09:45:52 +0800
Subject: [PATCH] feat(hrm): 请假批量导入、加班选申请人、批量排班与节假日区间联动
---
src/api/hrm/leave/index.ts | 20 +
src/api/hrm/attendance/holiday/index.ts | 87 +++++
src/api/hrm/employee/index.ts | 2
src/api/hrm/schedule/index.ts | 32 ++
src/views/hrm/attendance/holiday/index.vue | 65 +++-
src/views/hrm/schedule/index.vue | 313 ++++++++++++++++++++
src/views/hrm/leave/modules/import-form.vue | 164 ++++++++++
src/views/hrm/overtime/modules/form.vue | 57 ++-
src/views/hrm/attendance/holiday/data.ts | 17 +
src/views/hrm/attendance/holiday/modules/form.vue | 62 +++
src/views/hrm/leave/index.vue | 19 +
src/views/hrm/overtime/data.ts | 30 +
12 files changed, 811 insertions(+), 57 deletions(-)
diff --git a/src/api/hrm/attendance/holiday/index.ts b/src/api/hrm/attendance/holiday/index.ts
index 89da4ec..ba4ced7 100644
--- a/src/api/hrm/attendance/holiday/index.ts
+++ b/src/api/hrm/attendance/holiday/index.ts
@@ -3,7 +3,7 @@
import { requestClient } from '#/api/request';
export namespace HrmAttendanceHolidayApi {
- /** 鑺傚亣鏃� */
+ /** 鑺傚亣鏃ワ紙閫愭棩锛� */
export interface Holiday {
id?: number;
name?: string;
@@ -14,12 +14,60 @@
remark?: string;
createTime?: string;
}
+
+ /** 鑺傚亣鏃ワ紙鎸夎繛缁棩鏈熷尯闂村悎骞跺悗鐨勮锛� */
+ export interface HolidayGroup {
+ id?: number;
+ /** 鍖洪棿鍐呭叏閮ㄨ褰旾D锛岀紪杈�/鍒犻櫎鏃舵暣浣撴彁浜� */
+ ids?: number[];
+ name?: string;
+ /** 鍖洪棿寮�濮嬫棩鏈� */
+ date?: string;
+ /** 鍖洪棿缁撴潫鏃ユ湡 */
+ endDate?: string;
+ /** 鍖洪棿澶╂暟 */
+ dayCount?: number;
+ type?: number;
+ isLegal?: number;
+ remark?: string;
+ createTime?: string;
+ }
+
+ /** 鎸夋棩鏈熷尯闂存洿鏂板弬鏁� */
+ export interface HolidayRangeUpdateReq {
+ ids: number[];
+ name: string;
+ startDate: string;
+ endDate: string;
+ type: number;
+ isLegal?: boolean;
+ remark?: string;
+ }
}
-/** 鏌ヨ鑺傚亣鏃ュ垎椤靛垪琛� */
+/** 鏌ヨ鑺傚亣鏃ュ垎椤靛垪琛紙閫愭棩锛屽鍑�/鍏煎鐢級 */
export function getAttendanceHolidayPage(params: PageParam) {
return requestClient.get<PageResult<HrmAttendanceHolidayApi.Holiday>>(
'/hrm/attendance/holiday/page',
+ { params },
+ );
+}
+
+/** 鏌ヨ鑺傚亣鏃ュ垎椤靛垪琛紙鎸夎繛缁棩鏈熷尯闂村悎骞讹紝鍒楄〃椤典娇鐢級 */
+export function getAttendanceHolidayGroupPage(params: PageParam) {
+ return requestClient.get<PageResult<HrmAttendanceHolidayApi.HolidayGroup>>(
+ '/hrm/attendance/holiday/page-grouped',
+ { params },
+ );
+}
+
+/** 鏌ヨ鎸囧畾鏃ユ湡鑼冨洿鐨勮妭鍋囨棩锛堥�愭棩锛屾帓鐝棩鍘嗕娇鐢級 */
+export function getAttendanceHolidayList(params: {
+ startDate: string;
+ endDate: string;
+}) {
+ return requestClient.get<HrmAttendanceHolidayApi.Holiday[]>(
+ '/hrm/attendance/holiday/list',
{ params },
);
}
@@ -36,9 +84,31 @@
return requestClient.post('/hrm/attendance/holiday/create', data);
}
+/** 鎸夋棩鏈熻寖鍥存柊澧炶妭鍋囨棩锛堝尯闂村唴姣忎釜鑷劧鏃ュ悇涓�鏉★級 */
+export function createAttendanceHolidayRange(data: {
+ name: string;
+ startDate: string;
+ endDate: string;
+ type: number;
+ isLegal?: boolean;
+ remark?: string;
+}) {
+ return requestClient.post<number>(
+ '/hrm/attendance/holiday/create-range',
+ data,
+ );
+}
+
/** 鏇存柊鑺傚亣鏃� */
export function updateAttendanceHoliday(data: HrmAttendanceHolidayApi.Holiday) {
return requestClient.put('/hrm/attendance/holiday/update', data);
+}
+
+/** 鎸夋棩鏈熷尯闂存洿鏂拌妭鍋囨棩锛堝垹闄ゅ師鍖洪棿璁板綍鍚庢寜鏂拌捣姝㈡棩鏈熼噸鍐欙級 */
+export function updateAttendanceHolidayRange(
+ data: HrmAttendanceHolidayApi.HolidayRangeUpdateReq,
+) {
+ return requestClient.put('/hrm/attendance/holiday/update-range', data);
}
/** 鍒犻櫎鑺傚亣鏃� */
@@ -46,7 +116,16 @@
return requestClient.delete(`/hrm/attendance/holiday/delete?id=${id}`);
}
+/** 鎸夋棩鏈熷尯闂村垹闄よ妭鍋囨棩锛堝尯闂村唴鍏ㄩ儴鏃ユ湡锛� */
+export function deleteAttendanceHolidayRange(ids: number[]) {
+ return requestClient.delete(
+ `/hrm/attendance/holiday/delete-range?ids=${ids.join(',')}`,
+ );
+}
+
/** 瀵煎嚭鑺傚亣鏃� Excel */
export function exportAttendanceHoliday(params: any) {
- return requestClient.download('/hrm/attendance/holiday/export-excel', { params });
-}
\ No newline at end of file
+ return requestClient.download('/hrm/attendance/holiday/export-excel', {
+ params,
+ });
+}
diff --git a/src/api/hrm/employee/index.ts b/src/api/hrm/employee/index.ts
index 9cc7078..71a5ace 100644
--- a/src/api/hrm/employee/index.ts
+++ b/src/api/hrm/employee/index.ts
@@ -97,6 +97,8 @@
name: string;
deptName?: string;
postName?: string;
+ /** 鍛樺伐鐘舵�侊細1-鍦ㄨ亴锛�2-璇曠敤锛�3-绂昏亴 */
+ employeeStatus?: number;
}
/** 鍛樺伐瀵煎叆缁撴灉 */
diff --git a/src/api/hrm/leave/index.ts b/src/api/hrm/leave/index.ts
index ee16a80..a23c17a 100644
--- a/src/api/hrm/leave/index.ts
+++ b/src/api/hrm/leave/index.ts
@@ -28,6 +28,14 @@
key: string;
name: string;
}
+
+ /** 瀵煎叆缁撴灉 */
+ export interface ImportResult {
+ /** 鍒涘缓鎴愬姛鐨勮褰曪紙鎵嬫満鍙� + 鏃ユ湡锛� */
+ createNames?: string[];
+ /** 瀵煎叆澶辫触闆嗗悎锛宬ey 涓恒�岀N琛屻�嶏紝value 涓哄け璐ュ師鍥� */
+ failureNames?: Record<string, string>;
+ }
}
/** 鏌ヨ璇峰亣鐢宠鍒嗛〉鍒楄〃 */
@@ -75,4 +83,16 @@
return requestClient.get<HrmLeaveApi.ApproveProcess[]>(
'/hrm/leave/approve-process-definition-list',
);
+}
+
+/** 涓嬭浇璇峰亣鐢宠瀵煎叆妯℃澘 */
+export function importLeaveTemplate() {
+ return requestClient.download('/hrm/leave/get-import-template');
+}
+
+/** 鎵归噺瀵煎叆璇峰亣鐢宠锛堢敓鎴愯崏绋匡級 */
+export function importLeave(file: File) {
+ return requestClient.upload<HrmLeaveApi.ImportResult>('/hrm/leave/import', {
+ file,
+ });
}
\ No newline at end of file
diff --git a/src/api/hrm/schedule/index.ts b/src/api/hrm/schedule/index.ts
index 100b8b5..64eda88 100644
--- a/src/api/hrm/schedule/index.ts
+++ b/src/api/hrm/schedule/index.ts
@@ -23,6 +23,30 @@
shiftId?: number | null;
remark?: string;
}
+
+ /** 鎸夌兢浣撴壒閲忔帓鐝姹� */
+ export interface BatchSaveReq {
+ /** 閮ㄩ棬ID锛堝惈涓嬬骇閮ㄩ棬锛� */
+ deptId: number;
+ /** 宀椾綅ID锛屼负绌鸿〃绀轰笉闄愬矖浣� */
+ postId?: number;
+ /** 鍛樺伐鐘舵�侊細1-鍦ㄨ亴锛�2-璇曠敤锛�3-绂昏亴锛涗负绌鸿〃绀哄湪鑱屽強璇曠敤 */
+ employeeStatus?: number;
+ /** 寮�濮嬫棩鏈� yyyy-MM-dd */
+ startDate: string;
+ /** 缁撴潫鏃ユ湡 yyyy-MM-dd */
+ endDate: string;
+ /** 鐝ID锛屼负绌鸿〃绀轰紤鎭紙娓呴櫎鎺掔彮锛� */
+ shiftId?: number | null;
+ /** none-涓嶄紤鎭紝single-鍛ㄦ棩浼戞伅锛宒ouble-鍛ㄥ叚鏃ヤ紤鎭� */
+ restMode?: 'double' | 'none' | 'single';
+ }
+
+ /** 鎸夌兢浣撴壒閲忔帓鐝粨鏋� */
+ export interface BatchSaveResp {
+ employeeCount?: number;
+ itemCount?: number;
+ }
}
/** 鏌ヨ鏌愭湀鎺掔彮鍒楄〃 */
@@ -41,3 +65,11 @@
export function saveEmployeeSchedule(data: HrmEmployeeScheduleApi.ScheduleItem[]) {
return requestClient.post('/hrm/employee-schedule/save', data);
}
+
+/** 鎸夐儴闂�+宀椾綅鎵归噺鎺掔彮锛堜竴绫讳汉涓�娆℃帓瀹岋級 */
+export function batchSaveEmployeeSchedule(data: HrmEmployeeScheduleApi.BatchSaveReq) {
+ return requestClient.post<HrmEmployeeScheduleApi.BatchSaveResp>(
+ '/hrm/employee-schedule/batch-save',
+ data,
+ );
+}
diff --git a/src/views/hrm/attendance/holiday/data.ts b/src/views/hrm/attendance/holiday/data.ts
index d082daa..6e143ad 100644
--- a/src/views/hrm/attendance/holiday/data.ts
+++ b/src/views/hrm/attendance/holiday/data.ts
@@ -128,10 +128,23 @@
}
/** 鍒楄〃鐨勫瓧娈� */
-export function useGridColumns(): VxeTableGridOptions<HrmAttendanceHolidayApi.Holiday>['columns'] {
+export function useGridColumns(): VxeTableGridOptions<HrmAttendanceHolidayApi.HolidayGroup>['columns'] {
return [
{ field: 'name', title: '鑺傚亣鏃ュ悕绉�', minWidth: 150 },
- { field: 'date', title: '鏃ユ湡', width: 120 },
+ {
+ field: 'date',
+ title: '鏃ユ湡',
+ minWidth: 220,
+ slots: {
+ default: 'dateRange',
+ },
+ },
+ {
+ field: 'dayCount',
+ title: '澶╂暟',
+ width: 90,
+ formatter: ({ cellValue }) => (cellValue ? `${cellValue} 澶ー : '-'),
+ },
{
field: 'type',
title: '绫诲瀷',
diff --git a/src/views/hrm/attendance/holiday/index.vue b/src/views/hrm/attendance/holiday/index.vue
index 8a33871..da58548 100644
--- a/src/views/hrm/attendance/holiday/index.vue
+++ b/src/views/hrm/attendance/holiday/index.vue
@@ -8,7 +8,12 @@
import { message, Modal, Tag } from 'ant-design-vue';
import { ACTION_ICON, TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
-import { deleteAttendanceHoliday, exportAttendanceHoliday, getAttendanceHolidayPage } from '#/api/hrm/attendance/holiday';
+import {
+ deleteAttendanceHoliday,
+ deleteAttendanceHolidayRange,
+ exportAttendanceHoliday,
+ getAttendanceHolidayGroupPage,
+} from '#/api/hrm/attendance/holiday';
import { $t } from '#/locales';
import { useGridColumns, useGridFormSchema } from './data';
@@ -29,34 +34,58 @@
formModalApi.setData({ formType: 'create' }).open();
}
-/** 缂栬緫鑺傚亣鏃� */
-function handleUpdate(row: HrmAttendanceHolidayApi.Holiday) {
- formModalApi.setData({ id: row.id, formType: 'update' }).open();
+/** 鏃ユ湡鍖洪棿鏍囬锛屽 2026-10-01 ~ 2026-10-03锛堝叡3澶╋級 */
+function rangeText(row: HrmAttendanceHolidayApi.HolidayGroup) {
+ if (!row.endDate || row.endDate === row.date) {
+ return row.date;
+ }
+ return `${row.date} ~ ${row.endDate}`;
+}
+
+/** 缂栬緫鑺傚亣鏃ワ紙鏁翠釜鍖洪棿涓�璧风紪杈戯級 */
+function handleUpdate(row: HrmAttendanceHolidayApi.HolidayGroup) {
+ formModalApi.setData({ id: row.id, row, formType: 'update' }).open();
}
/** 鏌ョ湅鑺傚亣鏃� */
-function handleDetail(row: HrmAttendanceHolidayApi.Holiday) {
- formModalApi.setData({ id: row.id, formType: 'detail' }).open();
+function handleDetail(row: HrmAttendanceHolidayApi.HolidayGroup) {
+ formModalApi.setData({ id: row.id, row, formType: 'detail' }).open();
}
-/** 鍒犻櫎鑺傚亣鏃� */
-async function handleDelete(id: number) {
+/** 鍒犻櫎鑺傚亣鏃ワ紙鏁翠釜鍖洪棿涓�璧峰垹闄わ級 */
+async function handleDelete(row: HrmAttendanceHolidayApi.HolidayGroup) {
+ const content =
+ row.ids && row.ids.length > 1
+ ? `纭畾瑕佸垹闄ゃ��${row.name}銆�${rangeText(row)}锛堝叡 ${row.dayCount} 澶╋級鍚楋紵`
+ : '纭畾瑕佸垹闄よ鑺傚亣鏃ュ悧锛�';
Modal.confirm({
title: '纭鍒犻櫎',
- content: '纭畾瑕佸垹闄よ鑺傚亣鏃ュ悧锛�',
+ content,
okText: '纭畾',
cancelText: '鍙栨秷',
onOk: async () => {
- await deleteAttendanceHoliday(id);
+ if (row.ids && row.ids.length > 0) {
+ await deleteAttendanceHolidayRange(row.ids);
+ } else if (row.id != null) {
+ await deleteAttendanceHoliday(row.id);
+ }
message.success('鍒犻櫎鎴愬姛');
handleRefresh();
},
});
}
+/** 鎼滅储鏉′欢锛氭棩鏈熷尯闂村瓧娈� date 杞垚鍚庣鎺ユ敹鐨� startDate/endDate */
+function buildQueryParams(formValues: Record<string, any>) {
+ const { date, ...rest } = formValues;
+ const [startDate, endDate] = Array.isArray(date) ? date : [];
+ return { ...rest, startDate, endDate };
+}
+
/** 瀵煎嚭鑺傚亣鏃� */
async function handleExport() {
- const data = await exportAttendanceHoliday(await gridApi.formApi.getValues());
+ const params = buildQueryParams(await gridApi.formApi.getValues());
+ const data = await exportAttendanceHoliday(params);
downloadFileFromBlobPart({ fileName: '鑺傚亣鏃ラ厤缃�.xls', source: data });
}
@@ -71,10 +100,10 @@
proxyConfig: {
ajax: {
query: async ({ page }, formValues) =>
- await getAttendanceHolidayPage({
+ await getAttendanceHolidayGroupPage({
pageNo: page.currentPage,
pageSize: page.pageSize,
- ...formValues,
+ ...buildQueryParams(formValues),
}),
},
},
@@ -86,7 +115,7 @@
refresh: true,
search: true,
},
- } as VxeTableGridOptions<HrmAttendanceHolidayApi.Holiday>,
+ } as VxeTableGridOptions<HrmAttendanceHolidayApi.HolidayGroup>,
});
</script>
@@ -114,6 +143,12 @@
]"
/>
</template>
+ <template #dateRange="{ row }">
+ <span>{{ row.date }}</span>
+ <span v-if="row.endDate && row.endDate !== row.date">
+ ~ {{ row.endDate }}
+ </span>
+ </template>
<template #isLegal="{ row }">
<Tag v-if="row.isLegal === 1" color="red">娉曞畾</Tag>
<span v-else>-</span>
@@ -137,7 +172,7 @@
type: 'link',
danger: true,
auth: ['hrm:attendance-holiday:delete'],
- onClick: handleDelete.bind(null, row.id!),
+ onClick: handleDelete.bind(null, row),
},
]"
/>
diff --git a/src/views/hrm/attendance/holiday/modules/form.vue b/src/views/hrm/attendance/holiday/modules/form.vue
index 1287f19..354b3da 100644
--- a/src/views/hrm/attendance/holiday/modules/form.vue
+++ b/src/views/hrm/attendance/holiday/modules/form.vue
@@ -9,13 +9,20 @@
import { message } from 'ant-design-vue';
import { useVbenForm } from '#/adapter/form';
-import { createAttendanceHoliday, getAttendanceHoliday, updateAttendanceHoliday } from '#/api/hrm/attendance/holiday';
+import {
+ createAttendanceHolidayRange,
+ getAttendanceHoliday,
+ updateAttendanceHoliday,
+ updateAttendanceHolidayRange,
+} from '#/api/hrm/attendance/holiday';
import { $t } from '#/locales';
import { useFormSchema } from '../data';
const emit = defineEmits(['success']);
const formType = ref<FormType>('create');
+/** 褰撳墠缂栬緫鐨勫尯闂村唴鍏ㄩ儴璁板綍ID锛堝垪琛ㄦ寜杩炵画鍖洪棿鍚堝苟灞曠ず锛岀紪杈戞椂鏁翠綋閲嶅啓锛� */
+const rangeIds = ref<number[]>([]);
const isDetail = computed(() => formType.value === 'detail');
const getTitle = computed(() => {
@@ -57,14 +64,35 @@
date: string | string[];
};
try {
+ const dates = Array.isArray(data.date) ? data.date : [data.date];
+ const startDate = dates[0]!;
+ const endDate = dates[1] || dates[0]!;
if (formType.value === 'update') {
- data.date = Array.isArray(data.date) ? data.date[0] : data.date;
- await updateAttendanceHoliday(data);
- } else {
- const dates = Array.isArray(data.date) ? data.date : [data.date];
- for (const date of dates) {
- await createAttendanceHoliday({ ...data, date });
+ if (rangeIds.value.length > 0) {
+ // 缂栬緫鐨勬槸鍚堝苟鍚庣殑鍖洪棿锛氭暣浣撳垹闄ゅ師璁板綍锛屾寜鏂拌捣姝㈡棩鏈熼噸鍐�
+ await updateAttendanceHolidayRange({
+ ids: rangeIds.value,
+ name: data.name!,
+ startDate,
+ endDate,
+ type: data.type!,
+ isLegal: Boolean(data.isLegal),
+ remark: data.remark,
+ });
+ } else {
+ data.date = startDate;
+ await updateAttendanceHoliday(data);
}
+ } else {
+ // 鎸夋棩鏈熷尯闂翠竴娆℃�у啓鍏ュ尯闂村唴姣忎竴澶╋紙娉曞畾鑺傚亣鏃� 10-01~10-03 闇�鍐欐弧 3 澶╋級
+ await createAttendanceHolidayRange({
+ name: data.name!,
+ startDate,
+ endDate,
+ type: data.type!,
+ isLegal: Boolean(data.isLegal),
+ remark: data.remark,
+ });
}
await modalApi.close();
emit('success');
@@ -77,11 +105,29 @@
if (!isOpen) {
return;
}
- const data = modalApi.getData<{ formType: FormType; id?: number }>();
+ const data = modalApi.getData<{
+ formType: FormType;
+ id?: number;
+ row?: HrmAttendanceHolidayApi.HolidayGroup;
+ }>();
formType.value = data.formType;
formApi.setState({ schema: useFormSchema(data.formType) });
formApi.setDisabled(data.formType === 'detail');
modalApi.setState({ showConfirmButton: data.formType !== 'detail' });
+ // 鍒楄〃琛屽凡甯﹀尯闂翠俊鎭紙id/ids/date/endDate锛夛紝鐩存帴甯﹀叆锛屾棤闇�鍐嶆煡鍗曟棩璁板綍
+ if (data?.row) {
+ rangeIds.value = data.row.ids ?? (data.row.id != null ? [data.row.id] : []);
+ await formApi.setValues({
+ id: data.row.id,
+ name: data.row.name,
+ date: [data.row.date, data.row.endDate || data.row.date],
+ type: data.row.type,
+ isLegal: data.row.isLegal,
+ remark: data.row.remark,
+ });
+ return;
+ }
+ rangeIds.value = [];
if (!data?.id) {
return;
}
diff --git a/src/views/hrm/leave/index.vue b/src/views/hrm/leave/index.vue
index d088fc2..35978ba 100644
--- a/src/views/hrm/leave/index.vue
+++ b/src/views/hrm/leave/index.vue
@@ -23,11 +23,22 @@
import { useGridColumns, useGridFormSchema } from './data';
import Form from './modules/form.vue';
+import ImportForm from './modules/import-form.vue';
const [FormModal, formModalApi] = useVbenModal({
connectedComponent: Form,
destroyOnClose: true,
});
+
+const [ImportModal, importModalApi] = useVbenModal({
+ connectedComponent: ImportForm,
+ destroyOnClose: true,
+});
+
+/** 鎵撳紑鎵归噺瀵煎叆 */
+function handleImport() {
+ importModalApi.open();
+}
/** 鍒锋柊琛ㄦ牸 */
function handleRefresh() {
@@ -148,6 +159,7 @@
<template>
<Page auto-content-height>
<FormModal @success="handleRefresh" />
+ <ImportModal @success="handleRefresh" />
<Grid table-title="璇峰亣鐢宠鍒楄〃">
<template #toolbar-tools>
<TableAction
@@ -159,6 +171,13 @@
auth: ['hrm:leave:create'],
onClick: handleCreate,
},
+ {
+ label: '瀵煎叆',
+ type: 'primary',
+ icon: ACTION_ICON.UPLOAD,
+ auth: ['hrm:leave:import'],
+ onClick: handleImport,
+ },
]"
/>
</template>
diff --git a/src/views/hrm/leave/modules/import-form.vue b/src/views/hrm/leave/modules/import-form.vue
new file mode 100644
index 0000000..279189f
--- /dev/null
+++ b/src/views/hrm/leave/modules/import-form.vue
@@ -0,0 +1,164 @@
+<script lang="ts" setup>
+import type { FileType } from 'ant-design-vue/es/upload/interface';
+import type { HrmLeaveApi } from '#/api/hrm/leave';
+
+import { computed, ref } from 'vue';
+
+import { useVbenModal } from '#/packages/effects/common-ui/src';
+import { downloadFileFromBlobPart } from '#/packages/utils/src';
+
+import { Button, message, Progress, Upload } from 'ant-design-vue';
+
+import { importLeave, importLeaveTemplate } from '#/api/hrm/leave';
+
+const emit = defineEmits(['success']);
+
+const fileList = ref<FileType[]>([]);
+const importResult = ref<HrmLeaveApi.ImportResult>();
+const importing = ref(false);
+const progressPercent = ref(0);
+let progressTimer: ReturnType<typeof setInterval> | undefined;
+
+const [Modal, modalApi] = useVbenModal({
+ async onConfirm() {
+ let shouldClose = false;
+ if (fileList.value.length === 0) {
+ message.warning('璇烽�夋嫨瑕佸鍏ョ殑鏂囦欢');
+ return;
+ }
+ if (importing.value) return;
+ modalApi.lock();
+ importing.value = true;
+ startMockProgress();
+ try {
+ importResult.value = await importLeave(fileList.value[0] as File);
+ stopMockProgress();
+ progressPercent.value = 100;
+ await delay(300);
+ emit('success');
+ const failedCount = failureCount.value;
+ if (failedCount > 0) {
+ message.warning(
+ `瀵煎叆瀹屾垚锛氭垚鍔� ${createCount.value} 鏉★紝澶辫触 ${failedCount} 鏉★紝璇锋煡鐪嬩笅鏂瑰け璐ユ槑缁哷,
+ );
+ } else {
+ message.success('瀵煎叆瀹屾垚');
+ shouldClose = true;
+ }
+ } finally {
+ stopMockProgress();
+ importing.value = false;
+ modalApi.unlock();
+ if (shouldClose) {
+ await modalApi.close();
+ }
+ }
+ },
+});
+
+/** 妯℃嫙杩涘害鏉★細璇锋眰鏈熼棿浠� 0 璧板埌 90% */
+function startMockProgress() {
+ progressPercent.value = 0;
+ progressTimer = setInterval(() => {
+ if (progressPercent.value < 90) {
+ progressPercent.value = Math.min(
+ 90,
+ progressPercent.value + Math.random() * 12,
+ );
+ }
+ }, 300);
+}
+
+function stopMockProgress() {
+ if (progressTimer) {
+ clearInterval(progressTimer);
+ progressTimer = undefined;
+ }
+}
+
+function delay(ms: number) {
+ return new Promise((resolve) => setTimeout(resolve, ms));
+}
+
+function beforeUpload(file: FileType) {
+ fileList.value = [file];
+ importResult.value = undefined;
+ return false;
+}
+
+function handleRemove() {
+ fileList.value = [];
+ importResult.value = undefined;
+}
+
+async function handleDownloadTemplate() {
+ const data = await importLeaveTemplate();
+ downloadFileFromBlobPart({ fileName: '璇峰亣鐢宠瀵煎叆妯℃澘.xls', source: data });
+}
+
+const createCount = computed(() => importResult.value?.createNames?.length ?? 0);
+const failureCount = computed(
+ () => Object.keys(importResult.value?.failureNames ?? {}).length,
+);
+</script>
+
+<template>
+ <Modal title="瀵煎叆璇峰亣鐢宠" class="w-[640px]">
+ <div class="mx-4">
+ <Upload
+ :max-count="1"
+ accept=".xls,.xlsx"
+ :file-list="fileList"
+ :before-upload="beforeUpload"
+ @remove="handleRemove"
+ >
+ <Button type="primary">閫夋嫨 Excel 鏂囦欢</Button>
+ </Upload>
+ <div class="mt-2 text-gray-500">
+ 浠呭厑璁稿鍏� xls銆亁lsx 鏍煎紡鏂囦欢锛涖�岀敵璇蜂汉鎵嬫満鍙枫�嶉渶瀵瑰簲绯荤粺鍐呭憳宸ワ紝銆岃鍋囩被鍨嬨�嶅~鍐欏瓧鍏稿悕绉帮紙濡傚勾鍋囥�佷簨鍋囥�佺梾鍋囷級
+ </div>
+ <div class="mt-2 text-gray-500">
+ 瀵煎叆鍚庣敓鎴愮殑鏄崏绋匡紝闇�鍦ㄥ垪琛ㄤ腑閫愭潯鎻愪氦瀹℃壒
+ </div>
+ <!-- 瀵煎叆杩涘害鏉� -->
+ <div v-if="importing" class="mt-4">
+ <div class="mb-2 text-sm text-gray-600">
+ 姝e湪瀵煎叆璇峰亣鐢宠鏁版嵁锛岃绋嶅��...
+ </div>
+ <Progress :percent="progressPercent" status="active" />
+ </div>
+ <!-- 瀵煎叆缁撴灉 -->
+ <div
+ v-if="importResult"
+ class="mt-4 rounded-md border border-gray-200 bg-gray-50 p-3"
+ >
+ <div class="mb-2 font-medium">瀵煎叆缁撴灉</div>
+ <div class="mb-2 flex gap-4">
+ <span class="text-green-600">鎴愬姛鍒涘缓锛歿{ createCount }} 鏉�</span>
+ <span class="text-red-600">澶辫触锛歿{ failureCount }} 鏉�</span>
+ </div>
+ <div v-if="createCount > 0" class="mb-2 max-h-24 overflow-y-auto">
+ <div
+ v-for="name in importResult.createNames"
+ :key="name"
+ class="text-sm leading-6 text-green-600"
+ >
+ {{ name }}
+ </div>
+ </div>
+ <div v-if="failureCount > 0" class="max-h-40 overflow-y-auto">
+ <div
+ v-for="(reason, row) in importResult.failureNames"
+ :key="row"
+ class="text-sm leading-6 text-red-500"
+ >
+ {{ row }}锛歿{ reason }}
+ </div>
+ </div>
+ </div>
+ </div>
+ <template #prepend-footer>
+ <Button @click="handleDownloadTemplate">涓嬭浇瀵煎叆妯℃澘</Button>
+ </template>
+ </Modal>
+</template>
diff --git a/src/views/hrm/overtime/data.ts b/src/views/hrm/overtime/data.ts
index a4985b5..9b8a796 100644
--- a/src/views/hrm/overtime/data.ts
+++ b/src/views/hrm/overtime/data.ts
@@ -1,7 +1,9 @@
import type { VbenFormSchema } from '#/adapter/form';
import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { HrmEmployeeApi } from '#/api/hrm/employee';
import type { HrmOvertimeApi } from '#/api/hrm/overtime';
+import { getEmployeeSimpleList } from '#/api/hrm/employee';
import { DICT_TYPE } from '#/packages/constants/src';
import { getDictOptions } from '#/packages/effects/hooks/src';
@@ -33,8 +35,28 @@
},
{
fieldName: 'employeeId',
- component: 'Input',
- dependencies: { triggerFields: [''], show: () => false },
+ label: '鐢宠浜�',
+ component: 'ApiSelect',
+ componentProps: {
+ api: async () => {
+ const list = await getEmployeeSimpleList();
+ // 绂昏亴鍛樺伐涓嶅彲閫変綔鍔犵彮鐢宠浜�
+ return list.filter((item) => item.employeeStatus !== 3);
+ },
+ labelField: 'name',
+ labelFn: (item: HrmEmployeeApi.EmployeeSimple) =>
+ `${item.name}锛�${item.employeeNo}锛塦,
+ valueField: 'id',
+ showSearch: true,
+ filterOption: (input: string, option: any) =>
+ String(option.label ?? '')
+ .toLowerCase()
+ .includes(input.toLowerCase()),
+ placeholder: '璇烽�夋嫨鐢宠浜�',
+ style: { width: '100%' },
+ },
+ rules: 'selectRequired',
+ formItemClass: 'col-span-2',
},
{
fieldName: 'baseInfoDivider',
@@ -44,9 +66,9 @@
},
{
fieldName: 'employeeName',
- label: '鐢宠浜�',
+ label: '鐢宠浜哄鍚�',
component: 'Input',
- componentProps: { disabled: true, placeholder: '绯荤粺鑷姩甯﹀嚭' },
+ componentProps: { disabled: true, placeholder: '閫夋嫨鐢宠浜哄悗鑷姩甯﹀嚭' },
},
{
fieldName: 'employeeNo',
diff --git a/src/views/hrm/overtime/modules/form.vue b/src/views/hrm/overtime/modules/form.vue
index 4613de8..52fe4b7 100644
--- a/src/views/hrm/overtime/modules/form.vue
+++ b/src/views/hrm/overtime/modules/form.vue
@@ -7,12 +7,9 @@
import { message } from 'ant-design-vue';
import { useVbenForm } from '#/adapter/form';
-import {
- createOvertime,
- getCurrentOvertimeApplicant,
- getOvertime,
- updateOvertime,
-} from '#/api/hrm/overtime';
+import type { HrmEmployeeApi } from '#/api/hrm/employee';
+import { getEmployeeSimpleList } from '#/api/hrm/employee';
+import { createOvertime, getOvertime, updateOvertime } from '#/api/hrm/overtime';
import { $t } from '#/locales';
import { useVbenModal } from '#/packages/effects/common-ui/src';
@@ -73,24 +70,34 @@
const result = calculateDuration(values);
void formApi.setValues(result);
}
+ if (changedFields.includes('employeeId')) {
+ void fillEmployeeInfo(values.employeeId);
+ }
if (changedFields.includes('relatedType') && !values.relatedType) {
void formApi.setFieldValue('relatedCode', undefined);
}
},
});
-async function setCurrentEmployee() {
- const employee = await getCurrentOvertimeApplicant();
+/** 鍛樺伐妗f缂撳瓨锛氶�夋嫨鐢宠浜烘椂鐢ㄤ簬鍥炲~濮撳悕/宸ュ彿/閮ㄩ棬/宀椾綅 */
+let employeeCache: HrmEmployeeApi.EmployeeSimple[] = [];
+
+async function loadEmployeeCache() {
+ if (employeeCache.length === 0) {
+ employeeCache = await getEmployeeSimpleList();
+ }
+ return employeeCache;
+}
+
+/** 閫夋嫨鐢宠浜哄悗鍥炲~鍏跺熀纭�淇℃伅 */
+async function fillEmployeeInfo(employeeId?: number) {
+ const list = await loadEmployeeCache();
+ const employee = list.find((item) => item.id === employeeId);
await formApi.setValues({
- employeeId: employee.employeeId,
- employeeName: employee.employeeName,
- employeeNo: employee.employeeNo,
- deptName: employee.deptName,
- postName: employee.postName,
- mealDeduction: false,
- mealDeductionHours: 1,
- crossDay: false,
- duration: 0,
+ employeeName: employee?.name,
+ employeeNo: employee?.employeeNo,
+ deptName: employee?.deptName,
+ postName: employee?.postName,
});
}
@@ -105,7 +112,7 @@
const data = (await formApi.getValues()) as HrmOvertimeApi.Overtime;
if (!data.employeeId) {
- message.warning('褰撳墠璐﹀彿鏈叧鑱斿憳宸ユ。妗堬紝鏆傛椂鏃犳硶鎻愪氦鍔犵彮鐢宠');
+ message.warning('璇烽�夋嫨鐢宠浜�');
return;
}
if (!data.duration || data.duration <= 0) {
@@ -138,7 +145,19 @@
modalApi.setState({ showConfirmButton: !isDetail.value });
if (!data.id) {
- await setCurrentEmployee();
+ // 鏂板锛氫笉榛樿褰撳墠璐﹀彿锛岀敱鐢ㄦ埛閫夋嫨鐢宠浜�
+ await loadEmployeeCache();
+ await formApi.setValues({
+ employeeId: undefined,
+ employeeName: undefined,
+ employeeNo: undefined,
+ deptName: undefined,
+ postName: undefined,
+ mealDeduction: false,
+ mealDeductionHours: 1,
+ crossDay: false,
+ duration: 0,
+ });
return;
}
diff --git a/src/views/hrm/schedule/index.vue b/src/views/hrm/schedule/index.vue
index 891cc11..703268b 100644
--- a/src/views/hrm/schedule/index.vue
+++ b/src/views/hrm/schedule/index.vue
@@ -17,6 +17,7 @@
Modal,
Pagination,
Radio,
+ RangePicker,
Segmented,
Select,
TreeSelect,
@@ -24,10 +25,16 @@
import { Page } from '#/packages/effects/common-ui/src';
+import { getAttendanceHolidayList } from '#/api/hrm/attendance/holiday';
import { getEmployeePage } from '#/api/hrm/employee';
import { getShiftList } from '#/api/hrm/shift';
-import { getEmployeeScheduleList, saveEmployeeSchedule } from '#/api/hrm/schedule';
+import {
+ batchSaveEmployeeSchedule,
+ getEmployeeScheduleList,
+ saveEmployeeSchedule,
+} from '#/api/hrm/schedule';
import { getDeptList } from '#/api/system/dept';
+import { getSimplePostList } from '#/api/system/post';
import { handleTree } from '#/packages/utils/src';
import {
@@ -59,6 +66,10 @@
// ========== 鏁版嵁 ==========
const employees = ref<HrmEmployeeApi.Employee[]>([]);
const shiftList = ref<HrmShiftApi.Shift[]>([]);
+/**
+ * 褰撳墠瑙嗗浘鏃ユ湡鑼冨洿鍐呯殑鑺傚亣鏃ラ厤缃細key = yyyy-MM-dd锛寁alue = 1-浼戞伅鏃� / 2-宸ヤ綔鏃�
+ */
+const holidayMap = ref(new Map<string, number>());
const loading = ref(false);
const saving = ref(false);
/** 鏄惁宸叉墽琛岃繃鏌ヨ */
@@ -150,8 +161,14 @@
const week = new Date(
`${month.value}-${String(day).padStart(2, '0')}`,
).getDay();
+ // 鑺傚亣鏃ラ厤缃紭鍏堬細浼戞伅鏃ュ己鍒朵紤鎭紝宸ヤ綔鏃ュ己鍒舵帓鐝紙鍚皟浼戜笂鐝殑鍛ㄦ湯锛�
+ const holidayType = getHolidayType(date);
let rest = false;
- if (autoRestMode.value === REST_MODE.DOUBLE) {
+ if (holidayType === 1) {
+ rest = true;
+ } else if (holidayType === 2) {
+ rest = false;
+ } else if (autoRestMode.value === REST_MODE.DOUBLE) {
rest = week === 0 || week === 6;
} else if (autoRestMode.value === REST_MODE.SINGLE) {
rest = week === 0;
@@ -162,6 +179,100 @@
scheduleMap.value = map;
autoOpen.value = false;
message.success('鑷姩鎺掔彮宸茬敓鎴愶紝鍙墜鍔ㄥ井璋冨悗淇濆瓨');
+}
+
+// ========== 鎸夌兢浣撴壒閲忔帓鐝紙涓�绫讳汉涓�娆℃帓瀹岋級 ==========
+const batchOpen = ref(false);
+const batchDeptId = ref<number>();
+const batchPostId = ref<number>();
+/** 0-鍦ㄨ亴鍙婅瘯鐢紝1-鍦ㄨ亴锛�2-璇曠敤锛�3-绂昏亴 */
+const batchEmployeeStatus = ref<number>(0);
+/** 0 琛ㄧず浼戞伅锛堟竻闄ゆ帓鐝級 */
+const batchShiftId = ref<number>();
+const batchRestMode = ref<RestMode>(REST_MODE.DOUBLE);
+const batchDateRange = ref<[string, string]>();
+const batchSaving = ref(false);
+const postList = ref<{ label: string; value: number }[]>([]);
+
+const batchEmployeeStatusOptions = [
+ { label: '鍦ㄨ亴鍙婅瘯鐢�', value: 0 },
+ { label: '鍦ㄨ亴', value: 1 },
+ { label: '璇曠敤', value: 2 },
+ { label: '绂昏亴', value: 3 },
+];
+
+const batchShiftOptions = computed(() => [
+ { label: '浼戞伅锛堟竻闄ゆ帓鐝級', value: 0 },
+ ...shiftList.value.map((shift) => ({
+ label: `${shift.name} (${shift.startTime}~${shift.endTime})`,
+ value: shift.id!,
+ })),
+]);
+
+async function loadPostList() {
+ if (postList.value.length > 0) {
+ return;
+ }
+ const posts = await getSimplePostList();
+ postList.value = posts.map((post) => ({
+ label: post.name,
+ value: post.id!,
+ }));
+}
+
+async function openBatch() {
+ if (!month.value) {
+ message.warning('璇峰厛閫夋嫨鏈堜唤');
+ return;
+ }
+ if (shiftList.value.length === 0) {
+ shiftList.value = await getShiftList();
+ }
+ batchDeptId.value = deptId.value;
+ batchPostId.value = undefined;
+ batchEmployeeStatus.value = 0;
+ batchShiftId.value = shiftList.value[0]?.id;
+ batchRestMode.value = REST_MODE.DOUBLE;
+ batchDateRange.value = [
+ `${month.value}-01`,
+ dayjs(`${month.value}-01`).endOf('month').format('YYYY-MM-DD'),
+ ];
+ batchOpen.value = true;
+ await loadPostList();
+}
+
+async function applyBatchSchedule() {
+ if (!batchDeptId.value) {
+ message.warning('璇烽�夋嫨閮ㄩ棬');
+ return;
+ }
+ if (!batchDateRange.value?.[0] || !batchDateRange.value?.[1]) {
+ message.warning('璇烽�夋嫨鎺掔彮鏃ユ湡鑼冨洿');
+ return;
+ }
+ if (batchShiftId.value == null) {
+ message.warning('璇烽�夋嫨鎺掔彮鐝鎴栦紤鎭�');
+ return;
+ }
+ batchSaving.value = true;
+ try {
+ const result = await batchSaveEmployeeSchedule({
+ deptId: batchDeptId.value,
+ postId: batchPostId.value,
+ employeeStatus: batchEmployeeStatus.value || undefined,
+ startDate: batchDateRange.value[0],
+ endDate: batchDateRange.value[1],
+ shiftId: batchShiftId.value === 0 ? null : batchShiftId.value,
+ restMode: batchRestMode.value,
+ });
+ message.success(
+ `鎵归噺鎺掔彮瀹屾垚锛氬叡 ${result.employeeCount ?? 0} 鍚嶅憳宸ワ紝鍐欏叆/娓呴櫎 ${result.itemCount ?? 0} 鏉℃帓鐝璥,
+ );
+ batchOpen.value = false;
+ await loadData();
+ } finally {
+ batchSaving.value = false;
+ }
}
/** 鐝 id 鈫� 鐝 鏄犲皠 */
@@ -237,6 +348,67 @@
};
});
});
+
+/** 鏌愭棩鑺傚亣鏃ョ被鍨嬶細1-浼戞伅鏃ワ紝2-宸ヤ綔鏃ワ紝undefined-鏈厤缃� */
+function getHolidayType(date: string): number | undefined {
+ return holidayMap.value.get(date);
+}
+
+/** 鑺傚亣鏃ヨ鏍囨枃妗堬細浼� / 鐝� */
+function holidayLabel(date: string): string {
+ const type = getHolidayType(date);
+ if (type === 1) {
+ return '浼�';
+ }
+ if (type === 2) {
+ return '鐝�';
+ }
+ return '';
+}
+
+/** 鍔犺浇褰撳墠瑙嗗浘鏃ユ湡鑼冨洿鍐呯殑鑺傚亣鏃ラ厤缃� */
+async function loadHolidays() {
+ const list = viewDays.value;
+ const first = list[0];
+ const last = list[list.length - 1];
+ if (!first || !last) {
+ holidayMap.value = new Map();
+ return;
+ }
+ const holidays = await getAttendanceHolidayList({
+ startDate: first.date,
+ endDate: last.date,
+ });
+ const map = new Map<string, number>();
+ for (const item of holidays) {
+ if (item.date) {
+ map.set(item.date, item.type ?? 1);
+ }
+ }
+ holidayMap.value = map;
+}
+
+/** 瑙嗗浘鏃ユ湡鍙樺寲锛堝垏鏈�/鍒囧懆/鍒囪鍥撅級鏃堕噸鏂版媺鍙栬妭鍋囨棩 */
+watch(
+ () => viewDays.value.map((vd) => vd.date).join(','),
+ (key) => {
+ if (key) {
+ loadHolidays();
+ }
+ },
+);
+
+/** 鑺傚亣鏃ユ爣璁扮殑鍗曞厓鏍�/琛ㄥご閰嶈壊 */
+function holidayClass(date: string): string {
+ const type = getHolidayType(date);
+ if (type === 1) {
+ return 'holiday-rest';
+ }
+ if (type === 2) {
+ return 'holiday-work';
+ }
+ return '';
+}
/** 鍛ㄨ鍥惧綋鍓嶆樉绀鸿寖鍥存爣绛� */
const weekRangeLabel = computed(() => {
@@ -464,6 +636,9 @@
<Button :disabled="!employees.length" @click="autoOpen = true">
鑷姩鎺掔彮
</Button>
+ <Button type="primary" ghost :disabled="!month" @click="openBatch">
+ 鎵归噺鎺掔彮锛堟寜浜虹兢锛�
+ </Button>
<Button
type="primary"
:loading="saving"
@@ -545,11 +720,22 @@
:key="vd.date"
:class="[
'schedule-date-col text-center',
- vd.isWeekend ? 'bg-red-50' : 'bg-gray-50',
+ holidayClass(vd.date)
+ ? holidayClass(vd.date)
+ : vd.isWeekend
+ ? 'bg-red-50'
+ : 'bg-gray-50',
]"
>
<div class="font-medium">{{ vd.day }}</div>
- <div class="text-xs text-gray-400">{{ vd.weekLabel }}</div>
+ <div class="text-xs text-gray-400">
+ {{ vd.weekLabel }}
+ <span
+ v-if="holidayLabel(vd.date)"
+ class="holiday-tag"
+ >{{ holidayLabel(vd.date) }}</span
+ >
+ </div>
</th>
</tr>
</thead>
@@ -569,7 +755,7 @@
v-for="vd in viewDays"
:key="vd.date"
class="schedule-cell"
- :class="[vd.isWeekend ? 'bg-red-50/40' : '']"
+ :class="[vd.isWeekend ? 'bg-red-50/40' : '', holidayClass(vd.date)]"
@click="openPicker(emp, vd.date)"
>
<span
@@ -681,6 +867,96 @@
</div>
</div>
</Modal>
+
+ <!-- 鎸変汉缇ゆ壒閲忔帓鐝脊绐楋細閫夐儴闂�/宀椾綅/鍦ㄨ亴鐘舵�� + 鏃ユ湡鑼冨洿 + 鐝锛屼竴娆℃帓瀹屼竴绫讳汉 -->
+ <Modal
+ v-model:open="batchOpen"
+ title="鎵归噺鎺掔彮锛堟寜浜虹兢锛�"
+ :footer="null"
+ :width="520"
+ >
+ <div class="space-y-4">
+ <div>
+ <div class="mb-1.5 text-sm text-gray-500">
+ 閮ㄩ棬锛堝惈涓嬬骇閮ㄩ棬锛�<span class="text-red-500">*</span>
+ </div>
+ <TreeSelect
+ v-model:value="batchDeptId"
+ :tree-data="deptTree"
+ :field-names="{ label: 'name', value: 'id', children: 'children' }"
+ allow-clear
+ placeholder="璇烽�夋嫨閮ㄩ棬"
+ tree-default-expand-all
+ style="width: 100%"
+ />
+ </div>
+ <div class="grid grid-cols-2 gap-3">
+ <div>
+ <div class="mb-1.5 text-sm text-gray-500">宀椾綅</div>
+ <Select
+ v-model:value="batchPostId"
+ :options="postList"
+ allow-clear
+ placeholder="涓嶉檺宀椾綅"
+ show-search
+ option-filter-prop="label"
+ style="width: 100%"
+ />
+ </div>
+ <div>
+ <div class="mb-1.5 text-sm text-gray-500">鍛樺伐鐘舵��</div>
+ <Select
+ v-model:value="batchEmployeeStatus"
+ :options="batchEmployeeStatusOptions"
+ style="width: 100%"
+ />
+ </div>
+ </div>
+ <div>
+ <div class="mb-1.5 text-sm text-gray-500">
+ 鎺掔彮鏃ユ湡鑼冨洿<span class="text-red-500">*</span>
+ </div>
+ <RangePicker
+ v-model:value="batchDateRange"
+ value-format="YYYY-MM-DD"
+ :allow-clear="false"
+ style="width: 100%"
+ />
+ </div>
+ <div>
+ <div class="mb-1.5 text-sm text-gray-500">
+ 鎺掔彮鐝<span class="text-red-500">*</span>
+ </div>
+ <Select
+ v-model:value="batchShiftId"
+ :options="batchShiftOptions"
+ placeholder="璇烽�夋嫨鐝锛屾垨閫夋嫨浼戞伅"
+ style="width: 100%"
+ />
+ </div>
+ <div v-if="batchShiftId !== 0">
+ <div class="mb-1.5 text-sm text-gray-500">浼戞伅妯″紡</div>
+ <Radio.Group
+ v-model:value="batchRestMode"
+ :options="REST_MODE_OPTIONS"
+ option-type="button"
+ />
+ </div>
+ <div class="rounded bg-blue-50 px-3 py-2 text-xs text-blue-600">
+ 灏嗗鎵�閫夐儴闂�/宀椾綅/鍦ㄨ亴鐘舵�佺殑鍏ㄩ儴鍛樺伐锛屽湪鏃ユ湡鑼冨洿鍐呴�愭棩鎺掔彮锛歿{
+ batchShiftId === 0
+ ? '閫夋嫨銆屼紤鎭�嶅皢娓呴櫎璇ヨ寖鍥村唴宸叉湁鎺掔彮銆�'
+ : '鎸変笂鏂逛紤鎭ā寮忚烦杩囧懆鏈紝鍏朵綑鏃ユ湡鎺掓墍閫夌彮娆°��'
+ }}宸查厤缃妭鍋囨棩鐨勬棩鏈熶互鑺傚亣鏃ヤ负鍑嗭細浼戞伅鏃ュ己鍒朵紤鎭紝宸ヤ綔鏃ュ己鍒舵帓鐝紙鍚皟浼戜笂鐝殑鍛ㄦ湯锛夈��
+ </div>
+ <div class="flex justify-end gap-2">
+ <Button @click="batchOpen = false">鍙栨秷</Button>
+ <Button type="primary" :loading="batchSaving" @click="applyBatchSchedule">
+ 寮�濮嬫帓鐝�
+ </Button>
+ </div>
+ </div>
+ </Modal>
</Page>
</template>
@@ -740,6 +1016,33 @@
}
}
+ /* 鑺傚亣鏃ユ爣璁帮細浼戞伅鏃ユ鑹层�佽皟浼戝伐浣滄棩缁胯壊锛屼紭鍏堜簬鍛ㄦ湯搴曡壊 */
+ .holiday-rest {
+ background-color: #fff1e6 !important;
+ }
+
+ .holiday-work {
+ background-color: #e8f8ec !important;
+ }
+
+ .holiday-tag {
+ display: inline-block;
+ padding: 0 3px;
+ margin-left: 2px;
+ color: #fff;
+ font-size: 10px;
+ line-height: 14px;
+ border-radius: 2px;
+ }
+
+ .holiday-rest .holiday-tag {
+ background-color: #fa8c16;
+ }
+
+ .holiday-work .holiday-tag {
+ background-color: #52c41a;
+ }
+
.shift-chip {
display: inline-block;
max-width: 100%;
--
Gitblit v1.9.3