时间段校验

pages/basicData/calendar/class/edit.vue

@@ -44,6 +44,16 @@ export default {
       rules: {
         shiftWorkSchedCode: [{ required: true, message: "请填写班次编号", trigger: "blur" }],
         shiftName: [{ required: true, message: "请填写班次名称", trigger: "blur" }],
+        shiftStart: [{
+          required: true,
+          message: "请选择开始时间",
+          trigger: "change"
+        }],
+        shiftEnd: [{
+          required: true,
+          message: "请选择结束时间",
+          trigger: "change"
+        }],
       }
     };
   },
@@ -62,8 +72,13 @@ export default {
         if (v) {
           this.disabled = true;
           var data = this.entity
-          data.shiftStartEnd = this.entity.shiftStart+ '-' +this.entity.shiftEnd//.slice()
-          console.log(data)
+          let startime = data.shiftStart
+          let endtime = data.shiftEnd
+          if(startime> endtime){
+                alert("结束时间不能小于开始时间！");
+                this.disabled = false;
+                return;
+          }else{
           Api.update(data)
             .then(r => {
               this.disabled = false;
@@ -79,6 +94,7 @@ export default {
               this.$Message.error("保存失败");
               console.warn(err);
             });
+          }
         }
       });
     },

pages/basicData/calendar/holiday/edit.vue

@@ -71,7 +71,7 @@ export default {
           let startime = this.entity.holidayStart
           let endtime = this.entity.holidayEnd
           if(startime.getTime() > endtime.getTime()){
-                alert("结束时间不能大于开始时间！");
+                alert("结束时间不能小于开始时间！");
                 this.disabled = false;
                 return;
           }else{