|  | @@ -59,29 +59,27 @@
 | 
	
		
			
				|  |  |      <el-dialog :visible.sync="timeVisible" width="600px" :before-close="closetimeVisible">
 | 
	
		
			
				|  |  |        <el-form :inline="true" v-model="timeForm" ref="timeForm" >
 | 
	
		
			
				|  |  |          <el-form-item label="开始时间" >
 | 
	
		
			
				|  |  | -          <el-time-select
 | 
	
		
			
				|  |  | +          <el-time-picker
 | 
	
		
			
				|  |  |              v-model="startTime"
 | 
	
		
			
				|  |  |              @change="changeStartTime"
 | 
	
		
			
				|  |  | -            value-format='HH:mm:ss'
 | 
	
		
			
				|  |  | +            format='HH:mm'
 | 
	
		
			
				|  |  | +            value-format='HH:mm'
 | 
	
		
			
				|  |  |              :picker-options="{
 | 
	
		
			
				|  |  | -    start: '08:30',
 | 
	
		
			
				|  |  | -    step: '00:05',
 | 
	
		
			
				|  |  | -    end: '20:30'
 | 
	
		
			
				|  |  | +              selectableRange:`00:00:00 - 23:59:00`
 | 
	
		
			
				|  |  |    }"
 | 
	
		
			
				|  |  |              placeholder="选择时间"
 | 
	
		
			
				|  |  | -          ></el-time-select>
 | 
	
		
			
				|  |  | +          ></el-time-picker>
 | 
	
		
			
				|  |  |          </el-form-item>
 | 
	
		
			
				|  |  |          <el-form-item label="结束时间" >
 | 
	
		
			
				|  |  | -          <el-time-select
 | 
	
		
			
				|  |  | +          <el-time-picker
 | 
	
		
			
				|  |  |              v-model="endTime"
 | 
	
		
			
				|  |  | -            value-format='HH:mm:ss'
 | 
	
		
			
				|  |  | +            format='HH:mm'
 | 
	
		
			
				|  |  | +            value-format='HH:mm'
 | 
	
		
			
				|  |  |              :picker-options="{
 | 
	
		
			
				|  |  | -    start:startTime,
 | 
	
		
			
				|  |  | -    step: '00:05',
 | 
	
		
			
				|  |  | -    end: '20:30'
 | 
	
		
			
				|  |  | +              selectableRange:`${startTime ? startTime+':00' : '00:00:00'}-23:59:00`
 | 
	
		
			
				|  |  |    }"
 | 
	
		
			
				|  |  |              placeholder="选择时间"
 | 
	
		
			
				|  |  | -          ></el-time-select>
 | 
	
		
			
				|  |  | +          ></el-time-picker>
 | 
	
		
			
				|  |  |          </el-form-item>
 | 
	
		
			
				|  |  |        </el-form>
 | 
	
		
			
				|  |  |        <div slot="footer" class="dialog-footer">
 | 
	
	
		
			
				|  | @@ -243,13 +241,13 @@ export default {
 | 
	
		
			
				|  |  |            userId: this.teacherId,
 | 
	
		
			
				|  |  |            id: this.accompanyId,
 | 
	
		
			
				|  |  |            totalTimes: this.accompanyForm.count,
 | 
	
		
			
				|  |  | -          monday:JSON.stringify(monday),
 | 
	
		
			
				|  |  | -          tuesday:JSON.stringify(tuesday),
 | 
	
		
			
				|  |  | -          wednesday:JSON.stringify(wednesday),
 | 
	
		
			
				|  |  | -          thursday:JSON.stringify(thursday),
 | 
	
		
			
				|  |  | -          friday:JSON.stringify(friday),
 | 
	
		
			
				|  |  | -          saturday:JSON.stringify(saturday),
 | 
	
		
			
				|  |  | -          sunday:JSON.stringify(sunday)
 | 
	
		
			
				|  |  | +          monday:monday&&monday.length > 0?JSON.stringify(monday):'',
 | 
	
		
			
				|  |  | +          tuesday:tuesday&&tuesday.length > 0?JSON.stringify(tuesday):'',
 | 
	
		
			
				|  |  | +          wednesday:wednesday&&wednesday.length > 0?JSON.stringify(wednesday):'',
 | 
	
		
			
				|  |  | +          thursday:thursday&&thursday.length > 0?JSON.stringify(thursday):'',
 | 
	
		
			
				|  |  | +          friday:friday&&friday.length > 0?JSON.stringify(friday):'',
 | 
	
		
			
				|  |  | +          saturday:saturday&&saturday.length > 0?JSON.stringify(saturday):'',
 | 
	
		
			
				|  |  | +          sunday:sunday&&sunday.length > 0?JSON.stringify(sunday):''
 | 
	
		
			
				|  |  |          }).then(res => {
 | 
	
		
			
				|  |  |            if (res.code == 200) {
 | 
	
		
			
				|  |  |              this.$message.success("保存成功");
 | 
	
	
		
			
				|  | @@ -263,7 +261,7 @@ export default {
 | 
	
		
			
				|  |  |      },
 | 
	
		
			
				|  |  |      setHoliday(val) {
 | 
	
		
			
				|  |  |        // console.log(val)
 | 
	
		
			
				|  |  | -      if (!val) return;
 | 
	
		
			
				|  |  | +      
 | 
	
		
			
				|  |  |        val = parseInt(val);
 | 
	
		
			
				|  |  |        // console.log(val)
 | 
	
		
			
				|  |  |        let arr = [
 | 
	
	
		
			
				|  | @@ -346,8 +344,8 @@ export default {
 | 
	
		
			
				|  |  |          return;
 | 
	
		
			
				|  |  |        }
 | 
	
		
			
				|  |  |        this.activeItem.timeList.push({
 | 
	
		
			
				|  |  | -        startTime: this.startTime,
 | 
	
		
			
				|  |  | -        endTime: this.endTime
 | 
	
		
			
				|  |  | +        startTime: this.startTime+':00',
 | 
	
		
			
				|  |  | +        endTime: this.endTime+':00'
 | 
	
		
			
				|  |  |        });
 | 
	
		
			
				|  |  |        // 排序
 | 
	
		
			
				|  |  |        this.activeItem.timeList.sort((a, b) => {
 |