06/05 10:50

11

src/api/buildTeam.js

@@ -1241,4 +1241,13 @@ export function resetMusicGroupStudentFee (data) {
     method: 'post',
     data: qs.stringify(data)
   })
+}
+
+// 离职修改网管课
+export function batchPracticeGroupTeacherAdjust (data) {
+  return request({
+    url: api + '/courseSchedule/batchPracticeGroupTeacherAdjust',
+    method: 'post',
+    data: qs.stringify(data)
+  })
 }

src/utils/vueFilter.js

@@ -528,4 +528,14 @@ Vue.filter('complaintsStatusEnum', value => {
     3: "已撤销",
   }
   return template[value]
+})
+
+//  人事状态 isProbationPeriod
+Vue.filter('isProbationPeriod', value => {
+  let template = {
+    0: "正式",
+    1: "试用",
+    2: "离职",
+  }
+  return template[value]
 })

src/views/teacherManager/teacherDetail/components/courseInfo.vue

@@ -78,6 +78,7 @@
           <template slot-scope="scope">
             <div>
               <el-button type="text"
+                         v-if="scope.row.hasRestClass>0"
                          v-permission="'courseSchedule/classGroupTeacherAdjust'"
                          @click="resetCourse(scope.row)">操作</el-button>
             </div>

src/views/teacherManager/teacherDetail/components/teacherNetwork.vue

@@ -68,6 +68,7 @@
             <template slot-scope="scope">
               <div>
                 <el-button type="text"
+                           v-if="scope.row.hasRestClass>0"
                            v-permission="'courseSchedule/practiceGroupTeacherAdjust'"
                            @click="resetCourse(scope.row)">操作</el-button>
               </div>
@@ -87,9 +88,9 @@
       <el-form :model="maskForm"
                ref="maskForm">
         <el-form-item label="选择老师"
-                      prop="educationalTeacherId"
+                      prop="teacherId"
                       :rules="[{ required: true, message: '请选择老师',trigger: 'blur'}]">
-          <el-select v-model="maskForm.educationalTeacherId"
+          <el-select v-model="maskForm.teacherId"
                      clearable
                      filterable>
             <el-option v-for="(item,index) in teacherList"
@@ -119,7 +120,7 @@
 <script>
 import pagination from "@/components/Pagination/index";
 import load from "@/utils/loading";
-import { practiceGroupManage, getTeacher, practiceGroupTeacherAdjust } from "@/api/buildTeam";
+import { practiceGroupManage, getTeacher, batchPracticeGroupTeacherAdjust } from "@/api/buildTeam";
 export default {
   components: { pagination },
   data () {
@@ -134,7 +135,7 @@ export default {
       teacherList: [],
       chioseList: [],
       maskForm: {
-        educationalTeacherId: null,
+        teacherId: null,
         memo: null
       },
       rules: {
@@ -210,10 +211,10 @@ export default {
             // 单词调整
             obj.practiceGroupId = this.activeRow.id
           }
-          obj.educationalTeacherId = this.maskForm.educationalTeacherId;
-          obj.teacherId = this.teacherId;
+          obj.teacherId = this.maskForm.teacherId;
+          obj.oldTeacherId = this.teacherId;
           // obj.memo = this.maskForm.memo;
-          practiceGroupTeacherAdjust(obj).then(res => {
+          batchPracticeGroupTeacherAdjust(obj).then(res => {
             if (res.code == 200) {
               this.maskVisible = false;
               this.$message.success('修改成功')
@@ -227,7 +228,7 @@ export default {
   watch: {
     maskVisible (val) {
       if (!val) {
-        this.maskForm.educationalTeacherId = null;
+        this.maskForm.teacherId = null;
         this.maskForm.memo = null
       }
     }

src/views/teacherManager/teacherList.vue

@@ -4,91 +4,108 @@
       <div class="squrt"></div>老师列表
     </h2>
     <div class="m-core">
-      <div class="newBand" v-permission="'/teacherOperationAdd'" @click="onTeacher('create')">老师新增</div>
+      <div class="newBand"
+           v-permission="'/teacherOperationAdd'"
+           @click="onTeacher('create')">老师新增</div>
       <!-- 搜索标题 -->
-      <el-form :inline="true" class="searchForm" v-model.trim="searchForm">
+      <el-form :inline="true"
+               class="searchForm"
+               v-model.trim="searchForm">
         <el-form-item>
-          <el-input
-            v-model.trim="searchForm.search"
-            @keyup.enter.native="getList"
-            placeholder="老师姓名或电话"
-          ></el-input>
+          <el-input v-model.trim="searchForm.search"
+                    @keyup.enter.native="getList"
+                    placeholder="老师姓名或电话"></el-input>
         </el-form-item>
         <el-form-item>
-          <el-select v-model.trim="searchForm.lockFlag" clearable filterable placeholder="老师状态">
-            <el-option
-              v-for="item in teacherStatus"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"
-            ></el-option>
+          <el-select v-model.trim="searchForm.lockFlag"
+                     clearable
+                     filterable
+                     placeholder="老师状态">
+            <el-option v-for="item in teacherStatus"
+                       :key="item.value"
+                       :label="item.label"
+                       :value="item.value"></el-option>
           </el-select>
         </el-form-item>
         <el-form-item>
-          <el-select v-model.trim="searchForm.subjectId" filterable clearable placeholder="专业技能">
-            <el-option-group v-for="group in subjectList" :key="group.label" :label="group.label">
-              <el-option
-                v-for="item in group.options"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-              ></el-option>
+          <el-select v-model.trim="searchForm.subjectId"
+                     filterable
+                     clearable
+                     placeholder="专业技能">
+            <el-option-group v-for="group in subjectList"
+                             :key="group.label"
+                             :label="group.label">
+              <el-option v-for="item in group.options"
+                         :key="item.value"
+                         :label="item.label"
+                         :value="item.value"></el-option>
             </el-option-group>
           </el-select>
         </el-form-item>
         <el-form-item>
-          <el-select v-model.trim="searchForm.organId" filterable clearable placeholder="请选择分部">
-            <el-option
-              v-for="item in branchList"
-              :key="item.id"
-              :label="item.label"
-              :value="item.value"
-            ></el-option>
+          <el-select v-model.trim="searchForm.organId"
+                     filterable
+                     clearable
+                     placeholder="请选择分部">
+            <el-option v-for="item in branchList"
+                       :key="item.id"
+                       :label="item.label"
+                       :value="item.value"></el-option>
           </el-select>
         </el-form-item>
         <el-form-item>
-          <el-select v-model.trim="searchForm.jobNature" filterable clearable placeholder="工作类型">
-            <el-option
-              v-for="item in jobNature"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"
-            ></el-option>
+          <el-select v-model.trim="searchForm.jobNature"
+                     filterable
+                     clearable
+                     placeholder="工作类型">
+            <el-option v-for="item in jobNature"
+                       :key="item.value"
+                       :label="item.label"
+                       :value="item.value"></el-option>
           </el-select>
         </el-form-item>
         <el-form-item>
-          <el-select
-            v-model.trim="searchForm.isProbationPeriod"
-            clearable
-            filterable
-            placeholder="人事状态"
-          >
-            <el-option label="试用" value="0"></el-option>
-            <el-option label="正式" value="1"></el-option>
+          <el-select v-model.trim="searchForm.isProbationPeriod"
+                     clearable
+                     filterable
+                     placeholder="人事状态">
+            <el-option label="试用"
+                       value="0"></el-option>
+            <el-option label="正式"
+                       value="1"></el-option>
+            <el-option label="离职"
+                       value="2"></el-option>
           </el-select>
         </el-form-item>
         <!-- isSupportExtraPracticeLesson -->
         <el-form-item>
-          <el-select
-            v-model.trim="searchForm.isSupportExtraPracticeLesson"
-            clearable
-            filterable
-            placeholder="开放陪练"
-          >
-            <el-option label="是" value="true"></el-option>
-            <el-option label="否" value="false"></el-option>
+          <el-select v-model.trim="searchForm.isSupportExtraPracticeLesson"
+                     clearable
+                     filterable
+                     placeholder="开放陪练">
+            <el-option label="是"
+                       value="true"></el-option>
+            <el-option label="否"
+                       value="false"></el-option>
           </el-select>
         </el-form-item>
         <el-form-item>
-          <el-button @click="search" type="danger">搜索</el-button>
-          <el-button @click="onReSet" type="primary">重置</el-button>
+          <el-button @click="search"
+                     type="danger">搜索</el-button>
+          <el-button @click="onReSet"
+                     type="primary">重置</el-button>
         </el-form-item>
       </el-form>
       <!-- 列表 -->
       <div class="tableWrap">
-        <el-table :data="tableList" :header-cell-style="{background:'#EDEEF0',color:'#444'}">
-          <el-table-column align="center" prop="id" label="老师编号"></el-table-column>
-          <el-table-column align="center" prop="realName" label="老师名称">
+        <el-table :data="tableList"
+                  :header-cell-style="{background:'#EDEEF0',color:'#444'}">
+          <el-table-column align="center"
+                           prop="id"
+                           label="老师编号"></el-table-column>
+          <el-table-column align="center"
+                           prop="realName"
+                           label="老师名称">
             <template slot-scope="scope">
               <div>
                 <p>{{scope.row.realName}}</p>
@@ -96,121 +113,118 @@
               </div>
             </template>
           </el-table-column>
-          <el-table-column align="center" prop="organName" label="所属分部"></el-table-column>
-          <el-table-column align="center" label="老师状态">
+          <el-table-column align="center"
+                           prop="organName"
+                           label="所属分部"></el-table-column>
+          <el-table-column align="center"
+                           label="老师状态">
             <template slot-scope="scope">{{ scope.row.lockFlag | teacherStatus }}</template>
           </el-table-column>
-          <el-table-column align="center" label="专业技能">
+          <el-table-column align="center"
+                           label="专业技能">
             <template slot-scope="scope">
-              <span
-                style="max-height: 68px;display: block;"
-                :title="scope.row.splitSubjectName"
-              >{{ scope.row.splitSubjectName }}</span>
+              <span style="max-height: 68px;display: block;"
+                    :title="scope.row.splitSubjectName">{{ scope.row.splitSubjectName }}</span>
             </template>
           </el-table-column>
-          <el-table-column align="center" prop="phone" label="联系电话"></el-table-column>
-          <el-table-column align="center" label="工作类型">
+          <el-table-column align="center"
+                           prop="phone"
+                           label="联系电话"></el-table-column>
+          <el-table-column align="center"
+                           label="工作类型">
             <template slot-scope="scope">{{ scope.row.jobNature | jobNature }}</template>
           </el-table-column>
-          <el-table-column align="center" label="人事状态">
-            <template slot-scope="scope">{{ scope.row.isProbationPeriod ? '正式' : '试用' }}</template>
+          <el-table-column align="center"
+                           label="人事状态">
+            <template slot-scope="scope">{{ scope.row.isProbationPeriod | isProbationPeriod }} </template>
           </el-table-column>
-          <el-table-column align="center" prop="vipNum" label="已开小课"></el-table-column>
-          <el-table-column align="center" label="试听课安排">
+          <el-table-column align="center"
+                           prop="vipNum"
+                           label="已开小课"></el-table-column>
+          <el-table-column align="center"
+                           label="试听课安排">
             <template slot-scope="scope">{{ scope.row.demoNum > 0 ? '是' : '否' }}</template>
           </el-table-column>
-          <el-table-column align="center" label="开放网管课">
+          <el-table-column align="center"
+                           label="开放网管课">
             <template slot-scope="scope">{{ scope.row.isSupportExtraPracticeLesson ? '是' : '否' }}</template>
           </el-table-column>
 
-          <el-table-column align="center" label="运营指标">
-              <template slot-scope="scope">
-            <el-button
-              type="text"
-              @click="gotoOperating(scope.row)"
-            >{{ scope.row.operatingIndex +'%' }}</el-button>
+          <el-table-column align="center"
+                           label="运营指标">
+            <template slot-scope="scope">
+              <el-button type="text"
+                         @click="gotoOperating(scope.row)">{{ scope.row.operatingIndex +'%' }}</el-button>
             </template>
           </el-table-column>
-          <el-table-column align="center" label="服务指标">
+          <el-table-column align="center"
+                           label="服务指标">
             <template slot-scope="scope">
-              <el-button
-                type="text"
-                @click="gotoAfterSchool(scope.row)"
-              >{{ scope.row.serviceIndex +'%' }}</el-button>
+              <el-button type="text"
+                         @click="gotoAfterSchool(scope.row)">{{ scope.row.serviceIndex +'%' }}</el-button>
             </template>
           </el-table-column>
-          <el-table-column align="center" fixed="right" width="200" label="操作">
+          <el-table-column align="center"
+                           fixed="right"
+                           width="200"
+                           label="操作">
             <template slot-scope="scope">
               <!--   let search = JSON.stringify(this.searchForm)
               let rules = JSON.stringify(this.pageInfo)-->
-              <router-link
-                style="color:#409EFF"
-                v-permission="'/teacherDetail'"
-                :to="{path:`/business/teacherDetail?teacherId=${scope.row.id}&teacherName=${scope.row.realName}`,query:{search:JSON.stringify(searchForm),rules:JSON.stringify(pageInfo)}}"
-              >查看</router-link>
-              <el-button
-                v-permission="'/teacherIperationUpdate'"
-                @click="onTeacher('update', scope.row)"
-                type="text"
-              >修改</el-button>
-              <el-button
-                v-permission="'employee/employeeOperate'"
-                @click="onStaffOperation('LOCK_UNLOCK', scope.row)"
-                type="text"
-              >{{ scope.row.lockFlag == 1 ? '解冻' : '冻结' }}</el-button>
+              <router-link style="color:#409EFF"
+                           v-permission="'/teacherDetail'"
+                           :to="{path:`/business/teacherDetail?teacherId=${scope.row.id}&teacherName=${scope.row.realName}`,query:{search:JSON.stringify(searchForm),rules:JSON.stringify(pageInfo)}}">查看</router-link>
+              <el-button v-permission="'/teacherIperationUpdate'"
+                         @click="onTeacher('update', scope.row)"
+                         type="text">修改</el-button>
+              <el-button v-permission="'employee/employeeOperate'"
+                         @click="onStaffOperation('LOCK_UNLOCK', scope.row)"
+                         type="text">{{ scope.row.lockFlag == 1 ? '解冻' : '冻结' }}</el-button>
               <!--  -->
-              <el-button
-                v-permission="'api-auth/user/updatePassword2'"
-                @click="resetPassWrod(scope.row)"
-                type="text"
-              >修改密码</el-button>
+              <el-button v-permission="'api-auth/user/updatePassword2'"
+                         @click="resetPassWrod(scope.row)"
+                         type="text">修改密码</el-button>
             </template>
           </el-table-column>
         </el-table>
-        <pagination
-          :total="pageInfo.total"
-          :page.sync="pageInfo.page"
-          :limit.sync="pageInfo.limit"
-          :page-sizes="pageInfo.page_size"
-          @pagination="getList"
-        />
+        <pagination :total="pageInfo.total"
+                    :page.sync="pageInfo.page"
+                    :limit.sync="pageInfo.limit"
+                    :page-sizes="pageInfo.page_size"
+                    @pagination="getList" />
       </div>
     </div>
-    <el-dialog
-      title="修改密码"
-      :visible.sync="passwrodVisiable"
-      :before-close="closePassWord"
-      width="400px"
-    >
-      <el-form :model="passwrodForm" ref="passwrodForm" :inline="true">
-        <el-form-item
-          label="手机号"
-          prop="phone"
-          label-width="80px"
-          :rules="[{ required: true, message: '手机号不能为空',trigger: 'blur'},{pattern: /^1[3456789]\d{9}$/, message: '请输入正确的手机号',trigger: 'blur' }]"
-        >
+    <el-dialog title="修改密码"
+               :visible.sync="passwrodVisiable"
+               :before-close="closePassWord"
+               width="400px">
+      <el-form :model="passwrodForm"
+               ref="passwrodForm"
+               :inline="true">
+        <el-form-item label="手机号"
+                      prop="phone"
+                      label-width="80px"
+                      :rules="[{ required: true, message: '手机号不能为空',trigger: 'blur'},{pattern: /^1[3456789]\d{9}$/, message: '请输入正确的手机号',trigger: 'blur' }]">
           <el-input v-model.trim="passwrodForm.phone"></el-input>
         </el-form-item>
-        <el-form-item
-          label="输入密码"
-          prop="password"
-          label-width="80px"
-          :rules="[{ required: true, message: '密码不能为空',trigger: 'blur'},{pattern:/^[\w]{6,20}$/,message:'密码为6-20位',trigger: 'blur'}]"
-        >
+        <el-form-item label="输入密码"
+                      prop="password"
+                      label-width="80px"
+                      :rules="[{ required: true, message: '密码不能为空',trigger: 'blur'},{pattern:/^[\w]{6,20}$/,message:'密码为6-20位',trigger: 'blur'}]">
           <el-input v-model.trim="passwrodForm.password"></el-input>
         </el-form-item>
-        <el-form-item
-          label="再次输入"
-          prop="password2"
-          label-width="80px"
-          :rules="[{ required: true, message: '密码不能为空',trigger: 'blur'},{pattern:/^[\w]{6,20}$/,message:'密码为6-20位',trigger: 'blur'}]"
-        >
+        <el-form-item label="再次输入"
+                      prop="password2"
+                      label-width="80px"
+                      :rules="[{ required: true, message: '密码不能为空',trigger: 'blur'},{pattern:/^[\w]{6,20}$/,message:'密码为6-20位',trigger: 'blur'}]">
           <el-input v-model.trim="passwrodForm.password2"></el-input>
         </el-form-item>
       </el-form>
-      <span slot="footer" class="dialog-footer">
+      <span slot="footer"
+            class="dialog-footer">
         <el-button @click="passwrodVisiable = false">取 消</el-button>
-        <el-button type="primary" @click="submitResetPassWord">确 定</el-button>
+        <el-button type="primary"
+                   @click="submitResetPassWord">确 定</el-button>
       </span>
     </el-dialog>
   </div>
@@ -228,7 +242,7 @@ export default {
   components: {
     pagination
   },
-  data() {
+  data () {
     return {
       searchForm: {
         lockFlag: null,
@@ -261,20 +275,20 @@ export default {
       activatedRow: null
     };
   },
-  activated() {
+  activated () {
     this.__init();
     this.getList();
   },
-  mounted() {
+  mounted () {
     this.__init();
     this.getList();
   },
   methods: {
-    search() {
+    search () {
       this.pageInfo.page = 1;
       this.getList();
     },
-    __init() {
+    __init () {
       if (this.$route.query.search) {
         this.$route.query.search instanceof Object
           ? (this.searchForm = this.$route.query.search)
@@ -323,7 +337,7 @@ export default {
       });
       // this.getList();
     },
-    onTeacher(type, row) {
+    onTeacher (type, row) {
       let search = JSON.stringify(this.searchForm);
       let rules = JSON.stringify(this.pageInfo);
       let params = {
@@ -343,7 +357,7 @@ export default {
         query: params
       });
     },
-    getList() {
+    getList () {
       let params = this.searchForm;
       // params.organId = this.organId
       // searchForm: {
@@ -376,7 +390,7 @@ export default {
         }
       });
     },
-    onStaffOperation(type, data) {
+    onStaffOperation (type, data) {
       let str = "";
       if (data.lockFlag != 1) {
         str = `是否冻结${data.realName}老师？`;
@@ -402,9 +416,9 @@ export default {
             }
           });
         })
-        .catch(() => {});
+        .catch(() => { });
     },
-    onReSet() {
+    onReSet () {
       this.searchForm = {
         lockFlag: null,
         isProbationPeriod: null,
@@ -414,12 +428,12 @@ export default {
         search: null
       };
     },
-    resetPassWrod(row) {
+    resetPassWrod (row) {
       this.activatedRow = row;
       this.passwrodForm.phone = row.phone;
       this.passwrodVisiable = true;
     },
-    closePassWord() {
+    closePassWord () {
       this.activatedRow = null;
       this.passwrodForm = {
         phone: "",
@@ -429,7 +443,7 @@ export default {
       this.$refs["passwrodForm"].resetFields();
       this.passwrodVisiable = false;
     },
-    submitResetPassWord() {
+    submitResetPassWord () {
       if (this.passwrodForm.password !== this.passwrodForm.password2) {
         this.$message.error("两次密码必须相同");
         return;
@@ -451,17 +465,17 @@ export default {
         }
       });
     },
-    gotoAfterSchool(row) {
+    gotoAfterSchool (row) {
       // 需要的参数 id
       this.$router.push({
         path: "/operateManager/serverIndexList",
-        query: { teacherId: row.id, activeIndex: "2" } 
+        query: { teacherId: row.id, activeIndex: "2" }
       });
     },
-    gotoOperating(row) {
-        this.$router.push({
+    gotoOperating (row) {
+      this.$router.push({
         path: "/operateManager/operateStudent",
-        query: { teacherId: row.id,operatingTag:'1' }
+        query: { teacherId: row.id, operatingTag: '1' }
       });
     }
   }

src/views/teacherManager/teacherOperation/components/teacherOperation.vue

@@ -6,146 +6,166 @@
     <div class="infoWrap">
       <div class="left">
         <h4>基本信息</h4>
-        <el-form :model="topForm" :rules="rules" ref="form">
+        <el-form :model="topForm"
+                 :rules="rules"
+                 ref="form">
           <el-row>
             <el-col :span="12">
-              <el-form-item label="姓名" prop="realName" :label-width="formLabelWidth">
+              <el-form-item label="姓名"
+                            prop="realName"
+                            :label-width="formLabelWidth">
                 <el-input v-model.trim="topForm.realName"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="12">
-              <el-form-item label="姓名(备注)" :label-width="formLabelWidth">
+              <el-form-item label="姓名(备注)"
+                            :label-width="formLabelWidth">
                 <el-input v-model.trim="topForm.memo"></el-input>
               </el-form-item>
             </el-col>
           </el-row>
           <el-row>
             <el-col :span="12">
-              <el-form-item label="性别" prop="gender" :label-width="formLabelWidth">
+              <el-form-item label="性别"
+                            prop="gender"
+                            :label-width="formLabelWidth">
                 <el-select v-model.trim="topForm.gender">
-                  <el-option label="男" :value="1"></el-option>
-                  <el-option label="女" :value="0"></el-option>
+                  <el-option label="男"
+                             :value="1"></el-option>
+                  <el-option label="女"
+                             :value="0"></el-option>
                 </el-select>
               </el-form-item>
             </el-col>
             <el-col :span="12">
-              <el-form-item label="出生日期" :label-width="formLabelWidth">
-                <el-date-picker
-                  v-model.trim="topForm.birthdate"
-                  type="date"
-                  value-format="yyyy-MM-dd"
-                  placeholder="出生日期"
-                ></el-date-picker>
+              <el-form-item label="出生日期"
+                            :label-width="formLabelWidth">
+                <el-date-picker v-model.trim="topForm.birthdate"
+                                type="date"
+                                value-format="yyyy-MM-dd"
+                                placeholder="出生日期"></el-date-picker>
               </el-form-item>
             </el-col>
           </el-row>
           <el-row>
             <el-col :span="12">
-              <el-form-item label="入职日期" prop="entryDate" :label-width="formLabelWidth">
-                <el-date-picker
-                  v-model.trim="topForm.entryDate"
-                  type="date"
-                  value-format="yyyy-MM-dd"
-                  placeholder="入职日期"
-                ></el-date-picker>
+              <el-form-item label="入职日期"
+                            prop="entryDate"
+                            :label-width="formLabelWidth">
+                <el-date-picker v-model.trim="topForm.entryDate"
+                                type="date"
+                                value-format="yyyy-MM-dd"
+                                placeholder="入职日期"></el-date-picker>
               </el-form-item>
             </el-col>
             <el-col :span="12">
-              <el-form-item label="工作类型" prop="jobNature" :label-width="formLabelWidth">
-                <el-select v-model.trim="topForm.jobNature" placeholder="工作类型" clearable filterable>
-                  <el-option
-                    v-for="item in jobNature"
-                    :key="item.value"
-                    :label="item.label"
-                    :value="item.value"
-                  ></el-option>
+              <el-form-item label="工作类型"
+                            prop="jobNature"
+                            :label-width="formLabelWidth">
+                <el-select v-model.trim="topForm.jobNature"
+                           placeholder="工作类型"
+                           clearable
+                           filterable>
+                  <el-option v-for="item in jobNature"
+                             :key="item.value"
+                             :label="item.label"
+                             :value="item.value"></el-option>
                 </el-select>
               </el-form-item>
             </el-col>
           </el-row>
           <el-row>
             <el-col :span="12">
-              <el-form-item label="所属分部" prop="organId" :label-width="formLabelWidth">
-                <el-select
-                  v-model.trim="topForm.organId"
-                  filterable
-                  clearable
-                  placeholder="所属分部"
-                  @change="switchOrgan"
-                >
-                  <el-option
-                    v-for="item in branchList"
-                    :key="item.value"
-                    :label="item.label"
-                    :value="item.value"
-                  ></el-option>
+              <el-form-item label="所属分部"
+                            prop="organId"
+                            :label-width="formLabelWidth">
+                <el-select v-model.trim="topForm.organId"
+                           filterable
+                           clearable
+                           placeholder="所属分部"
+                           @change="switchOrgan">
+                  <el-option v-for="item in branchList"
+                             :key="item.value"
+                             :label="item.label"
+                             :value="item.value"></el-option>
                 </el-select>
               </el-form-item>
             </el-col>
             <el-col :span="12">
-              <el-form-item label="流动范围" :label-width="formLabelWidth">
-                <el-select
-                  v-model.trim="topForm.flowOrganRange"
-                  filterable
-                  clearable
-                  multiple
-                  placeholder="流动范围"
-                >
-                  <el-option
-                    v-for="item in branchList"
-                    :key="item.value"
-                    :label="item.label"
-                    :value="item.value.toString()"
-                  ></el-option>
+              <el-form-item label="流动范围"
+                            :label-width="formLabelWidth">
+                <el-select v-model.trim="topForm.flowOrganRange"
+                           filterable
+                           clearable
+                           multiple
+                           placeholder="流动范围">
+                  <el-option v-for="item in branchList"
+                             :key="item.value"
+                             :label="item.label"
+                             :value="item.value.toString()"></el-option>
                 </el-select>
               </el-form-item>
             </el-col>
           </el-row>
           <el-row>
             <el-col :span="12">
-              <el-form-item label="人事状态" prop="isProbationPeriod" :label-width="formLabelWidth">
-                <el-select
-                  v-model.trim="topForm.isProbationPeriod"
-                  clearable
-                  filterable
-                  placeholder="人事状态"
-                >
-                  <el-option label="正式" :value="1"></el-option>
-                  <el-option label="临时" :value="0"></el-option>
+              <el-form-item label="人事状态"
+                            prop="isProbationPeriod"
+                            :label-width="formLabelWidth">
+                <el-select v-model.trim="topForm.isProbationPeriod"
+                           clearable
+                           filterable
+                           placeholder="人事状态">
+                  <el-option label="正式"
+                             :value="1"></el-option>
+                  <el-option label="临时"
+                             :value="0"></el-option>
+                  <el-option label="离职"
+                             :value="2"></el-option>
                 </el-select>
               </el-form-item>
             </el-col>
-            <el-col :span="12" v-if="pageType == 'update'">
-              <el-form-item label="教学点" :label-width="formLabelWidth">
-                <el-input disabled v-model.trim="teacherSchools"></el-input>
+            <el-col :span="12"
+                    v-if="pageType == 'update'">
+              <el-form-item label="教学点"
+                            :label-width="formLabelWidth">
+                <el-input disabled
+                          v-model.trim="teacherSchools"></el-input>
               </el-form-item>
             </el-col>
           </el-row>
           <el-row>
             <el-col :span="12">
-              <el-form-item label="老师简介" :label-width="formLabelWidth">
-                <el-input type="textarea" v-model.trim="topForm.introduction"></el-input>
+              <el-form-item label="老师简介"
+                            :label-width="formLabelWidth">
+                <el-input type="textarea"
+                          v-model.trim="topForm.introduction"></el-input>
               </el-form-item>
             </el-col>
-            <el-col :span="12" class="diSpan">
-              <el-tooltip placement="top" popper-class="mTooltip">
+            <el-col :span="12"
+                    class="diSpan">
+              <el-tooltip placement="top"
+                          popper-class="mTooltip">
                 <div slot="content">
                   「是」当前声部的学生都可以选择该老师；
                   <br />「否」只有该老师的VIP课，单技课，基础技能课的学生可以选择该老师；
                 </div>
                 <!-- <img :src="imageIcon" class="micon el-tooltip" style="width:8px height:8px" alt /> -->
-                <i class="el-icon-question micon el-tooltip" style="font-size: 18px; color: #F56C6C"></i>
+                <i class="el-icon-question micon el-tooltip"
+                   style="font-size: 18px; color: #F56C6C"></i>
               </el-tooltip>
 
-              <el-form-item label="开放陪练" label-width="90px" class="course">
-                <el-select
-                  v-model.trim="topForm.isSupportExtraPracticeLesson"
-                  clearable
-                  filterable
-                  placeholder="开放陪练"
-                >
-                  <el-option label="是" :value="true"></el-option>
-                  <el-option label="否" :value="false"></el-option>
+              <el-form-item label="开放陪练"
+                            label-width="90px"
+                            class="course">
+                <el-select v-model.trim="topForm.isSupportExtraPracticeLesson"
+                           clearable
+                           filterable
+                           placeholder="开放陪练">
+                  <el-option label="是"
+                             :value="true"></el-option>
+                  <el-option label="否"
+                             :value="false"></el-option>
                 </el-select>
               </el-form-item>
             </el-col>
@@ -154,74 +174,79 @@
           <el-row>
             <el-col :span="12">
               <!-- :rules="[{ required: true, message: '手机号不能为空',trigger: 'blur'},{pattern: /^1[3456789]\d{9}$/, message: '请输入正确的手机号',trigger: 'blur' }]" -->
-              <el-form-item
-                label="手机号"
-                prop="phone"
-                :label-width="formLabelWidth"
-              >
+              <el-form-item label="手机号"
+                            prop="phone"
+                            :label-width="formLabelWidth">
                 <el-input v-model.trim.number="topForm.phone"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="12">
-              <el-form-item label="毕业学校" :label-width="formLabelWidth">
+              <el-form-item label="毕业学校"
+                            :label-width="formLabelWidth">
                 <el-input v-model.trim="topForm.graduateSchool"></el-input>
               </el-form-item>
             </el-col>
           </el-row>
           <el-row>
             <el-col :span="12">
-              <el-form-item label="电子邮箱" :label-width="formLabelWidth">
+              <el-form-item label="电子邮箱"
+                            :label-width="formLabelWidth">
                 <el-input v-model.trim="topForm.email"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="12">
-              <el-form-item label="最高学历" :label-width="formLabelWidth">
+              <el-form-item label="最高学历"
+                            :label-width="formLabelWidth">
                 <!-- <el-input v-model.trim="topForm.educationBackground"></el-input> -->
-                <el-select
-                  v-model.trim="topForm.educationBackground"
-                  clearable
-                  filterable
-                  placeholder="最高学历"
-                >
-                  <el-option label="初中" value="初中"></el-option>
-                  <el-option label="高中" value="高中"></el-option>
-                  <el-option label="大专" value="大专"></el-option>
-                  <el-option label="本科" value="本科"></el-option>
-                  <el-option label="硕士" value="硕士"></el-option>
-                  <el-option label="博士" value="博士"></el-option>
+                <el-select v-model.trim="topForm.educationBackground"
+                           clearable
+                           filterable
+                           placeholder="最高学历">
+                  <el-option label="初中"
+                             value="初中"></el-option>
+                  <el-option label="高中"
+                             value="高中"></el-option>
+                  <el-option label="大专"
+                             value="大专"></el-option>
+                  <el-option label="本科"
+                             value="本科"></el-option>
+                  <el-option label="硕士"
+                             value="硕士"></el-option>
+                  <el-option label="博士"
+                             value="博士"></el-option>
                 </el-select>
               </el-form-item>
             </el-col>
           </el-row>
           <el-row>
             <el-col :span="12">
-              <el-form-item label="专业技能" :rules="[{required: true}]" :label-width="formLabelWidth">
-                <el-select
-                  :disabled="!topForm.organId"
-                  v-model="subjectIds"
-                  clearable
-                  placeholder="专业技能" 
-                  multiple
-                >
-                    <el-option
-                      v-for="item in subjectList"
-                      :key="item.id"
-                      :label="item.name"
-                      :value="item.id"
-                    ></el-option>
-               
+              <el-form-item label="专业技能"
+                            :rules="[{required: true}]"
+                            :label-width="formLabelWidth">
+                <el-select :disabled="!topForm.organId"
+                           v-model="subjectIds"
+                           clearable
+                           placeholder="专业技能"
+                           multiple>
+                  <el-option v-for="item in subjectList"
+                             :key="item.id"
+                             :label="item.name"
+                             :value="item.id"></el-option>
+
                 </el-select>
               </el-form-item>
             </el-col>
             <el-col :span="12">
-              <el-form-item label="职称" :label-width="formLabelWidth">
+              <el-form-item label="职称"
+                            :label-width="formLabelWidth">
                 <el-input v-model.trim="topForm.technicalTitles"></el-input>
               </el-form-item>
             </el-col>
           </el-row>
           <el-row>
             <el-col :span="12">
-              <el-form-item label="证件类型" :label-width="formLabelWidth">
+              <el-form-item label="证件类型"
+                            :label-width="formLabelWidth">
                 <el-input v-model.trim="topForm.certificateType"></el-input>
                 <!-- <el-select v-model.trim="topForm.certificateType" placeholder="证件类型">
                             <el-option label="身份证" value="身份证"></el-option>
@@ -231,54 +256,54 @@
               </el-form-item>
             </el-col>
             <el-col :span="12">
-              <el-form-item label="证件号码" :label-width="formLabelWidth">
+              <el-form-item label="证件号码"
+                            :label-width="formLabelWidth">
                 <el-input v-model.trim="topForm.certificateNum"></el-input>
               </el-form-item>
             </el-col>
           </el-row>
           <el-row>
             <el-col :span="12">
-              <el-form-item label :label-width="formLabelWidth">
+              <el-form-item label
+                            :label-width="formLabelWidth">
                 <!-- <el-input v-model.trim="topForm.certificateType"></el-input> -->
                 <el-checkbox v-model.trim="topForm.isSupportCourseScheduleRewardsRules">适用VIP分部活动</el-checkbox>
               </el-form-item>
             </el-col>
           </el-row>
           <el-form-item>
-            <el-button
-              @click="onSubmit('form')"
-              type="primary"
-            >立即{{ pageType == "create" ? '创建' : '修改' }}</el-button>
+            <el-button @click="onSubmit('form')"
+                       type="primary">立即{{ pageType == "create" ? '创建' : '修改' }}</el-button>
             <el-button @click="onReSet('form')">重置</el-button>
           </el-form-item>
         </el-form>
       </div>
       <div class="right">
         <div class="teacherIcon">
-          <img v-if="topForm.avatar" key="avatar" :src="topForm.avatar" alt />
-          <img v-else key="avatar" src="@/assets/images/base/woman.png" alt />
+          <img v-if="topForm.avatar"
+               key="avatar"
+               :src="topForm.avatar"
+               alt />
+          <img v-else
+               key="avatar"
+               src="@/assets/images/base/woman.png"
+               alt />
         </div>
-        <el-upload
-          class="ivu-upload"
-          :show-upload-list="false"
-          :show-file-list="false"
-          :headers="headers"
-          :on-success="handleSuccess"
-          accept=".jpg, .jpeg, .png"
-          :max-size="2048"
-          multiple
-          action="/api-web/uploadFile"
-        >
-          <el-button
-            icon="ios-cloud-upload-outline"
-            v-if="pageType != 'create'"
-            v-permission="{child: 'resetTeacher/uploadFile', parent: '/teacherUpdate/baseInfo'}"
-          >修改头像</el-button>
-          <el-button
-            icon="ios-cloud-upload-outline"
-            v-if="pageType == 'create'"
-            v-permission="{child: 'createTeacher/uploadFile', parent: '/teacherAdd/baseInfo'}"
-          >新增头像</el-button>
+        <el-upload class="ivu-upload"
+                   :show-upload-list="false"
+                   :show-file-list="false"
+                   :headers="headers"
+                   :on-success="handleSuccess"
+                   accept=".jpg, .jpeg, .png"
+                   :max-size="2048"
+                   multiple
+                   action="/api-web/uploadFile">
+          <el-button icon="ios-cloud-upload-outline"
+                     v-if="pageType != 'create'"
+                     v-permission="{child: 'resetTeacher/uploadFile', parent: '/teacherUpdate/baseInfo'}">修改头像</el-button>
+          <el-button icon="ios-cloud-upload-outline"
+                     v-if="pageType == 'create'"
+                     v-permission="{child: 'createTeacher/uploadFile', parent: '/teacherAdd/baseInfo'}">新增头像</el-button>
         </el-upload>
         <p class="iconP">
           推荐图片尺寸：200x200；
@@ -295,7 +320,7 @@
 import { getToken } from "@/utils/auth";
 import { branchQueryPage, subjectListTree } from "@/api/specialSetting";
 import { teacherAdd, teacherUpdate, teacherGet } from "@/api/teacherManager";
-import {getSubject} from '@/api/buildTeam'
+import { getSubject } from '@/api/buildTeam'
 import store from "@/store";
 import { permission } from "@/utils/directivePage";
 import { jobNature } from "@/utils/searchArray";
@@ -312,7 +337,7 @@ let validPhone = (rule, value, callback) => {
 
 export default {
   name: "teacherOperation",
-  data() {
+  data () {
     return {
       headers: {
         Authorization: getToken()
@@ -339,7 +364,7 @@ export default {
         graduateSchool: null,
         email: null,
         educationBackground: null,
-      
+
         isProbationPeriod: null,
         technicalTitles: null,
         certificateType: null,
@@ -348,7 +373,7 @@ export default {
         isSupportExtraPracticeLesson: null,
         memo: null
       },
-        subjectIds: [],
+      subjectIds: [],
       tenantId: null,
       // imageIcon: require("@/assets/images/base/warning.png"),
       rules: {
@@ -379,18 +404,18 @@ export default {
       }
     };
   },
-  created() {},
-  mounted() {
+  created () { },
+  mounted () {
     this.__init();
-   
+
   },
-  activated() {
+  activated () {
     this.pageType = this.$route.query.type;
     this.teacherId = this.$route.query.teacherId;
     this.__init();
   },
   methods: {
-    __init() {
+    __init () {
       if (this.$route.query.search) {
         this.Fsearch = this.$route.query.search;
       }
@@ -460,7 +485,7 @@ export default {
         });
       }
     },
-    joinArray(value, type) {
+    joinArray (value, type) {
       if (!type) {
         type = " ";
       }
@@ -470,24 +495,24 @@ export default {
         return value;
       }
     },
-    onSubmit(formName) {
+    onSubmit (formName) {
       this.$refs[formName].validate(valid => {
         if (valid) {
-          if(this.subjectIds.length <= 0 ){
+          if (this.subjectIds.length <= 0) {
             this.$message.error('请选择专业技能')
             return
           }
-          if(this.topForm.flowOrganRange instanceof Array){
-             this.topForm.flowOrganRange = this.topForm.flowOrganRange
-            ? this.topForm.flowOrganRange.join(",")
-            : null;
+          if (this.topForm.flowOrganRange instanceof Array) {
+            this.topForm.flowOrganRange = this.topForm.flowOrganRange
+              ? this.topForm.flowOrganRange.join(",")
+              : null;
           }
-         
+
           this.subjectId = this.subjectIds.join(",");
-           this.topForm.subjectId = this.subjectId
+          this.topForm.subjectId = this.subjectId
           if (this.pageType == "update") {
             this.topForm.id = this.teacherId;
-           
+
             teacherUpdate(this.topForm).then(res => {
               if (res.code == 200) {
                 // this.$emit('onTeacher')
@@ -522,7 +547,7 @@ export default {
         }
       });
     },
-    messageTips(title, res) {
+    messageTips (title, res) {
       if (res.code == 200) {
         this.$message.success(title + "成功");
       } else {
@@ -530,7 +555,7 @@ export default {
         this.$message.error(res.msg);
       }
     },
-    onReSet(formName) {
+    onReSet (formName) {
       this.topForm = {
         realName: null,
         gender: null,
@@ -554,13 +579,13 @@ export default {
       };
       this.$refs[formName].resetFields();
     },
-    onCancel() {
+    onCancel () {
       this.$router.push({
         path: "/business/teacherList",
         query: { rules: this.Frules, search: this.Fsearch }
       });
     },
-    handleSuccess(res) {
+    handleSuccess (res) {
       // 获取富文本组件实例
       // let quill = this.editor
       // 如果上传成功
@@ -570,16 +595,16 @@ export default {
       }
     },
     // 选择分部
-    switchOrgan() {
+    switchOrgan () {
       if (this.topForm.organId == 43) {
         this.tenantId = 2;
       } else {
         this.tenantId = 1;
       }
-      getSubject({tenantId: this.tenantId}).then(res=>{
-        if(res.code == 200){
-           this.subjectList= res.data;
-           
+      getSubject({ tenantId: this.tenantId }).then(res => {
+        if (res.code == 200) {
+          this.subjectList = res.data;
+
         }
       })
     }