|
@@ -172,7 +172,7 @@
|
|
|
v-model.trim="searchForm.timer"
|
|
|
type="daterange"
|
|
|
value-format="yyyy-MM-dd"
|
|
|
- range-separator="至"
|
|
|
+ range-separator="-"
|
|
|
start-placeholder="上课开始日期"
|
|
|
end-placeholder="上课结束日期"
|
|
|
:picker-options="{
|
|
@@ -180,19 +180,24 @@
|
|
|
}"
|
|
|
></el-date-picker>
|
|
|
</el-form-item>
|
|
|
- <!-- <el-form-item>
|
|
|
- <el-date-picker
|
|
|
- v-model.trim="searchForm.creatTimer"
|
|
|
- type="daterange"
|
|
|
- value-format="yyyy-MM-dd"
|
|
|
- range-separator="至"
|
|
|
- start-placeholder="创建开始日期"
|
|
|
- end-placeholder="创建结束日期"
|
|
|
+ <el-form-item>
|
|
|
+ <el-time-picker
|
|
|
+ is-range
|
|
|
:picker-options="{
|
|
|
- firstDayOfWeek: 1,
|
|
|
+ selectableRange: '04:00:00 - 23:59:59',
|
|
|
}"
|
|
|
- ></el-date-picker>
|
|
|
- </el-form-item> -->
|
|
|
+ style="width: 375px !important"
|
|
|
+ v-model="searchForm.courseTime"
|
|
|
+ range-separator="-"
|
|
|
+ start-placeholder="上课开始时间"
|
|
|
+ end-placeholder="上课结束时间"
|
|
|
+ placeholder="选择时间范围"
|
|
|
+ value-format="HH:mm:ss"
|
|
|
+ format="HH:mm"
|
|
|
+ @change="changeCourseTime"
|
|
|
+ >
|
|
|
+ </el-time-picker>
|
|
|
+ </el-form-item>
|
|
|
|
|
|
<el-form-item>
|
|
|
<el-button
|
|
@@ -347,11 +352,7 @@
|
|
|
</div>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
- <el-table-column
|
|
|
- align="center"
|
|
|
- prop="isCallNames"
|
|
|
- label="云教练课程"
|
|
|
- >
|
|
|
+ <el-table-column align="center" prop="isCallNames" label="云教练课程">
|
|
|
<template slot-scope="scope">{{
|
|
|
scope.row.memberFlag ? "是" : "否"
|
|
|
}}</template>
|
|
@@ -789,7 +790,7 @@
|
|
|
<el-option label="否" value="0"></el-option>
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
- <el-form-item label="云教练课程" prop="memberFlag">
|
|
|
+ <el-form-item label="云教练课程" prop="memberFlag">
|
|
|
<el-select
|
|
|
style="width: 180px"
|
|
|
v-model.trim="searchForm.memberFlag"
|
|
@@ -883,10 +884,11 @@ const initSearch = {
|
|
|
schoolId: null, // 教学点编号
|
|
|
creatTimer: [],
|
|
|
courseIdSearch: null,
|
|
|
- memberFlag:null
|
|
|
+ memberFlag: null,
|
|
|
+ courseTime: ['00:00:00','23:59:59'],
|
|
|
};
|
|
|
export default {
|
|
|
- name:'teamCourseList',
|
|
|
+ name: "teamCourseList",
|
|
|
data() {
|
|
|
return {
|
|
|
classVisible: false,
|
|
@@ -949,19 +951,18 @@ export default {
|
|
|
this.searchForm.organIdList ||
|
|
|
this.searchForm.groupType ||
|
|
|
this.searchForm.teachMode ||
|
|
|
- this.searchForm.mergeCourseType||
|
|
|
- this.searchForm.teachType||
|
|
|
- this.searchForm.isCallNames||
|
|
|
- this.searchForm.memberFlag||
|
|
|
- this.searchForm.creatTimer?.length>0
|
|
|
+ this.searchForm.mergeCourseType ||
|
|
|
+ this.searchForm.teachType ||
|
|
|
+ this.searchForm.isCallNames ||
|
|
|
+ this.searchForm.memberFlag ||
|
|
|
+ this.searchForm.creatTimer?.length > 0
|
|
|
);
|
|
|
},
|
|
|
},
|
|
|
mounted() {
|
|
|
- const { query ,params} = this.$route;
|
|
|
- if(params.courseIdSearch){
|
|
|
-
|
|
|
- this.searchForm.courseIdSearch = params.courseIdSearch
|
|
|
+ const { query, params } = this.$route;
|
|
|
+ if (params.courseIdSearch) {
|
|
|
+ this.searchForm.courseIdSearch = params.courseIdSearch;
|
|
|
}
|
|
|
if (query.start || query.end) {
|
|
|
this.searchForm.timer = [query.start, query.end];
|
|
@@ -993,6 +994,8 @@ export default {
|
|
|
if (query.organId) {
|
|
|
this.searchForm.organIdList = Number(query.organId);
|
|
|
}
|
|
|
+
|
|
|
+ console.log(this.searchForm)
|
|
|
this.$store.dispatch("setBranchs");
|
|
|
this.$store.dispatch("setTeachers");
|
|
|
this.$store.dispatch("setSchools");
|
|
@@ -1000,6 +1003,9 @@ export default {
|
|
|
this.init();
|
|
|
},
|
|
|
methods: {
|
|
|
+ changeCourseTime(val){
|
|
|
+ console.log(val)
|
|
|
+ },
|
|
|
init() {
|
|
|
this.getList();
|
|
|
},
|
|
@@ -1010,9 +1016,8 @@ export default {
|
|
|
} else {
|
|
|
this.searchForm.timer = [];
|
|
|
// this.reset()
|
|
|
- this.searchForm = {...initSearch}
|
|
|
+ this.searchForm = { ...initSearch };
|
|
|
}
|
|
|
-
|
|
|
},
|
|
|
permission(str, parent) {
|
|
|
return permission(str, parent);
|
|
@@ -1070,9 +1075,7 @@ export default {
|
|
|
search() {
|
|
|
this.rules.page = 1;
|
|
|
|
|
|
-
|
|
|
this.getList();
|
|
|
-
|
|
|
},
|
|
|
common(row) {
|
|
|
this.searchForm = {
|
|
@@ -1108,7 +1111,15 @@ export default {
|
|
|
// this.$message.error("请至少选择一个搜索条件");
|
|
|
// return false;
|
|
|
// }
|
|
|
- const { creatTimer, timer, ...rest } = searchForm;
|
|
|
+ if(searchForm.courseTime?.length>0){
|
|
|
+ searchForm.startClassTimeStr = searchForm.courseTime[0]
|
|
|
+ searchForm.endClassTimeStr = searchForm.courseTime[1]
|
|
|
+ }else{
|
|
|
+ searchForm.startClassTimeStr = null
|
|
|
+ searchForm.endClassTimeStr = null
|
|
|
+ }
|
|
|
+ const { creatTimer, timer,courseTime, ...rest } = searchForm;
|
|
|
+
|
|
|
return {
|
|
|
...rest,
|
|
|
page: this.rules.page,
|
|
@@ -1146,12 +1157,12 @@ export default {
|
|
|
load.startLoading();
|
|
|
axios(options)
|
|
|
.then((res) => {
|
|
|
- console.log(res)
|
|
|
- this.$message.success(res.data.data)
|
|
|
+ console.log(res);
|
|
|
+ this.$message.success(res.data.data);
|
|
|
// let blob = new Blob([res.data], {
|
|
|
- // type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;charset=utf-8'
|
|
|
- // type: "application/vnd.ms-excel;charset=utf-8",
|
|
|
- //word文档为application/msword,pdf文档为application/pdf,application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;charset=utf-8
|
|
|
+ // type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;charset=utf-8'
|
|
|
+ // type: "application/vnd.ms-excel;charset=utf-8",
|
|
|
+ //word文档为application/msword,pdf文档为application/pdf,application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;charset=utf-8
|
|
|
// });
|
|
|
// let text = new Response(blob).text();
|
|
|
// text.then((res) => {
|
|
@@ -1198,9 +1209,9 @@ export default {
|
|
|
});
|
|
|
this.isDetele = false;
|
|
|
});
|
|
|
- this.$refs.searchForm.save(this.searchForm);
|
|
|
- //
|
|
|
- // this.$router.push({ query: {} })
|
|
|
+ this.$refs.searchForm.save(this.searchForm);
|
|
|
+ //
|
|
|
+ // this.$router.push({ query: {} })
|
|
|
// let arr = this.$helpers.lodash.differenceWith( this.tableList, this.deleteList,'id')
|
|
|
}
|
|
|
});
|
|
@@ -1409,8 +1420,7 @@ export default {
|
|
|
this.activeName = null;
|
|
|
}
|
|
|
},
|
|
|
- 'searchForm.courseIdSearch'(val){
|
|
|
- }
|
|
|
+ "searchForm.courseIdSearch"(val) {},
|
|
|
},
|
|
|
};
|
|
|
</script>
|
|
@@ -1452,7 +1462,7 @@ export default {
|
|
|
color: red;
|
|
|
}
|
|
|
.green {
|
|
|
- color: #14928A;
|
|
|
+ color: #14928a;
|
|
|
}
|
|
|
|
|
|
.exportBtn {
|