|  | @@ -257,7 +257,7 @@ export default {
 | 
											
												
													
														|  |          }
 |  |          }
 | 
											
												
													
														|  |        }
 |  |        }
 | 
											
												
													
														|  |        addTimeWeek(this.formData).then(res=>{
 |  |        addTimeWeek(this.formData).then(res=>{
 | 
											
												
													
														|  | -        this.$message.success("保存成功");        
 |  | 
 | 
											
												
													
														|  | 
 |  | +        this.$message.success("保存成功");
 | 
											
												
													
														|  |          this.handleClose();
 |  |          this.handleClose();
 | 
											
												
													
														|  |          this.$emit("ok");
 |  |          this.$emit("ok");
 | 
											
												
													
														|  |        })
 |  |        })
 | 
											
										
											
												
													
														|  | @@ -281,14 +281,20 @@ export default {
 | 
											
												
													
														|  |        //   this.$message.error(`${dayOfWeek.dayOfWeekText}的午休开始及结束时间必须同时配置`);
 |  |        //   this.$message.error(`${dayOfWeek.dayOfWeekText}的午休开始及结束时间必须同时配置`);
 | 
											
												
													
														|  |        //   return;
 |  |        //   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 false;
 | 
											
												
													
														|  |        }
 |  |        }
 | 
											
												
													
														|  |        return true;
 |  |        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){
 |  |      async submitData(result){
 | 
											
												
													
														|  |        this.centerDialogVisible=false;
 |  |        this.centerDialogVisible=false;
 | 
											
												
													
														|  |        this.centerDialogVisiblea=false;
 |  |        this.centerDialogVisiblea=false;
 |