From ac565df702d10c6cb5caf5cdec131c07b3e9d7f7 Mon Sep 17 00:00:00 2001
From: zhangwencui <1064582902@qq.com>
Date: 星期五, 12 六月 2026 10:46:52 +0800
Subject: [PATCH] Merge branch 'dev_NEW_pro' into dev_宁夏_万通新型
---
src/views/collaborativeApproval/notificationManagement/meetIndex/index.vue | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/src/views/collaborativeApproval/notificationManagement/meetIndex/index.vue b/src/views/collaborativeApproval/notificationManagement/meetIndex/index.vue
index 9b5325f..235faa3 100644
--- a/src/views/collaborativeApproval/notificationManagement/meetIndex/index.vue
+++ b/src/views/collaborativeApproval/notificationManagement/meetIndex/index.vue
@@ -145,10 +145,11 @@
if (endIdx === -1) {
endIdx = timeSlots.value.length
}
- console.log('endIdx111', endIdx)
- if (startIdx !== -1 && endIdx !== -1) {
+ // 寰�鍚庡欢浼镐竴鏍硷紝璁╀細璁牸瀛愯鐩栧埌缁撴潫鏃堕棿鍒椾笂
+ const displayEndIdx = Math.min(endIdx + 1, timeSlots.value.length)
+ if (startIdx !== -1) {
// 鏍囪琚崰鐢ㄧ殑鏃堕棿娈�
- for (let i = startIdx; i < endIdx; i++) {
+ for (let i = startIdx; i < displayEndIdx; i++) {
occupiedSlots.add(timeSlots.value[i].value)
}
@@ -156,7 +157,7 @@
cells.push({
type: 'meeting',
meeting: meeting,
- span: endIdx - startIdx,
+ span: displayEndIdx - startIdx,
startTime: meeting.startTime,
endTime: meeting.endTime
})
--
Gitblit v1.9.3