|
|
@@ -151,6 +151,13 @@
|
|
|
isConflict = true;
|
|
|
break;
|
|
|
}
|
|
|
+ if (
|
|
|
+ timeItem.value.startDay < dayRange.startDay! &&
|
|
|
+ timeItem.value.endDay > dayRange.endDay!
|
|
|
+ ) {
|
|
|
+ isConflict = true;
|
|
|
+ break;
|
|
|
+ }
|
|
|
}
|
|
|
if (isConflict) {
|
|
|
ElMessage.error('日期存在冲突');
|
|
|
@@ -182,6 +189,13 @@
|
|
|
isConflict = true;
|
|
|
break;
|
|
|
}
|
|
|
+ if (
|
|
|
+ hm2Minutes(curTimes!.startTime) < hm2Minutes(item.startTime) &&
|
|
|
+ hm2Minutes(curTimes!.endTime) > hm2Minutes(item.endTime)
|
|
|
+ ) {
|
|
|
+ isConflict = true;
|
|
|
+ break;
|
|
|
+ }
|
|
|
}
|
|
|
if (isConflict) {
|
|
|
ElMessage.error('时间存在冲突');
|