Преглед изворни кода

老师列表修改 以及vip活动

1
mo пре 4 година
родитељ
комит
3ca0732819

+ 2 - 1
src/router/notKeepAliveList.js

@@ -5,6 +5,7 @@ export default [
   '/business/teamCourseList',
   '/business/auditList',
   '/journal/payAppeal',
-  '/orderList/financeManager'
+  '/orderList/financeManager',
   // '/operateManager/HumanResources'
+  '/vipClassSet/vipNewActive'
 ]

+ 24 - 23
src/views/categroyManager/vipNewActive.vue

@@ -86,6 +86,7 @@
             <el-checkbox label="线上课"
                          v-model.trim="online"></el-checkbox>
             <el-select v-model.trim="onlineSalary"
+            disabled
                        clearable
                        filterable>
               <el-option label="老师默认课酬"
@@ -113,15 +114,16 @@
             </el-input>
             <div style="width:200px;"
                  v-if="onlineSalary== 'TEACHER_DEFAULT'"></div>
-            <el-checkbox label="是否参加梯度"
+            <!-- <el-checkbox label="是否参加梯度"
                          style="margin-left:20px;"
-                         v-model.trim="onlineClassJoinGradientRewards"></el-checkbox>
+                         v-model.trim="onlineClassJoinGradientRewards"></el-checkbox> -->
           </div>
           <div class="chioseWrap">
             <el-checkbox label="线下课"
                          v-model.trim="unonline"></el-checkbox>
             <el-select v-model.trim="unonlineSalary"
                        clearable
+                       disabled
                        filterable>
               <el-option label="老师默认课酬"
                          value="TEACHER_DEFAULT"></el-option>
@@ -148,16 +150,16 @@
             </el-input>
             <div style="width:200px;"
                  v-if="unonlineSalary== 'TEACHER_DEFAULT'"></div>
-            <el-checkbox label="是否参加梯度"
+            <!-- <el-checkbox label="是否参加梯度"
                          style="margin-left:20px;"
-                         v-model.trim="offlineClassJoinGradientRewards"></el-checkbox>
+                         v-model.trim="offlineClassJoinGradientRewards"></el-checkbox> -->
           </div>
-          <div class="chioseWrap">
+          <!-- <div class="chioseWrap">
             <el-checkbox v-model.trim="paymentReadonlyFlag"
                          label="可自定义单价"></el-checkbox>
-            <!-- <el-checkbox v-model.trim="salaryReadonlyFlag"
-                         label="可自定义课酬"></el-checkbox> -->
-          </div>
+            <el-checkbox v-model.trim="salaryReadonlyFlag"
+                         label="可自定义课酬"></el-checkbox>
+          </div> -->
         </div>
       </div>
       <div class="activeType">
@@ -282,12 +284,12 @@ export default {
   },
   activated () {
     this.onReSet()
-    if (this.$route.query.rules) {
-      this.rules = this.$route.query.rules;
-    }
-    if (this.$route.query.searchForm) {
-      this.searchForm = this.$route.query.searchForm;
-    }
+    // if (this.$route.query.rules) {
+    //   this.rules = this.$route.query.rules;
+    // }
+    // if (this.$route.query.searchForm) {
+    //   this.searchForm = this.$route.query.searchForm;
+    // }
 
     this.pageType = this.$route.query.type
     this.$refs.vipform.resetFields();
@@ -307,12 +309,12 @@ export default {
       }
     });
     this.onReSet()
-    if (this.$route.query.rules) {
-      this.rules = this.$route.query.rules;
-    }
-    if (this.$route.query.searchForm) {
-      this.searchForm = this.$route.query.searchForm;
-    }
+    // if (this.$route.query.rules) {
+    //   this.rules = this.$route.query.rules;
+    // }
+    // if (this.$route.query.searchForm) {
+    //   this.searchForm = this.$route.query.searchForm;
+    // }
 
     this.pageType = this.$route.query.type
     this.$refs.vipform.resetFields();
@@ -403,8 +405,7 @@ export default {
               this.$message.success("恭喜你,活动创建成功");
               this.onReSet();
               this.$router.push({
-                path: "/vipClassSet/vipActiveList",
-                query: { rules: this.rules, searchForm: this.searchForm }
+                path: "/vipClassSet/vipActiveList"
               });
             }
           });
@@ -555,4 +556,4 @@ export default {
     }
   }
 }
-</style>
+</style>

+ 3 - 18
src/views/teacherManager/teacherDetail/index.vue

@@ -119,34 +119,20 @@ export default {
         leaveRecord: permission("/teacherDetail/leaveRecord"),
         settlement: permission("/teacherDetail/settlement"),
         timerList: permission("/teacherDetail/timerList"),
-        outCourseList: permission("/teacherDetail/outCourseList"), // 
+        outCourseList: permission("/teacherDetail/outCourseList"), //
         teacherNetwork: permission("/teacherDetail/teacherNetwork"),
         serveStudentList: permission("/teacherDetail/serveStudentList"),
         calendarList: permission("/teacherDetail/calendarList"),
         weeklyCalendar: permission("/teacherDetail/weeklyCalendar"),
       },
-      Fsearch: null,
-      Frules: null
     };
   },
   activated () {
     this.teacherName = this.$route.query.teacherName;
-    if (this.$route.query.search) {
-      this.Fsearch = this.$route.query.search;
-    }
-    if (this.$route.query.rules) {
-      this.Frules = this.$route.query.rules;
-    }
     this.activeName = "0";
   },
 
   created () {
-    if (this.$route.query.search) {
-      this.Fsearch = this.$route.query.search;
-    }
-    if (this.$route.query.rules) {
-      this.Frules = this.$route.query.rules;
-    }
   },
   methods: {
     handleClick (val, event) {
@@ -155,12 +141,11 @@ export default {
     },
     onCancel () {
       this.$router.push({
-        path: "/business/teacherList",
-        query: { rules: this.Frules, search: this.Fsearch }
+        path: "/business/teacherList"
       });
     }
   }
 };
 </script>
 <style lang="scss">
-</style>
+</style>

+ 293 - 212
src/views/teacherManager/teacherList.vue

@@ -1,239 +1,324 @@
 <template>
   <div class="m-container">
     <h2>
-      <div class="squrt"></div>老师列表
+      <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">
+      <save-form
+        :inline="true"
+        @submit="search"
+        @reset="onReSet"
+        class="searchForm"
+        :model="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-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 native-type="submit" type="danger">搜索</el-button>
+          <el-button native-type="reset" type="primary">重置</el-button>
         </el-form-item>
-      </el-form>
+      </save-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>
-                <p v-if="scope.row.memo">{{'('+scope.row.memo+')'}}</p>
+                <p>{{ scope.row.realName }}</p>
+                <p v-if="scope.row.memo">{{ "(" + scope.row.memo + ")" }}</p>
               </div>
             </template>
           </el-table-column>
-          <el-table-column align="center"
-                           prop="organName"
-                           label="所属分部"></el-table-column>
-          <el-table-column align="center"
-                           width="150px"
-                           label="老师状态">
-            <template slot-scope="scope">{{ scope.row.lockFlag | teacherStatus }}</template>
+          <el-table-column
+            align="center"
+            prop="organName"
+            label="所属分部"
+          ></el-table-column>
+          <el-table-column align="center" width="150px" label="老师状态">
+            <template slot-scope="scope">{{
+              scope.row.lockFlag | teacherStatus
+            }}</template>
           </el-table-column>
-          <el-table-column align="center"
-                           :show-overflow-tooltip="true"
-                           width="200px"
-                           label="专业技能">
+          <el-table-column
+            align="center"
+            :show-overflow-tooltip="true"
+            width="200px"
+            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"
-                           width="150px"
-                           label="联系电话"></el-table-column>
-          <el-table-column align="center"
-                           label="工作类型">
-            <template slot-scope="scope">{{ scope.row.jobNature | jobNature }}</template>
+          <el-table-column
+            align="center"
+            prop="phone"
+            width="150px"
+            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="人事状态">
+          <el-table-column align="center" label="人事状态">
             <template slot-scope="scope">
-              {{ scope.row.isProbationPeriod == 0 ? '正式' : '试用' }}
+              {{ scope.row.isProbationPeriod == 0 ? "正式" : "试用" }}
             </template>
           </el-table-column>
-          <el-table-column align="center"
-                           prop="vipNum"
-                           label="已开小课"></el-table-column>
-          <el-table-column align="center"
-                           width="130px"
-                           label="试听课安排">
-            <template slot-scope="scope">{{ scope.row.demoNum > 0 ? '是' : '否' }}</template>
+          <el-table-column
+            align="center"
+            prop="vipNum"
+            label="已开小课"
+          ></el-table-column>
+          <el-table-column align="center" width="130px" label="试听课安排">
+            <template slot-scope="scope">{{
+              scope.row.demoNum > 0 ? "是" : "否"
+            }}</template>
           </el-table-column>
-          <el-table-column align="center"
-                           width="120px"
-                           label="开放网管课">
-            <template slot-scope="scope">{{ scope.row.isSupportExtraPracticeLesson ? '是' : '否' }}</template>
+          <el-table-column align="center" width="120px" label="开放网管课">
+            <template slot-scope="scope">{{
+              scope.row.isSupportExtraPracticeLesson ? "是" : "否"
+            }}</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="gotoOperating(scope.row)">{{ scope.row.operatingIndex +'%' }}</el-button>
+              <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 v-permission="'/teacherDetail'"
-                           class="el-button--text"
-                           :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
+                v-permission="'/teacherDetail'"
+                class="el-button--text"
+                :to="{
+                  path: `/business/teacherDetail?teacherId=${scope.row.id}&teacherName=${scope.row.realName}`,
+                }"
+                >查看</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
+          sync
+          :total.sync="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\d{10}$/, message: '请输入正确的手机号',trigger: 'blur' }]">
-          <el-input v-model.trim="passwrodForm.phone"
-                    minlength="11"
-                    maxlength="11"
+    <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\d{10}$/,
+              message: '请输入正确的手机号',
+              trigger: 'blur',
+            },
+          ]"
+        >
+          <el-input
+            v-model.trim="passwrodForm.phone"
+            minlength="11"
+            maxlength="11"
           ></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>
@@ -249,9 +334,9 @@ import store from "@/store";
 export default {
   name: "teacherList",
   components: {
-    pagination
+    pagination,
   },
-  data () {
+  data() {
     return {
       searchForm: {
         lockFlag: null,
@@ -260,7 +345,7 @@ export default {
         subjectId: null,
         organId: null,
         search: null, // 老师姓名或电话
-        isSupportExtraPracticeLesson: null
+        isSupportExtraPracticeLesson: null,
       },
       jobNature: jobNature, // 工作类型
       teacherStatus: teacherStatus, // 老师状态
@@ -273,31 +358,31 @@ export default {
         limit: 10, // 限制显示条数
         page: 1, // 当前页
         total: 1, // 总条数
-        page_size: [10, 20, 40, 50] // 选择限制显示条数
+        page_size: [10, 20, 40, 50], // 选择限制显示条数
       },
       passwrodVisiable: false,
       passwrodForm: {
         phone: "",
         password: "",
-        password2: ""
+        password2: "",
       },
-      activatedRow: null
+      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)
@@ -308,37 +393,37 @@ export default {
           ? (this.pageInfo = this.$route.query.rules)
           : (this.pageInfo = JSON.parse(this.$route.query.rules));
       }
-      getEmployeeOrgan().then(res => {
+      getEmployeeOrgan().then((res) => {
         if (res.code == 200) {
           this.branchList = [];
-          res.data.forEach(item => {
+          res.data.forEach((item) => {
             this.branchList.push({
               label: item.name,
-              value: item.id
+              value: item.id,
             });
           });
         }
       });
 
       subjectListTree({
-        delFlag: 'NO',
-        rows: 9999
-      }).then(res => {
+        delFlag: "NO",
+        rows: 9999,
+      }).then((res) => {
         let result = res.data;
         if (res.code == 200) {
           let tempArray = [];
           result.rows.forEach((item, index) => {
             let subject = [];
-            item.subjects.forEach(s => {
+            item.subjects.forEach((s) => {
               subject.push({
                 value: s.id,
-                label: s.name
+                label: s.name,
               });
             });
 
             tempArray[index] = {
               label: item.name,
-              options: subject
+              options: subject,
             };
           });
           this.subjectList = tempArray;
@@ -346,13 +431,9 @@ export default {
       });
       // this.getList();
     },
-    onTeacher (type, row) {
-      let search = JSON.stringify(this.searchForm);
-      let rules = JSON.stringify(this.pageInfo);
+    onTeacher(type, row) {
       let params = {
         type: type,
-        search,
-        rules
       };
       if (row) {
         params.teacherId = row.id;
@@ -363,10 +444,10 @@ export default {
       }
       this.$router.push({
         path: path,
-        query: params
+        query: params,
       });
     },
-    getList () {
+    getList() {
       let params = this.searchForm;
       // params.organId = this.organId
       // searchForm: {
@@ -391,7 +472,7 @@ export default {
         : (params.isSupportExtraPracticeLesson = null);
       params.rows = this.pageInfo.limit;
       params.page = this.pageInfo.page;
-      teacherQueryPage(params).then(res => {
+      teacherQueryPage(params).then((res) => {
         if (res.code == 200) {
           // console.log(res)
           this.tableList = res.data.rows;
@@ -399,7 +480,7 @@ export default {
         }
       });
     },
-    onStaffOperation (type, data) {
+    onStaffOperation(type, data) {
       let str = "";
       if (data.lockFlag != 1) {
         str = `是否冻结${data.realName}老师?`;
@@ -409,13 +490,13 @@ export default {
       this.$confirm(str, "提示", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
-        type: "warning"
+        type: "warning",
       })
         .then(() => {
           employeeOperate({
             employeeId: data.id,
-            operate: type
-          }).then(res => {
+            operate: type,
+          }).then((res) => {
             if (res.code == 200) {
               this.$message.success("更改成功");
               this.roleStatus = false;
@@ -425,46 +506,46 @@ export default {
             }
           });
         })
-        .catch(() => { });
+        .catch(() => {});
     },
-    onReSet () {
+    onReSet() {
       this.searchForm = {
         lockFlag: null,
         isProbationPeriod: null,
         jobNature: null,
         organId: null,
         subjectId: null,
-        search: null
+        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: "",
         password: "",
-        password2: ""
+        password2: "",
       };
       this.$refs["passwrodForm"].resetFields();
       this.passwrodVisiable = false;
     },
-    submitResetPassWord () {
+    submitResetPassWord() {
       if (this.passwrodForm.password !== this.passwrodForm.password2) {
         this.$message.error("两次密码必须相同");
         return;
       }
-      this.$refs["passwrodForm"].validate(res => {
+      this.$refs["passwrodForm"].validate((res) => {
         if (res) {
           // 发请求
           resetPassword2({
             mobile: this.passwrodForm.phone,
             newPassword: this.passwrodForm.password,
-            userId: this.activatedRow.id
-          }).then(res => {
+            userId: this.activatedRow.id,
+          }).then((res) => {
             if (res.code == 200) {
               // 修改成功
               this.$message.success("修改成功");
@@ -474,20 +555,20 @@ 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) {
+    gotoOperating(row) {
       this.$router.push({
         path: "/operateManager/operateStudent",
-        query: { teacherId: row.id, operatingTag: '1' }
+        query: { teacherId: row.id, operatingTag: "1" },
       });
-    }
-  }
+    },
+  },
 };
 </script>
 <style lang="scss" scoped>

+ 2 - 10
src/views/teacherManager/teacherOperation/index.vue

@@ -53,8 +53,6 @@ export default {
       activeStatus: [true, false],
       isTeacher: true,
       isCreate: false,
-      Fsearch: null,
-      Frules: null
     }
   },
   mounted () {
@@ -74,12 +72,6 @@ export default {
   },
   methods: {
     init () {
-      if (this.$route.query.search) {
-        this.Fsearch = this.$route.query.search;
-      }
-      if (this.$route.query.rules) {
-        this.Frules = this.$route.query.rules
-      }
       if (this.teacherId) {
         this.isTeacher = false
       }
@@ -92,7 +84,7 @@ export default {
       this.activeStatus[val.name] = true
     },
     onCancel () {
-      this.$router.push({ path: '/business/teacherList', query: { rules: this.Frules, search: this.Fsearch } })
+      this.$router.push({ path: '/business/teacherList' })
     },
     onTeacher (id) {
       let type = this.$route.query.type
@@ -117,4 +109,4 @@ export default {
 }
 </script>
 <style lang="scss">
-</style>
+</style>