|
|
@@ -95,6 +95,17 @@
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
<el-form-item>
|
|
|
+ <el-select v-model.trim="searchForm.mergeCourseType"
|
|
|
+ clearable
|
|
|
+ filterable
|
|
|
+ placeholder="合并课程类型">
|
|
|
+ <el-option v-for="(item, index) in mergeCourseTypeOptions"
|
|
|
+ :key="index"
|
|
|
+ :value="item.value"
|
|
|
+ :label="item.label"></el-option>
|
|
|
+ </el-select>
|
|
|
+ </el-form-item>
|
|
|
+ <el-form-item>
|
|
|
<el-select v-model.trim="searchForm.teachType"
|
|
|
clearable
|
|
|
filterable
|
|
|
@@ -212,7 +223,7 @@
|
|
|
<div>{{ scope.row.isComplaints==1?'是':'否'}}</div>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
-
|
|
|
+
|
|
|
<el-table-column align="center"
|
|
|
prop="isLock"
|
|
|
label="是否冻结">
|
|
|
@@ -409,7 +420,7 @@ import {
|
|
|
getEmployeeOrgan,
|
|
|
cleanAttendance
|
|
|
} from "@/api/buildTeam";
|
|
|
-import { workType } from '@/constant'
|
|
|
+import { workType, mergeCourseType } from '@/constant'
|
|
|
import { objectToOptions, getTimes } from '@/utils'
|
|
|
import { getTeacherPersonalAttendanceDetail } from "@/api/teacherManager";
|
|
|
import { getSchool } from "@/api/systemManage";
|
|
|
@@ -442,6 +453,7 @@ const initSearch = {
|
|
|
timer: [nowTime, nowTime], // 时间
|
|
|
class: null,
|
|
|
teachType: null,
|
|
|
+ mergeCourseType: null,
|
|
|
isCallNames: null, // 是否点名
|
|
|
search: null, // 乐团名称 编号 vip课名称
|
|
|
teacherIdList: null, // 老师编号
|
|
|
@@ -455,6 +467,7 @@ export default {
|
|
|
timerVisible: false,
|
|
|
courseVisible: false,
|
|
|
courseType: courseType,
|
|
|
+ mergeCourseType,
|
|
|
courseListType: courseListType,
|
|
|
searchForm: {...initSearch},
|
|
|
tableList: [],
|
|
|
@@ -493,6 +506,9 @@ export default {
|
|
|
computed: {
|
|
|
workTypeOptions() {
|
|
|
return objectToOptions(workType)
|
|
|
+ },
|
|
|
+ mergeCourseTypeOptions() {
|
|
|
+ return objectToOptions(mergeCourseType)
|
|
|
}
|
|
|
},
|
|
|
mounted () {
|
wolyshaw