修复bug

src/assets/styles/ruoyi.scss

@@ -375,8 +375,10 @@
      }
    }
  }
-
+ .vue-treeselect__control{
+   height: 28px!important;
+ }
  .vue-treeselect--has-value .vue-treeselect__input {
-   line-height: 100%!important;
    vertical-align: middle!important;
  }
+

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

@@ -248,59 +248,57 @@ export default {
     //检查每一项
     check(other) {
       if(!other.ymdDate){
-        this.$message.warning(`日期不能为空`);
+        this.$message.error(`日期不能为空`);
         return;
       }
       const ds = this.formatTime(other.ymdDate,"YYYY-MM-DD");
       console.log(other,'ds')
       if ( !other.isEnable === null && !other.disabled ) {
-        this.$message.warning(`${ds}：未进行配置`);
+        this.$message.error(`${ds}：未进行配置`);
         return;
       }
       if(other.isEnable){
         if(!other.openTime || !other.closeTime){
-          this.$message.warning(`${ds}：未配置时间`);
+          this.$message.error(`${ds}：未配置时间`);
           return;
         }
         if(!timeCheck([other.openTime,other.closeTime])){
-          this.$message.warning(`${ds}：营业开始时间应在营业结束之前`);
+          this.$message.error(`${ds}：营业开始时间应在营业结束之前`);
           return false;
         }
       }
-      return true
-      // if (other.isEnable) {
-      //   if (
-      //       !(
-      //           other.workTime &&
-      //           other.openTime &&
-      //           other.closeTime &&
-      //           other.workOffTime
-      //       )
-      //   ) {
-      //     this.$message.error(`${ds}未配置时间`);
-      //     return;
-      //   }
-      //   if (!other.noonbreakStart ^ !other.noonbreakEnd) {
-      //     this.$message.error(`午休开始及结束时间必须同时配置`);
-      //     return;
-      //   }
-      //   if (
-      //       !timeCheck([
-      //         other.workTime,
-      //         other.openTime,
-      //         other.noonbreakStart,
-      //         other.noonbreakEnd,
-      //         other.closeTime,
-      //         other.workOffTime,
-      //       ])
-      //   ) {
-      //     this.$message.error(
-      //         `${ds}上班时间<=营业时间<=午休开始<=午休结束<=营业终了<=下班时间`
-      //     );
-      //     return false;
-      //   }
-      // }
-      // return true;
+      //return true
+      if (other.isEnable) {
+        if (
+            !(
+                other.workTime &&
+                other.openTime &&
+                other.closeTime &&
+                other.workOffTime
+            )
+        ) {
+          this.$message.error(`${ds}：有尚未配置的时间项`);
+          return;
+        }
+        // if (!other.noonbreakStart ^ !other.noonbreakEnd) {
+        //   this.$message.error(`午休开始及结束时间必须同时配置`);
+        //   return;
+        // }
+        if (
+            !timeCheck([
+              other.workTime,
+              other.openTime,
+              other.closeTime,
+              other.workOffTime,
+            ])
+        ) {
+          this.$message.error(
+              `${ds}：请按照（上班时间<=营业时间<=营业结束<=下班时间）顺序配置`
+          );
+          return false;
+        }
+      }
+      return true;
     },
     handleClose() {
       this.isShow = false;

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

@@ -188,22 +188,35 @@ export default {
     onSubmit() {
       this.$refs.form.validate((isValidate) => {
         if (!isValidate) return;
-        if (
-            !timeCheck([
-              this.formData.openTime,
-              this.formData.closeTime,
-            ])
-        ) {
-          this.$message.warning(`营业开始时间应在营业结束之前`);
-          return false;
-        }
+        // if (
+        //     !timeCheck([
+        //       this.formData.openTime,
+        //       this.formData.closeTime,
+        //     ])
+        // ) {
+        //   this.$message.warning(`营业开始时间应在营业结束之前`);
+        //   return false;
+        // }
+        // if (
+        //   !timeCheck([
+        //     this.formData.workTime,
+        //     this.formData.workOffTime,
+        //   ])
+        // ) {
+        //   this.$message.warning(`上班开始时间应在下班结束之前`);
+        //   return false;
+        // }
         if (
           !timeCheck([
             this.formData.workTime,
+            this.formData.openTime,
+            this.formData.closeTime,
             this.formData.workOffTime,
           ])
         ) {
-          this.$message.warning(`上班开始时间应在下班结束之前`);
+          this.$message.error(
+            `请按照（上班时间<=营业时间<=营业结束<=下班时间）顺序配置`
+          );
           return false;
         }
         editWorkTime(this.formData).then(res=>{

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

@@ -244,15 +244,15 @@ export default {
     },
     onSubmit() {
       if (this.formData.orgIds.length < 1) {
-        this.$message.warning("请选择机构");
+        this.$message.error("请选择机构");
         return;
       }
       if (!this.formData.effectiveDate ) {
-        this.$message.warning("请选择生效日期");
+        this.$message.error("请选择生效日期");
         return;
       }
       if (this.formData.dayOfWeeks.filter(w => w.isWorkday == 1 || w.isWorkday).length === 0) {
-        this.$message.warning("工作日不能为空");
+        this.$message.error("工作日不能为空");
         return;
       }
       // 校验
@@ -270,17 +270,25 @@ export default {
       console.log(dayOfWeek,'dayOfWeek');
       //是否启用
       if(dayOfWeek.isWorkday == '0') return true;
-      if (!( dayOfWeek.openTime && dayOfWeek.closeTime)) {
-        this.$message.warning(`${dayOfWeek.dayOfWeekText}的营业时间未完整配置`);
+      if (
+        !(
+          dayOfWeek.workTime &&
+          dayOfWeek.openTime &&
+          dayOfWeek.closeTime &&
+          dayOfWeek.workOffTime
+        )
+      ) {
+        this.$message.error(`${dayOfWeek.dayOfWeekText}：有尚未配置的时间项`);
         return;
       }
       // if (!dayOfWeek.noonbreakStart ^ !dayOfWeek.noonbreakEnd) {
       //   this.$message.error(`${dayOfWeek.dayOfWeekText}的午休开始及结束时间必须同时配置`);
       //   return;
       // }
-      let arr = [dayOfWeek.openTime,dayOfWeek.closeTime];
+      let arr = [dayOfWeek.workTime ,dayOfWeek.openTime,dayOfWeek.closeTime,dayOfWeek.workOffTime];
       if (!timeCheck(arr)) {
-        this.$message.warning(`${dayOfWeek.dayOfWeekText}的营业开始时间应在营业结束之前`);
+
+        this.$message.error(`${dayOfWeek.dayOfWeekText}：请按照（上班时间<=营业时间<=营业结束<=下班时间）顺序配置`);
         return false;
       }
       return true;