From b98107c79f5198354bbd5f81c500fdf700c88a60 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期日, 08 十一月 2026 10:05:21 +0800
Subject: [PATCH] feat(hrm): 排班页展示请假标记与颜色图例
---
src/views/hrm/schedule/index.vue | 173 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 168 insertions(+), 5 deletions(-)
diff --git a/src/views/hrm/schedule/index.vue b/src/views/hrm/schedule/index.vue
index 703268b..c714546 100644
--- a/src/views/hrm/schedule/index.vue
+++ b/src/views/hrm/schedule/index.vue
@@ -30,6 +30,7 @@
import { getShiftList } from '#/api/hrm/shift';
import {
batchSaveEmployeeSchedule,
+ getEmployeeScheduleLeaveList,
getEmployeeScheduleList,
saveEmployeeSchedule,
} from '#/api/hrm/schedule';
@@ -70,6 +71,12 @@
* 褰撳墠瑙嗗浘鏃ユ湡鑼冨洿鍐呯殑鑺傚亣鏃ラ厤缃細key = yyyy-MM-dd锛寁alue = 1-浼戞伅鏃� / 2-宸ヤ綔鏃�
*/
const holidayMap = ref(new Map<string, number>());
+/**
+ * 褰撳墠瑙嗗浘鏃ユ湡鑼冨洿鍐呯殑璇峰亣锛歬ey = `${employeeId}_${yyyy-MM-dd}`锛寁alue = 璇峰亣璁板綍
+ */
+const leaveMap = ref(
+ new Map<string, HrmEmployeeScheduleApi.ScheduleLeave>(),
+);
const loading = ref(false);
const saving = ref(false);
/** 鏄惁宸叉墽琛岃繃鏌ヨ */
@@ -158,6 +165,10 @@
}
for (const day of days.value) {
const date = formatDate(month.value, day);
+ // 璇峰亣鏈熷唴涓嶆帓鐝紙鍚庣鎵归噺鎺掔彮鍚屾牱璺宠繃锛屼繚鐣欏師鎺掔彮涓嶅姩锛�
+ if (getLeaveByCell(emp.id, date)) {
+ continue;
+ }
const week = new Date(
`${month.value}-${String(day).padStart(2, '0')}`,
).getDay();
@@ -388,12 +399,63 @@
holidayMap.value = map;
}
-/** 瑙嗗浘鏃ユ湡鍙樺寲锛堝垏鏈�/鍒囧懆/鍒囪鍥撅級鏃堕噸鏂版媺鍙栬妭鍋囨棩 */
+/** 鍔犺浇褰撳墠瑙嗗浘鏃ユ湡鑼冨洿鍐呯殑宸插鎵硅鍋囷紝鎸夈�屽憳宸鏃ユ湡銆嶆墦鏁� */
+async function loadLeaves() {
+ const list = viewDays.value;
+ const first = list[0];
+ const last = list[list.length - 1];
+ if (!first || !last) {
+ leaveMap.value = new Map();
+ return;
+ }
+ const leaves = await getEmployeeScheduleLeaveList({
+ startDate: first.date,
+ endDate: last.date,
+ });
+ const map = new Map<string, HrmEmployeeScheduleApi.ScheduleLeave>();
+ for (const leave of leaves) {
+ if (leave.employeeId == null || !leave.startTime || !leave.endTime) {
+ continue;
+ }
+ const start = dayjs(leave.startTime).format('YYYY-MM-DD');
+ const end = dayjs(leave.endTime).format('YYYY-MM-DD');
+ const from = start < first.date ? first.date : start;
+ const to = end > last.date ? last.date : end;
+ for (
+ let date = dayjs(from);
+ !date.isAfter(dayjs(to), 'day');
+ date = date.add(1, 'day')
+ ) {
+ map.set(`${leave.employeeId}_${date.format('YYYY-MM-DD')}`, leave);
+ }
+ }
+ leaveMap.value = map;
+}
+
+/** 鏌愬憳宸ユ煇鏃ョ殑璇峰亣璁板綍 */
+function getLeaveByCell(
+ employeeId: number,
+ date: string,
+): HrmEmployeeScheduleApi.ScheduleLeave | undefined {
+ return leaveMap.value.get(`${employeeId}_${date}`);
+}
+
+/** 璇峰亣鍗曞厓鏍兼偓娴彁绀� */
+function leaveTitle(leave: HrmEmployeeScheduleApi.ScheduleLeave): string {
+ const range = `${dayjs(leave.startTime).format('MM-DD HH:mm')} ~ ${dayjs(
+ leave.endTime,
+ ).format('MM-DD HH:mm')}`;
+ const duration = leave.duration == null ? '' : `锛屽叡 ${leave.duration} 澶ー;
+ return `璇峰亣锛�${leave.leaveTypeName ?? ''}锛堝鎵归�氳繃锛塡n${range}${duration}`;
+}
+
+/** 瑙嗗浘鏃ユ湡鍙樺寲锛堝垏鏈�/鍒囧懆/鍒囪鍥撅級鏃堕噸鏂版媺鍙栬妭鍋囨棩涓庤鍋� */
watch(
() => viewDays.value.map((vd) => vd.date).join(','),
(key) => {
if (key) {
loadHolidays();
+ loadLeaves();
}
},
);
@@ -664,6 +726,35 @@
</template>
</div>
+ <!-- 鏃ユ湡鏍囪鍥句緥 -->
+ <div
+ class="mb-4 flex flex-wrap items-center gap-4 rounded-lg bg-white px-4 py-3 text-sm"
+ >
+ <span class="text-gray-500">鏃ユ湡鏍囪鍥句緥锛�</span>
+ <span class="inline-flex items-center gap-1.5">
+ <span class="legend-swatch bg-red-50" />
+ 鍛ㄦ湯
+ </span>
+ <span class="inline-flex items-center gap-1.5">
+ <span class="legend-swatch legend-swatch-rest" />
+ 鑺傚亣鏃ヤ紤鎭�
+ <span class="legend-tag legend-tag-rest">浼�</span>
+ </span>
+ <span class="inline-flex items-center gap-1.5">
+ <span class="legend-swatch legend-swatch-work" />
+ 璋冧紤涓婄彮
+ <span class="legend-tag legend-tag-work">鐝�</span>
+ </span>
+ <span class="inline-flex items-center gap-1.5">
+ <span class="legend-tag legend-tag-leave">鍋�</span>
+ 璇峰亣锛堝鎵归�氳繃锛屼笉鍙備笌鎺掔彮锛�
+ </span>
+ <span class="inline-flex items-center gap-1.5">
+ <span class="legend-swatch legend-swatch-shift" />
+ 鐝锛堥鑹茶鐝鍥句緥锛�
+ </span>
+ </div>
+
<!-- 鐝鍥句緥 -->
<div
v-if="shiftList.length"
@@ -755,11 +846,22 @@
v-for="vd in viewDays"
:key="vd.date"
class="schedule-cell"
- :class="[vd.isWeekend ? 'bg-red-50/40' : '', holidayClass(vd.date)]"
+ :class="[
+ vd.isWeekend ? 'bg-red-50/40' : '',
+ holidayClass(vd.date),
+ getLeaveByCell(emp.id!, vd.date) ? 'leave-cell' : '',
+ ]"
@click="openPicker(emp, vd.date)"
>
<span
- v-if="getShiftByCell(emp.id!, vd.date)"
+ v-if="getLeaveByCell(emp.id!, vd.date)"
+ class="leave-chip"
+ :title="leaveTitle(getLeaveByCell(emp.id!, vd.date)!)"
+ >
+ 鍋嚶穥{ getLeaveByCell(emp.id!, vd.date)!.leaveTypeName || '璇峰亣' }}
+ </span>
+ <span
+ v-else-if="getShiftByCell(emp.id!, vd.date)"
class="shift-chip"
:title="getShiftByCell(emp.id!, vd.date)!.name"
:style="{
@@ -859,7 +961,7 @@
checkedEmployeeIds.size > 0
? '锛堜粎鍕鹃�夌殑鍛樺伐锛�'
: '锛堟湭鍕鹃�夋椂涓哄綋鍓嶉〉鍏ㄩ儴鍛樺伐锛�'
- }}锛岀敓鎴愬悗鍙啀鎵嬪姩璋冩暣銆�
+ }}锛岀敓鎴愬悗鍙啀鎵嬪姩璋冩暣銆傝鍋囨棩锛堝鎵归�氳繃锛変細鑷姩璺宠繃銆佷笉瑕嗙洊銆�
</div>
<div class="flex justify-end gap-2">
<Button @click="autoOpen = false">鍙栨秷</Button>
@@ -947,7 +1049,7 @@
batchShiftId === 0
? '閫夋嫨銆屼紤鎭�嶅皢娓呴櫎璇ヨ寖鍥村唴宸叉湁鎺掔彮銆�'
: '鎸変笂鏂逛紤鎭ā寮忚烦杩囧懆鏈紝鍏朵綑鏃ユ湡鎺掓墍閫夌彮娆°��'
- }}宸查厤缃妭鍋囨棩鐨勬棩鏈熶互鑺傚亣鏃ヤ负鍑嗭細浼戞伅鏃ュ己鍒朵紤鎭紝宸ヤ綔鏃ュ己鍒舵帓鐝紙鍚皟浼戜笂鐝殑鍛ㄦ湯锛夈��
+ }}宸查厤缃妭鍋囨棩鐨勬棩鏈熶互鑺傚亣鏃ヤ负鍑嗭細浼戞伅鏃ュ己鍒朵紤鎭紝宸ヤ綔鏃ュ己鍒舵帓鐝紙鍚皟浼戜笂鐝殑鍛ㄦ湯锛夛紱鍛樺伐宸插鎵归�氳繃鐨勮鍋囨棩鑷姩璺宠繃锛屼繚鐣欏師鎺掔彮涓嶅姩銆�
</div>
<div class="flex justify-end gap-2">
<Button @click="batchOpen = false">鍙栨秷</Button>
@@ -1054,5 +1156,66 @@
white-space: nowrap;
border-radius: 3px;
}
+
+ /* 璇峰亣锛氱传鑹插簳 + 绱壊鏍囩锛屼笌鐝/鑺傚亣鏃ュ尯鍒� */
+ .leave-cell {
+ background-color: #f0ebff !important;
+ }
+
+ .leave-chip {
+ display: inline-block;
+ max-width: 100%;
+ padding: 1px 6px;
+ overflow: hidden;
+ color: #fff;
+ font-size: 12px;
+ text-overflow: ellipsis;
+ white-space: nowrap;
+ background-color: #722ed1;
+ border-radius: 3px;
+ }
+}
+
+/* 鍥句緥鑹插潡锛堝浘渚嬩笉鍦� .schedule-table 鍐咃級 */
+.legend-swatch {
+ display: inline-block;
+ width: 12px;
+ height: 12px;
+ border-radius: 2px;
+}
+
+.legend-swatch-rest {
+ background-color: #fff1e6;
+ border: 1px solid #ffd591;
+}
+
+.legend-swatch-work {
+ background-color: #e8f8ec;
+ border: 1px solid #b7eb8f;
+}
+
+.legend-swatch-shift {
+ background-color: #1677ff;
+}
+
+.legend-tag {
+ display: inline-block;
+ padding: 0 3px;
+ color: #fff;
+ font-size: 10px;
+ line-height: 14px;
+ border-radius: 2px;
+}
+
+.legend-tag-rest {
+ background-color: #fa8c16;
+}
+
+.legend-tag-work {
+ background-color: #52c41a;
+}
+
+.legend-tag-leave {
+ background-color: #722ed1;
}
</style>
--
Gitblit v1.9.3