处理web上班时间允许与营业时间相同

src/utils/ruoyi.js

@@ -28,6 +28,14 @@ export function timeCheck(arr) {
 function timeToNumber(src) {
   return src.replace(":", "") * 1;
 }
+export function validateTimes(dayOfWeek) {
+
+    let a = dayOfWeek.workTime <= dayOfWeek.openTime;
+    let b = dayOfWeek.openTime < dayOfWeek.closeTime;
+    let c = dayOfWeek.closeTime <= dayOfWeek.workOffTime;
+    console.log('a,b,c',a,b,c)
+    return a && b && c;
+}
 
 // 日期格式化 2023-12-30 00:00:00 或者获取星期几
 export function parseTime(value, format = "YYYY-MM-DD HH:mm:ss") {

src/views/system/workTimeSet/dialog.add.vue

@@ -179,6 +179,7 @@
 import OrgTreeSelect from "@/components/orgTreeSelect";
 import BtnTip from "@/components/btnTip";
 import dayjs from "dayjs";
+import { validateTimes } from "@/utils/ruoyi";
 import { formatTime, timeCheck } from "@/utils/ruoyi";
 import { addWorkTimeDay } from "@/views/system/workTimeSet/api";
 import day from "@/components/Crontab/day";
@@ -308,16 +309,9 @@ export default {
         //   this.$message.error(`午休开始及结束时间必须同时配置`);
         //   return;
         // }
-        if (
-          !timeCheck([
-            other.workTime,
-            other.openTime,
-            other.closeTime,
-            other.workOffTime,
-          ])
-        ) {
+        if (!validateTimes(other)) {
           this.$message.error(
-            `${ds}：请按照（上班时间<营业时间<营业结束<下班时间）顺序配置`
+            `${ds}：请按照（上班时间<=营业时间<营业结束<=下班时间）顺序配置`
           );
           return false;
         }

src/views/system/workTimeSet/dialog.template.vue

@@ -171,7 +171,7 @@
 
 import BtnTip from "@/components/btnTip";
 import OrgTreeSelect from '@/components/orgTreeSelect'
-import { timeCheck } from "@/utils/ruoyi";
+import { validateTimes } from "@/utils/ruoyi";
 import {addTimeWeek, queryInfoById} from "@/views/system/workTimeSet/api";
 import {json} from './json'  //导入默认数据
 export default {
@@ -288,13 +288,6 @@ export default {
       }
       return true;
     },
-    validateTimes(dayOfWeek) {
-      let a = dayOfWeek.workTime <= dayOfWeek.openTime;
-      let b = dayOfWeek.openTime < dayOfWeek.closeTime;
-      let c = dayOfWeek.closeTime <= dayOfWeek.workOffTime;
-      console.log('a,b,c',a,b,c)
-      return a && b && c;
-    },
     async submitData(result){
       this.centerDialogVisible=false;
       this.centerDialogVisiblea=false;