Merge branch 'iteration_0802' into test

src/views/teacherManager/teacherList.vue

@@ -141,6 +141,11 @@
         <el-form-item>
           <el-button native-type="submit" type="danger">搜索</el-button>
           <el-button native-type="reset" type="primary">重置</el-button>
+          <el-button
+            type="primary"
+            v-permission="'export/teacherList'"
+            @click="downLoadTeacher"
+            >导出</el-button>
         </el-form-item>
       </save-form>
       <!-- 列表 -->
@@ -367,6 +372,8 @@ import { teacherQueryPage } from "@/api/teacherManager";
 import { employeeOperate } from "@/api/systemManage";
 // import { subjectListTree } from "@/api/specialSetting";
 import { resetPassword2 } from "@/api/buildTeam";
+import { Export } from "@/utils/downLoadFile";
+import cleanDeep from 'clean-deep'
 import { jobNature, teacherStatus, ProbationPeriodList } from "@/utils/searchArray";
 import store from "@/store";
 export default {
@@ -454,6 +461,31 @@ export default {
         }
       );
     },
+    downLoadTeacher() {
+      let params = this.searchForm;
+      params.lockFlag ? params.lockFlag : (params.lockFlag = null);
+      params.isProbationPeriod
+        ? params.isProbationPeriod
+        : (params.isProbationPeriod = null);
+      params.jobNature ? params.jobNature : (params.jobNature = null);
+      // params.subjectId?params.subjectId:params.subjectId = null
+      params.subjectId ? params.subjectId : (params.subjectId = null);
+      params.search ? params.search : (params.search = null);
+      params.isSupportExtraPracticeLesson
+        ? params.isSupportExtraPracticeLesson
+        : (params.isSupportExtraPracticeLesson = null);
+      Export(
+        this,
+        {
+          url: "/api-web/export/teacherList",
+          fileName:`老师列表导出.xls`,
+          params:cleanDeep( {
+            ...params
+          }),
+        },
+        "是否确认导出老师列表？"
+      );
+    },
     getList() {
       let params = this.searchForm;
       // params.organId = this.organId