|
@@ -195,25 +195,24 @@
|
|
|
</el-form-item> -->
|
|
|
|
|
|
<el-form-item>
|
|
|
- <el-button
|
|
|
- type="primary"
|
|
|
- icon="el-icon-circle-plus-outline"
|
|
|
- @click="showMove = true"
|
|
|
- >更多选项</el-button
|
|
|
- >
|
|
|
+ <el-button
|
|
|
+ :type="isSearch ? 'primary' : 'info'"
|
|
|
+ icon="el-icon-circle-plus-outline"
|
|
|
+ @click="showMove = true"
|
|
|
+ >更多选项</el-button
|
|
|
+ >
|
|
|
</el-form-item>
|
|
|
<el-form-item>
|
|
|
- <el-button native-type="submit" type="primary">搜索</el-button>
|
|
|
- <el-button native-type="reset" type="danger">重置</el-button>
|
|
|
+ <el-button native-type="submit" type="primary">搜索</el-button>
|
|
|
+ <el-button native-type="reset" type="danger">重置</el-button>
|
|
|
|
|
|
- <el-button
|
|
|
- v-permission="'export/superFindCourseSchedules'"
|
|
|
- @click="onCourseExport"
|
|
|
- type="primary"
|
|
|
- >导出课表</el-button
|
|
|
- >
|
|
|
+ <el-button
|
|
|
+ v-permission="'export/superFindCourseSchedules'"
|
|
|
+ @click="onCourseExport"
|
|
|
+ type="primary"
|
|
|
+ >导出课表</el-button
|
|
|
+ >
|
|
|
</el-form-item>
|
|
|
-
|
|
|
</save-form>
|
|
|
<!-- 列表 -->
|
|
|
<div class="tableWrap">
|
|
@@ -588,6 +587,7 @@
|
|
|
:courseScheduleId="maskForm.id"
|
|
|
:teachMode="maskForm.teachMode"
|
|
|
:courseStatus="maskForm.status"
|
|
|
+ @syncTeacherAttend="syncTeacherAttend"
|
|
|
></teacherList>
|
|
|
</div>
|
|
|
</el-tab-pane>
|
|
@@ -656,7 +656,7 @@
|
|
|
>
|
|
|
<el-form-item label="课程组编号/名称" prop="search">
|
|
|
<el-input
|
|
|
- style="width:180px"
|
|
|
+ style="width: 180px"
|
|
|
v-model.trim="searchForm.search"
|
|
|
clearable
|
|
|
placeholder="课程组编号/课程名称"
|
|
@@ -664,7 +664,7 @@
|
|
|
</el-form-item>
|
|
|
<el-form-item label="教学点" prop="schoolId">
|
|
|
<el-select
|
|
|
- style="width:180px"
|
|
|
+ style="width: 180px"
|
|
|
v-model.trim="searchForm.schoolId"
|
|
|
clearable
|
|
|
filterable
|
|
@@ -680,7 +680,7 @@
|
|
|
</el-form-item>
|
|
|
<el-form-item label="分部" prop="organIdList">
|
|
|
<el-select
|
|
|
- style="width:180px"
|
|
|
+ style="width: 180px"
|
|
|
class="multiple"
|
|
|
v-model.trim="searchForm.organIdList"
|
|
|
filterable
|
|
@@ -697,7 +697,7 @@
|
|
|
</el-form-item>
|
|
|
<el-form-item label="课程组类型" prop="groupType">
|
|
|
<el-select
|
|
|
- style="width:180px"
|
|
|
+ style="width: 180px"
|
|
|
v-model.trim="searchForm.groupType"
|
|
|
clearable
|
|
|
filterable
|
|
@@ -713,7 +713,7 @@
|
|
|
</el-form-item>
|
|
|
<el-form-item label="教学模式" prop="teachMode">
|
|
|
<el-select
|
|
|
- style="width:180px"
|
|
|
+ style="width: 180px"
|
|
|
v-model.trim="searchForm.teachMode"
|
|
|
clearable
|
|
|
filterable
|
|
@@ -738,7 +738,7 @@
|
|
|
</el-form-item> -->
|
|
|
<el-form-item label="合并课类型" prop="mergeCourseType">
|
|
|
<el-select
|
|
|
- style="width:180px"
|
|
|
+ style="width: 180px"
|
|
|
v-model.trim="searchForm.mergeCourseType"
|
|
|
clearable
|
|
|
filterable
|
|
@@ -754,7 +754,7 @@
|
|
|
</el-form-item>
|
|
|
<el-form-item label="老师类型" prop="teachType">
|
|
|
<el-select
|
|
|
- style="width:180px"
|
|
|
+ style="width: 180px"
|
|
|
v-model.trim="searchForm.teachType"
|
|
|
clearable
|
|
|
filterable
|
|
@@ -770,7 +770,7 @@
|
|
|
</el-form-item>
|
|
|
<el-form-item label="是否点名" prop="isCallNames">
|
|
|
<el-select
|
|
|
- style="width:180px"
|
|
|
+ style="width: 180px"
|
|
|
v-model.trim="searchForm.isCallNames"
|
|
|
clearable
|
|
|
filterable
|
|
@@ -919,6 +919,19 @@ export default {
|
|
|
mergeCourseTypeOptions() {
|
|
|
return objectToOptions(mergeCourseType);
|
|
|
},
|
|
|
+ isSearch() {
|
|
|
+ return (
|
|
|
+ this.searchForm.search ||
|
|
|
+ this.searchForm.schoolId ||
|
|
|
+ this.searchForm.organIdList ||
|
|
|
+ this.searchForm.groupType ||
|
|
|
+ this.searchForm.teachMode ||
|
|
|
+ this.searchForm.mergeCourseType||
|
|
|
+ this.searchForm.teachType||
|
|
|
+ this.searchForm.isCallNames||
|
|
|
+ this.searchForm.creatTimer?.length>0
|
|
|
+ );
|
|
|
+ },
|
|
|
},
|
|
|
mounted() {
|
|
|
const { query } = this.$route;
|
|
@@ -1172,6 +1185,19 @@ export default {
|
|
|
}
|
|
|
);
|
|
|
},
|
|
|
+ syncTeacherAttend() {
|
|
|
+ if (this.maskForm.id) {
|
|
|
+ getTeacherPersonalAttendanceDetail({
|
|
|
+ courseScheduleId: this.maskForm.id,
|
|
|
+ }).then((res) => {
|
|
|
+ if (res.code == 200) {
|
|
|
+ this.maskForm = { ...this.maskForm, ...res.data };
|
|
|
+ this.isMainGo = this.$refs.filterSearch?.show;
|
|
|
+ }
|
|
|
+ });
|
|
|
+ }
|
|
|
+ },
|
|
|
+
|
|
|
handleClick(tab, event) {
|
|
|
// console.log(tab, event);
|
|
|
},
|
|
@@ -1201,13 +1227,13 @@ export default {
|
|
|
})
|
|
|
.catch(() => {});
|
|
|
},
|
|
|
- cancleMore(){
|
|
|
+ cancleMore() {
|
|
|
// this.$refs.searchForm2.resetFields()
|
|
|
- this.showMove = false
|
|
|
+ this.showMove = false;
|
|
|
},
|
|
|
- okMore(){
|
|
|
- this.getList()
|
|
|
- this.showMove = false
|
|
|
+ okMore() {
|
|
|
+ this.getList();
|
|
|
+ this.showMove = false;
|
|
|
},
|
|
|
// addCompound(row) {
|
|
|
// this.compoundList.push(row);
|