|
|
@@ -62,17 +62,6 @@
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
<el-form-item>
|
|
|
- <el-select v-model.trim="searchForm.mergeType"
|
|
|
- clearable
|
|
|
- filterable
|
|
|
- placeholder="合并类型">
|
|
|
- <el-option v-for="(item, index) in mergeTypeOpions"
|
|
|
- :key="index"
|
|
|
- :value="item.value"
|
|
|
- :label="item.label"></el-option>
|
|
|
- </el-select>
|
|
|
- </el-form-item>
|
|
|
- <el-form-item>
|
|
|
<el-select v-model.trim="searchForm.courseType"
|
|
|
clearable
|
|
|
filterable
|
|
|
@@ -446,7 +435,7 @@ import {
|
|
|
getEmployeeOrgan,
|
|
|
cleanAttendance
|
|
|
} from "@/api/buildTeam";
|
|
|
-import { workType, mergeCourseType, mergeType } from '@/constant'
|
|
|
+import { workType, mergeCourseType } from '@/constant'
|
|
|
import { objectToOptions, getTimes } from '@/utils'
|
|
|
import { getTeacherPersonalAttendanceDetail } from "@/api/teacherManager";
|
|
|
import { getSchool } from "@/api/systemManage";
|
|
|
@@ -494,8 +483,6 @@ export default {
|
|
|
courseVisible: false,
|
|
|
courseType: courseType,
|
|
|
mergeCourseType,
|
|
|
- mergeType,
|
|
|
- mergeTypeOpions: objectToOptions(mergeType),
|
|
|
courseListType: courseListType,
|
|
|
searchForm: {...initSearch},
|
|
|
tableList: [],
|
