Преглед на файлове

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

jingyuanchao преди 1 година
родител
ревизия
6ca2de8ca0
променени са 1 файла, в които са добавени 10 реда и са изтрити 4 реда
  1. 10 4
      src/views/system/workTimeSet/dialog.template.vue

+ 10 - 4
src/views/system/workTimeSet/dialog.template.vue

@@ -257,7 +257,7 @@ export default {
         }
       }
       addTimeWeek(this.formData).then(res=>{
-        this.$message.success("保存成功");        
+        this.$message.success("保存成功");
         this.handleClose();
         this.$emit("ok");
       })
@@ -281,14 +281,20 @@ export default {
       //   this.$message.error(`${dayOfWeek.dayOfWeekText}的午休开始及结束时间必须同时配置`);
       //   return;
       // }
-      let arr = [dayOfWeek.workTime ,dayOfWeek.openTime,dayOfWeek.closeTime,dayOfWeek.workOffTime];
-      if (!timeCheck(arr)) {
+      if (!this.validateTimes(dayOfWeek)) {
 
-        this.$message.error(`${dayOfWeek.dayOfWeekText}:请按照(上班时间<营业时间<营业结束<下班时间)顺序配置`);
+        this.$message.error(`${dayOfWeek.dayOfWeekText}:请按照(上班时间<=营业时间<营业结束<=下班时间)顺序配置`);
         return false;
       }
       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;