|
|
@@ -120,15 +120,15 @@
|
|
|
:before-close="handleClose"
|
|
|
:visible.sync="courseVisible">
|
|
|
<el-form :model="maskForm"
|
|
|
+ class="maskForm"
|
|
|
ref="maskForm"
|
|
|
:rules="maskRules"
|
|
|
label-position="right"
|
|
|
- label-width="80px;"
|
|
|
+ label-width="80px"
|
|
|
:inline="true">
|
|
|
<el-form-item label="上课日期"
|
|
|
prop="date">
|
|
|
<el-date-picker v-model.trim="maskForm.date"
|
|
|
- style="width:200px!important;"
|
|
|
type="date"
|
|
|
:picker-options="{
|
|
|
firstDayOfWeek:1
|
|
|
@@ -138,27 +138,25 @@
|
|
|
</el-form-item>
|
|
|
<el-form-item label="开始时间"
|
|
|
prop="startTime">
|
|
|
- <el-time-select placeholder="起始时间"
|
|
|
- style="width:200px!important;"
|
|
|
+ <el-time-picker placeholder="起始时间"
|
|
|
v-model.trim="startTime"
|
|
|
+ @change="changeStartTime"
|
|
|
+ format='HH:mm'
|
|
|
+ value-format='HH:mm'
|
|
|
:picker-options="{
|
|
|
- start: '04:30',
|
|
|
- step: '00:05',
|
|
|
- end: '23:30'
|
|
|
- }"></el-time-select>
|
|
|
+ selectableRange: '04:30:00 - 23:30:00'
|
|
|
+ }"></el-time-picker>
|
|
|
</el-form-item>
|
|
|
- <!-- <el-form-item label="结束时间"
|
|
|
+ <el-form-item label="结束时间"
|
|
|
prop="endTime">
|
|
|
- <el-time-select placeholder="结束时间"
|
|
|
- v-model.trim="maskForm.endTime"
|
|
|
- :picker-options="{
|
|
|
- start: '04:30',
|
|
|
- step: '00:05',
|
|
|
- end: '23:30',
|
|
|
- minTime: maskForm.startTime
|
|
|
- }">
|
|
|
- </el-time-select>
|
|
|
- </el-form-item> v-if="maskForm.teachMode=='OFFLINE'"-->
|
|
|
+ <el-time-picker placeholder="结束时间"
|
|
|
+ format='HH:mm'
|
|
|
+ value-format='HH:mm'
|
|
|
+ v-model="maskForm.endTime"
|
|
|
+ disabled>
|
|
|
+ </el-time-picker>
|
|
|
+ </el-form-item>
|
|
|
+ <!--v-if="maskForm.teachMode=='OFFLINE'"-->
|
|
|
<el-form-item label="课程类型"
|
|
|
prop="courseType">
|
|
|
<el-select clearable
|
|
|
@@ -341,14 +339,25 @@
|
|
|
:value="item.value"></el-option>
|
|
|
</el-select>
|
|
|
<span style="margin-left:10px;">开始时间</span>
|
|
|
- <el-time-select style="margin-left:10px;"
|
|
|
+ <el-time-picker style="margin-left:10px;"
|
|
|
placeholder
|
|
|
v-model.trim="item.startClassTime"
|
|
|
+ @change="(val)=>{changeStartTimes(val,item)}"
|
|
|
+ format='HH:mm'
|
|
|
+ value-format='HH:mm'
|
|
|
:picker-options="{
|
|
|
- start: '04:30',
|
|
|
- step: '00:05',
|
|
|
- end: '23:55'
|
|
|
- }"></el-time-select>
|
|
|
+ selectableRange: '04:30:00 - 23:30:00'
|
|
|
+ }"></el-time-picker>
|
|
|
+ <span style="margin-left:10px;">结束时间</span>
|
|
|
+ <el-time-picker style="margin-left:10px;"
|
|
|
+ placeholder
|
|
|
+ v-model.trim="item.endClassTime"
|
|
|
+ format='HH:mm'
|
|
|
+ value-format='HH:mm'
|
|
|
+ disabled
|
|
|
+ :picker-options="{
|
|
|
+ selectableRange: '04:30:00 - 23:30:00'
|
|
|
+ }"></el-time-picker>
|
|
|
<el-button style="margin-left:10px;"
|
|
|
type="danger"
|
|
|
@click="removeWeek(item)"
|
|
|
@@ -450,6 +459,8 @@ import {
|
|
|
batchAppendVipGroupCourses
|
|
|
} from "@/api/vipSeting";
|
|
|
import { getTeachSchool } from "@/api/teacherManager";
|
|
|
+import { diffTimerFormMinute, addTimerFormMinute } from '@/utils/date'
|
|
|
+import dayjs from 'dayjs'
|
|
|
export default {
|
|
|
components: {
|
|
|
pagination
|
|
|
@@ -495,9 +506,9 @@ export default {
|
|
|
maskRules: {
|
|
|
date: [{ required: true, message: "请选择上课时间", trigger: "blur" }],
|
|
|
// startTime: [{ required: true, message: '请选择上课开始时间', trigger: 'blur' },],
|
|
|
- endTime: [
|
|
|
- { required: true, message: "请选择上课结束时间", trigger: "blur" }
|
|
|
- ]
|
|
|
+ // endTime: [
|
|
|
+ // { required: true, message: "请选择上课结束时间", trigger: "blur" }
|
|
|
+ // ]
|
|
|
},
|
|
|
schoolList: [],
|
|
|
Frules: null,
|
|
|
@@ -541,7 +552,8 @@ export default {
|
|
|
adjustmentName: "",
|
|
|
startTime: "",
|
|
|
chioseVipList: [],
|
|
|
- organList: []
|
|
|
+ organList: [],
|
|
|
+ vipTime: 45
|
|
|
};
|
|
|
},
|
|
|
created () { },
|
|
|
@@ -623,6 +635,7 @@ export default {
|
|
|
*/
|
|
|
this.maskForm.date = row.classDate.split(' ')[0];
|
|
|
this.startTime = row.startClassTimeStr.substring(0, 5)
|
|
|
+ this.maskForm.endTime = row.endClassTimeStr.substring(0, 5)
|
|
|
// this.maskForm.endTime = row.endClassTimeStr;
|
|
|
this.maskForm.id = row.id;
|
|
|
this.maskForm.address = row.schoolId || null;
|
|
|
@@ -946,6 +959,23 @@ export default {
|
|
|
});
|
|
|
})
|
|
|
.catch(() => { });
|
|
|
+ },
|
|
|
+ changeStartTime (val) {
|
|
|
+ if (val) {
|
|
|
+ this.$set(this.maskForm, 'endTime', addTimerFormMinute(this.maskForm.date, val, this.vipTime))
|
|
|
+ } else {
|
|
|
+ this.$set(this.maskForm, 'endTime', '')
|
|
|
+ }
|
|
|
+
|
|
|
+ },
|
|
|
+ changeStartTimes (val, item) {
|
|
|
+ if (val) {
|
|
|
+ let str = dayjs(new Date()).format('YYYY-MM-DD')
|
|
|
+ this.$set(item, 'endClassTime', addTimerFormMinute(str, val, this.vipTime))
|
|
|
+ } else {
|
|
|
+ this.$set(item, 'endClassTime', '')
|
|
|
+ }
|
|
|
+
|
|
|
}
|
|
|
},
|
|
|
watch: {
|
|
|
@@ -960,9 +990,10 @@ export default {
|
|
|
fee: "",
|
|
|
address: ""
|
|
|
}
|
|
|
+ this.weekList = [];
|
|
|
this.$refs['tableList'].clearSelection();
|
|
|
this.$refs["adjustmentForm"].resetFields();
|
|
|
- this.weekList = [];
|
|
|
+
|
|
|
this.addWeek();
|
|
|
}
|
|
|
},
|
|
|
@@ -970,7 +1001,8 @@ export default {
|
|
|
if (!val) {
|
|
|
this.addrForm.address = "";
|
|
|
}
|
|
|
- }
|
|
|
+ },
|
|
|
+
|
|
|
}
|
|
|
};
|
|
|
</script>
|
|
|
@@ -989,8 +1021,16 @@ export default {
|
|
|
width: 180px !important;
|
|
|
}
|
|
|
}
|
|
|
-/deep/.el-date-editor.el-input,
|
|
|
-/deep/.el-date-editor.el-input__inner {
|
|
|
- width: 100px !important;
|
|
|
+.countWrap {
|
|
|
+ /deep/.el-date-editor.el-input,
|
|
|
+ /deep/.el-date-editor.el-input__inner {
|
|
|
+ width: 100px !important;
|
|
|
+ }
|
|
|
+}
|
|
|
+
|
|
|
+.maskForm {
|
|
|
+ /deep/.el-input {
|
|
|
+ width: 220px !important;
|
|
|
+ }
|
|
|
}
|
|
|
</style>
|
