浏览代码

Merge branch 'iteration_201218' of http://git.dayaedu.com/molingzhide/dy-admin-manager into iteration_201218

lex-xin 4 年之前
父节点
当前提交
aa94ce2b0e
共有 1 个文件被更改,包括 1 次插入14 次删除
  1. 1 14
      src/views/teamDetail/teamCourseList.vue

+ 1 - 14
src/views/teamDetail/teamCourseList.vue

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