+
-
-
-
- {{ data.day.split('-')[2] }}
-
-
- 休
-
- 班
-
-
- {{ getLunarDisplay(data.day) }}
-
-
-
-
-
- {{ item.teamName }}
-
-
- {{ item.teamName }}
-
-
- {{ item.teamName }}
-
-
-
-
@@ -79,40 +38,42 @@ import { CalCalendarApi, CalCalendarDayVO } from '@/api/mes/cal/calendar'
import { CalTeamApi, CalTeamVO } from '@/api/mes/cal/team'
import { CalHolidayApi, CalHolidayVO } from '@/api/mes/cal/holiday'
import { formatDate } from '@/utils/formatTime'
-import { SolarDay } from 'tyme4ts'
-import { HolidayType, MesCalShiftTypeEnum } from '@/views/mes/utils/constants'
+import { HolidayType } from '@/views/mes/utils/constants'
+import CalendarDateCell from './CalendarDateCell.vue'
const loading = ref(false)
-const currentDate = ref(new Date())
-const selectedTeamId = ref
()
-const teamList = ref([])
-const calendarDayMap = ref>(new Map())
-const holidaySet = ref(new Set())
+const currentDate = ref(new Date()) // 日历当前显示月份
+const selectedTeamId = ref() // 当前选中的班组编号
+const teamList = ref([]) // 所有班组列表
+const calendarDayMap = ref>(new Map()) // key: yyyy-MM-dd
+const holidaySet = ref(new Set()) // 节假日日期集合，key: yyyy-MM-dd
/** 获取班组列表 */
const getTeamList = async () => {
teamList.value = await CalTeamApi.getTeamList()
}
-/** 获取假期列表 */
+/** 获取节假日列表，构建节假日日期集合 */
const getHolidayList = async () => {
holidaySet.value.clear()
const list = await CalHolidayApi.getHolidayList()
- if (list) {
- list.forEach((item: CalHolidayVO) => {
- const day = item.day ? formatDate(item.day as any, 'YYYY-MM-DD') : ''
- if (day && item.type === HolidayType.HOLIDAY) {
- holidaySet.value.add(day)
- }
- })
+ if (!list) {
+ return
}
+ list.forEach((item: CalHolidayVO) => {
+ const day = item.day ? formatDate(item.day as any, 'YYYY-MM-DD') : ''
+ if (day && item.type === HolidayType.HOLIDAY) {
+ holidaySet.value.add(day)
+ }
+ })
}
-/** 查询排班日历 */
+/** 查询当前月份的排班日历，按选中班组过滤 */
const fetchCalendar = async () => {
if (!selectedTeamId.value) return
loading.value = true
try {
+ // 计算当前月份的起止时间
const date = currentDate.value
const year = date.getFullYear()
const month = date.getMonth()
@@ -124,80 +85,25 @@ const fetchCalendar = async () => {
startDay: formatDate(startDay, 'YYYY-MM-DD HH:mm:ss'),
endDay: formatDate(endDay, 'YYYY-MM-DD HH:mm:ss')
})
+ // 转为 Map 方便按日期快速查找
calendarDayMap.value.clear()
- if (list) {
- list.forEach((item: CalCalendarDayVO) => {
- calendarDayMap.value.set(item.day, item)
- })
+ if (!list) {
+ return
}
+ list.forEach((item: CalCalendarDayVO) => {
+ calendarDayMap.value.set(item.day, item)
+ })
} finally {
loading.value = false
}
}
-/** 选择班组 */
+/** 选择班组后刷新日历 */
const onTeamSelected = () => {
fetchCalendar()
}
-/** 获取指定日期的班次列表 */
-const getTeamShiftsForDay = (day: string) => {
- const calDay = calendarDayMap.value.get(day)
- return calDay?.teamShifts || []
-}
-
-/** 获取指定日期的轮班方式 */
-const getShiftTypeForDay = (day: string) => {
- const calDay = calendarDayMap.value.get(day)
- return calDay?.shiftType
-}
-
-/** 判断是否周末 */
-const isWeekend = (day: string): boolean => {
- const date = new Date(day)
- const weekDay = date.getDay()
- return weekDay === 0 || weekDay === 6
-}
-
-/** 获取农历显示信息 */
-const getLunarInfo = (day: string) => {
- const parts = day.split('-')
- const year = parseInt(parts[0])
- const month = parseInt(parts[1])
- const date = parseInt(parts[2])
- try {
- const solarDay = SolarDay.fromYmd(year, month, date)
- const lunarDay = solarDay.getLunarDay()
- const solarFestival = solarDay.getFestival()
- const lunarFestival = lunarDay.getFestival()
- const termDay = solarDay.getTermDay()
- const termName = termDay.getDayIndex() === 0 ? termDay.getSolarTerm().getName() : null
- const lunarMonthName = lunarDay.getLunarMonth().getName()
- const lunarDayName = lunarDay.getName()
- return {
- solarFestival: solarFestival ? solarFestival.getName() : null,
- lunarFestival: lunarFestival ? lunarFestival.getName() : null,
- termName,
- lunarText: lunarMonthName + lunarDayName
- }
- } catch {
- return { solarFestival: null, lunarFestival: null, termName: null, lunarText: '' }
- }
-}
-
-/** 获取农历显示文本 */
-const getLunarDisplay = (day: string): string => {
- const info = getLunarInfo(day)
- return info.solarFestival || info.lunarFestival || info.termName || info.lunarText
-}
-
-/** 判断是否有节日 */
-const hasFestival = (day: string): boolean => {
- const info = getLunarInfo(day)
- return !!(info.solarFestival || info.lunarFestival || info.termName)
-}
-
-// 监听月份变化
+/** 监听月份切换，重新加载当月排班 */
watch(currentDate, () => {
if (selectedTeamId.value) {
fetchCalendar()
diff --git a/src/views/mes/cal/calendar/TypeView.vue b/src/views/mes/cal/calendar/TypeView.vue
new file mode 100644
index 000000000..c12fe99fb
--- /dev/null
+++ b/src/views/mes/cal/calendar/TypeView.vue
@@ -0,0 +1,114 @@
+
+
+
+
+
+
+
+
+ {{ dict.label }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 查询
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/mes/cal/calendar/index.vue b/src/views/mes/cal/calendar/index.vue
index d1f3e9189..b5e07b217 100644
--- a/src/views/mes/cal/calendar/index.vue
+++ b/src/views/mes/cal/calendar/index.vue
@@ -2,24 +2,23 @@
-
-
+
-
+