From 293acfc337ba02749026ef0050c2f6d59f122d1e Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期日, 08 十一月 2026 10:12:37 +0800
Subject: [PATCH] feat(hrm): 排班格子修改后自动保存
---
src/views/hrm/schedule/index.vue | 168 ++++++++++++++++++++++++++++++++++---------------------
1 files changed, 103 insertions(+), 65 deletions(-)
diff --git a/src/views/hrm/schedule/index.vue b/src/views/hrm/schedule/index.vue
index 4eafe2c..031c840 100644
--- a/src/views/hrm/schedule/index.vue
+++ b/src/views/hrm/schedule/index.vue
@@ -78,7 +78,6 @@
new Map<string, HrmEmployeeScheduleApi.ScheduleLeave>(),
);
const loading = ref(false);
-const saving = ref(false);
/** 鏄惁宸叉墽琛岃繃鏌ヨ */
const loaded = ref(false);
/** 鏈�杩戜竴娆°�屾煡璇㈡帓鐝�嶅搴旂殑鏈堜唤/閮ㄩ棬锛屼繚瀛樺墠鏍¢獙锛岄伩鍏嶆嬁鏃ф暟鎹鐩� */
@@ -130,6 +129,10 @@
const autoOpen = ref(false);
const autoShiftId = ref<number>();
const autoRestMode = ref<RestMode>(REST_MODE.DOUBLE);
+/** 鑷姩鎺掔彮淇濆瓨涓� */
+const autoSaving = ref(false);
+/** 姝e湪淇濆瓨鐨勬牸瀛� key锛歚${employeeId}_${date}` */
+const cellSaving = ref(new Set<string>());
/** 鑷姩鎺掔彮鐝閫夋嫨閫夐」 */
const autoShiftOptions = computed(() =>
@@ -139,14 +142,26 @@
})),
);
-/** 鎸変紤鎭ā寮忎负褰撳墠鍛樺伐鐢熸垚鏁存湀鎺掔彮锛堜紤鎭棩娓呴櫎锛屽伐浣滄棩濉彮娆★級 */
-function applyAutoSchedule() {
+/** 鍒嗘壒鎻愪氦鎺掔彮鍙樻洿 */
+async function persistItems(items: HrmEmployeeScheduleApi.ScheduleItem[]) {
+ for (let i = 0; i < items.length; i += SAVE_BATCH_SIZE) {
+ await saveEmployeeSchedule(items.slice(i, i + SAVE_BATCH_SIZE));
+ }
+}
+
+/** 鎸変紤鎭ā寮忎负褰撳墠鍛樺伐鐢熸垚鏁存湀鎺掔彮锛堜紤鎭棩娓呴櫎锛屽伐浣滄棩濉彮娆★級锛岀敓鎴愬悗鑷姩淇濆瓨 */
+async function applyAutoSchedule() {
if (!employees.value.length || !days.value.length) {
message.warning('璇峰厛鏌ヨ鍑哄憳宸�');
return;
}
if (autoShiftId.value == null) {
message.warning('璇烽�夋嫨鎺掔彮鐝');
+ return;
+ }
+ // 鏈噸鏂版煡璇㈡椂缃戞牸閲岀殑绌烘牸涓嶄唬琛ㄣ�屼紤鎭�嶏紝鑷姩鎺掔彮浼氳娓呭凡鏈夋帓鐝�
+ if (loadedMonth.value !== month.value || loadedDeptId.value !== deptId.value) {
+ message.warning('鏈堜唤鎴栭儴闂ㄥ凡鍙樻洿锛岃鍏堢偣鍑汇�屾煡璇㈡帓鐝�嶅姞杞芥渶鏂版暟鎹�');
return;
}
// 鍕鹃�変簡鍛樺伐鍒欏彧瀵瑰嬀閫変汉鐢熸晥锛屾湭鍕鹃�夊垯浣滅敤浜庡叏閮ㄥ憳宸�
@@ -162,6 +177,7 @@
return;
}
const map = new Map(scheduleMap.value);
+ const items: HrmEmployeeScheduleApi.ScheduleItem[] = [];
for (const emp of targets) {
if (emp.id == null) {
continue;
@@ -187,12 +203,30 @@
} else if (autoRestMode.value === REST_MODE.SINGLE) {
rest = week === 0;
}
- map.set(`${emp.id}_${date}`, rest ? null : autoShiftId.value);
+ const key = `${emp.id}_${date}`;
+ const next = rest ? null : autoShiftId.value!;
+ if ((map.get(key) ?? null) !== next) {
+ items.push({ employeeId: emp.id, date, shiftId: next });
+ }
+ map.set(key, next);
}
}
scheduleMap.value = map;
autoOpen.value = false;
- message.success('鑷姩鎺掔彮宸茬敓鎴愶紝鍙墜鍔ㄥ井璋冨悗淇濆瓨');
+ if (!items.length) {
+ message.info('鑷姩鎺掔彮缁撴灉涓庣幇鏈夋帓鐝竴鑷达紝鏃犻渶淇濆瓨');
+ return;
+ }
+ autoSaving.value = true;
+ try {
+ await persistItems(items);
+ message.success(`鑷姩鎺掔彮宸茬敓鎴愬苟淇濆瓨锛�${items.length} 涓牸瀛愶級`);
+ } catch {
+ message.error('鑷姩鎺掔彮淇濆瓨澶辫触锛屽凡閲嶆柊鍔犺浇鏈嶅姟绔帓鐝�');
+ await loadData();
+ } finally {
+ autoSaving.value = false;
+ }
}
// ========== 鎸夌兢浣撴壒閲忔帓鐝紙涓�绫讳汉涓�娆℃帓瀹岋級 ==========
@@ -533,12 +567,56 @@
);
}
-function pickShift(shiftId: number | null) {
- if (!pickerEmployee.value || !pickerDate.value) {
+/** 鏌愭牸鏄惁姝e湪淇濆瓨 */
+function isCellSaving(employeeId: number, date: string): boolean {
+ return cellSaving.value.has(`${employeeId}_${date}`);
+}
+
+/**
+ * 淇濆瓨鍗曚釜鏍煎瓙锛氬厛涔愯鏇存柊缃戞牸锛屽け璐ュ垯鍥炴粴涓哄師鍊�
+ */
+async function saveCell(
+ employeeId: number,
+ date: string,
+ next: number | null,
+ prev: number | null,
+) {
+ const key = `${employeeId}_${date}`;
+ cellSaving.value = new Set([...cellSaving.value, key]);
+ try {
+ await saveEmployeeSchedule([{ employeeId, date, shiftId: next }]);
+ } catch {
+ const map = new Map(scheduleMap.value);
+ if (prev == null) {
+ map.delete(key);
+ } else {
+ map.set(key, prev);
+ }
+ scheduleMap.value = map;
+ message.error('淇濆瓨澶辫触锛屽凡鎭㈠鍘熸帓鐝紝璇烽噸璇�');
+ } finally {
+ const saving = new Set(cellSaving.value);
+ saving.delete(key);
+ cellSaving.value = saving;
+ }
+}
+
+/** 閫夌彮娆″悗绔嬪嵆淇濆瓨璇ユ牸锛堥�夈�屼紤鎭�嶅嵆娓呴櫎璇ュぉ鎺掔彮锛� */
+async function pickShift(shiftId: number | null) {
+ const emp = pickerEmployee.value;
+ const date = pickerDate.value;
+ pickerOpen.value = false;
+ if (emp?.id == null || !date) {
return;
}
- scheduleMap.value.set(`${pickerEmployee.value.id}_${pickerDate.value}`, shiftId);
- pickerOpen.value = false;
+ const key = `${emp.id}_${date}`;
+ const prev = scheduleMap.value.get(key) ?? null;
+ const next = shiftId ?? null;
+ if (prev === next) {
+ return;
+ }
+ scheduleMap.value.set(key, next);
+ await saveCell(emp.id, date, next, prev);
}
// ========== 鍔犺浇 ==========
@@ -621,52 +699,6 @@
await loadEmployeePage();
}
-// ========== 淇濆瓨锛堟暣鏈堝叏閲忥級 ==========
-async function handleSave() {
- if (!month.value || !employees.value.length) {
- return;
- }
- // 鏈堜唤/閮ㄩ棬鏀硅繃浣嗘病鏈夐噸鏂版煡璇㈡椂锛岄〉闈笂鐨勭┖鏍间笉浠h〃銆屼紤鎭�嶏紝淇濆瓨浼氭妸宸叉湁鎺掔彮娓呮帀
- if (loadedMonth.value !== month.value || loadedDeptId.value !== deptId.value) {
- message.warning(
- '鏈堜唤鎴栭儴闂ㄥ凡鍙樻洿锛岃鍏堢偣鍑汇�屾煡璇㈡帓鐝�嶅姞杞芥渶鏂版暟鎹悗鍐嶄繚瀛橈紝閬垮厤璇竻宸叉湁鎺掔彮',
- );
- return;
- }
- Modal.confirm({
- title: '纭淇濆瓨',
- content: `灏嗕繚瀛樺綋鍓嶉〉 ${employees.value.length} 鍚嶅憳宸ュ湪 ${month.value} 鐨勫叏閮ㄦ帓鐝紝纭畾缁х画鍚楋紵`,
- okText: '纭畾',
- cancelText: '鍙栨秷',
- onOk: async () => {
- saving.value = true;
- try {
- const items: HrmEmployeeScheduleApi.ScheduleItem[] = [];
- for (const emp of employees.value) {
- if (emp.id == null) {
- continue;
- }
- for (const day of days.value) {
- const date = formatDate(month.value, day);
- items.push({
- employeeId: emp.id,
- date,
- shiftId: scheduleMap.value.get(`${emp.id}_${date}`) ?? null,
- });
- }
- }
- // 澶ф壒閲忔椂鍒嗘壒鎻愪氦锛岄伩鍏嶅崟娆¤姹傝繃澶�
- for (let i = 0; i < items.length; i += SAVE_BATCH_SIZE) {
- await saveEmployeeSchedule(items.slice(i, i + SAVE_BATCH_SIZE));
- }
- message.success('鎺掔彮淇濆瓨鎴愬姛');
- } finally {
- saving.value = false;
- }
- },
- });
-}
-
onMounted(() => {
month.value = dayjs().format('YYYY-MM');
loadDeptTree();
@@ -712,14 +744,7 @@
<Button type="primary" ghost :disabled="!month" @click="openBatch">
鎵归噺鎺掔彮锛堟寜浜虹兢锛�
</Button>
- <Button
- type="primary"
- :loading="saving"
- :disabled="!employees.length"
- @click="handleSave"
- >
- 淇濆瓨鎺掔彮
- </Button>
+ <span class="text-sm text-gray-400">淇敼鏍煎瓙鍚庤嚜鍔ㄤ繚瀛�</span>
<Segmented
v-model:value="viewMode"
:options="[
@@ -861,6 +886,7 @@
vd.isWeekend ? 'bg-red-50/40' : '',
holidayClass(vd.date),
getLeaveByCell(emp.id!, vd.date) ? 'leave-cell' : '',
+ isCellSaving(emp.id!, vd.date) ? 'cell-saving' : '',
]"
@click="openPicker(emp, vd.date)"
>
@@ -972,11 +998,17 @@
checkedEmployeeIds.size > 0
? '锛堜粎鍕鹃�夌殑鍛樺伐锛�'
: '锛堟湭鍕鹃�夋椂涓哄綋鍓嶉〉鍏ㄩ儴鍛樺伐锛�'
- }}锛岀敓鎴愬悗鍙啀鎵嬪姩璋冩暣銆傝鍋囨棩锛堝鎵归�氳繃锛変細鑷姩璺宠繃銆佷笉瑕嗙洊銆�
+ }}锛岀敓鎴愬悗绔嬪嵆淇濆瓨銆傝鍋囨棩锛堝鎵归�氳繃锛変細鑷姩璺宠繃銆佷笉瑕嗙洊銆�
</div>
<div class="flex justify-end gap-2">
<Button @click="autoOpen = false">鍙栨秷</Button>
- <Button type="primary" @click="applyAutoSchedule">鐢熸垚鎺掔彮</Button>
+ <Button
+ type="primary"
+ :loading="autoSaving"
+ @click="applyAutoSchedule"
+ >
+ 鐢熸垚骞朵繚瀛�
+ </Button>
</div>
</div>
</Modal>
@@ -1129,6 +1161,12 @@
}
}
+ /* 鍗曞厓鏍间繚瀛樹腑锛氬崐閫忔槑锛屾彁绀烘鍦ㄨ惤搴� */
+ .cell-saving {
+ cursor: progress;
+ opacity: 0.45;
+ }
+
/* 鑺傚亣鏃ユ爣璁帮細浼戞伅鏃ユ鑹层�佽皟浼戝伐浣滄棩缁胯壊锛屼紭鍏堜簬鍛ㄦ湯搴曡壊 */
.holiday-rest {
background-color: #fff1e6 !important;
--
Gitblit v1.9.3