合并

src/router/notKeepAliveList.js

@@ -19,11 +19,11 @@ export default [
   '/journal/payAppeal', // 考勤申诉
   '/business/teamDetail', // 乐团列表
   '/business/vipList', // vip列表
+  '/business/teacherList', // 老师列表
   '/business/studentList', // 学员管理
   '/business/studentDetail', // 学员管理详情
   // '/operateManager/HumanResources'
   '/business/attendanceList',
   '/business/returnVisitList',
   '/business/levelManager',
-  '/journal/journal', // 日志
 ]

src/views/categroyManager/vipActiveList.vue

@@ -31,7 +31,7 @@
             placeholder="请选择分部"
           >
             <el-option
-              v-for="(item, index) in organList"
+              v-for="(item, index) in selects.branchs"
               :key="index"
               :label="item.name"
               :value="item.id"
@@ -203,7 +203,7 @@
               clearable
             >
               <el-option
-                v-for="(item, index) in organList"
+                v-for="(item, index) in selects.branchs"
                 :key="index"
                 :label="item.name"
                 :value="item.id"
@@ -220,7 +220,7 @@
               disabled
             >
               <el-option
-                v-for="(item, index) in courseStatusList"
+                v-for="(item, index) in selects.vipGroupCategory"
                 :key="index"
                 :value="item.id"
                 :label="item.name"
@@ -452,7 +452,6 @@ import {
   resetVipActive,
   removeVipActive,
 } from "@/api/vipSeting";
-import { getEmployeeOrgan } from "@/api/buildTeam";
 export default {
   name: "vipActiveList",
   components: { pagination },
@@ -468,7 +467,6 @@ export default {
         page_size: [10, 20, 40, 50], // 选择限制显示条数
       },
       searchForm: { organId: null, enable: null, search: "" },
-      organList: [],
       dialogVisible: false,
       resetForm: {
         name: "",
@@ -528,13 +526,15 @@ export default {
       isReset: false,
     };
   },
-  created() {
-    this.init();
+  // created() {
+  //   this.init();
+  // },
+  // activated() {
+  //   this.init();
+  // },
+  mounted() {
+    this.init()
   },
-  activated() {
-    this.init();
-  },
-  mounted() {},
   filters: {
     onlinePip(val) {
       let obj = JSON.parse(val);
@@ -649,30 +649,13 @@ export default {
     },
   },
   methods: {
-    init() {
-      if (this.$route.query.searchForm) {
-        this.$route.query.searchForm instanceof Object
-          ? (this.searchForm = this.$route.query.searchForm)
-          : (this.searchForm = JSON.parse(this.$route.query.searchForm));
-      }
-      if (this.$route.query.rules) {
-        this.$route.query.rules instanceof Object
-          ? (this.rules = this.$route.query.rules)
-          : (this.rules = JSON.parse(this.$route.query.rules));
-      }
-      getEmployeeOrgan().then((res) => {
-        if (res.code == 200) {
-          this.organList = res.data;
-        }
-      });
+    async init() {
+      // 获取类型
+      await this.$store.dispatch('setVipGroupCategory')
+      // 获取分部
+      await this.$store.dispatch('setBranchs')
+
       this.getList();
-      // 首先获取课程形式
-      // 获取分部id
-      vipGroupCategory().then((res) => {
-        if (res.code == 200) {
-          this.courseStatusList = res.data;
-        }
-      });
     },
     loadNumber(event) {
       var el = event.currentTarget;
@@ -805,7 +788,6 @@ export default {
       let obj = JSON.parse(row.salarySettlementJson);
       // 同步线上课状态
       obj.onlineSalarySettlement ? (this.online = true) : (this.online = false);
-      console.log(obj.onlineSalarySettlement);
       if (obj.onlineSalarySettlement) {
         this.onlineSalary = obj.salarySettlementType;
         if (obj.onlineSalarySettlement.settlementValue) {

src/views/teacherManager/teacherList.vue

@@ -43,7 +43,17 @@
           </el-select>
         </el-form-item>
         <el-form-item>
-          <el-select
+          <el-select style="width: 100% !important;"
+                     filterable
+                     clearable
+                     v-model.trim="searchForm.subjectId"
+                     placeholder="专业技能">
+            <el-option v-for="(item, i) in selects.subjects"
+                         :key="i"
+                         :label="item.name"
+                         :value="item.id"></el-option>
+          </el-select>
+          <!-- <el-select
             v-model.trim="searchForm.subjectId"
             filterable
             clearable
@@ -61,7 +71,7 @@
                 :value="item.value"
               ></el-option>
             </el-option-group>
-          </el-select>
+          </el-select> -->
         </el-form-item>
         <el-form-item>
           <el-select
@@ -71,10 +81,10 @@
             placeholder="请选择分部"
           >
             <el-option
-              v-for="item in branchList"
+              v-for="item in selects.branchs"
               :key="item.id"
-              :label="item.label"
-              :value="item.value"
+              :label="item.name"
+              :value="item.id"> </el-option>
             ></el-option>
           </el-select>
         </el-form-item>
@@ -327,8 +337,8 @@
 import pagination from "@/components/Pagination/index";
 import { teacherQueryPage } from "@/api/teacherManager";
 import { employeeOperate } from "@/api/systemManage";
-import { subjectListTree } from "@/api/specialSetting";
-import { getEmployeeOrgan, resetPassword2 } from "@/api/buildTeam";
+// import { subjectListTree } from "@/api/specialSetting";
+import { resetPassword2 } from "@/api/buildTeam";
 import { jobNature, teacherStatus } from "@/utils/searchArray";
 import store from "@/store";
 export default {
@@ -369,10 +379,10 @@ export default {
       activatedRow: null,
     };
   },
-  activated() {
-    this.__init();
-    this.getList();
-  },
+  // activated() {
+  //   this.__init();
+  //   this.getList();
+  // },
   mounted() {
     this.__init();
     this.getList();
@@ -382,53 +392,47 @@ export default {
       this.pageInfo.page = 1;
       this.getList();
     },
-    __init() {
-      if (this.$route.query.search) {
-        this.$route.query.search instanceof Object
-          ? (this.searchForm = this.$route.query.search)
-          : (this.searchForm = JSON.parse(this.$route.query.search));
-      }
-      if (this.$route.query.rules) {
-        this.$route.query.rules instanceof Object
-          ? (this.pageInfo = this.$route.query.rules)
-          : (this.pageInfo = JSON.parse(this.$route.query.rules));
-      }
-      getEmployeeOrgan().then((res) => {
-        if (res.code == 200) {
-          this.branchList = [];
-          res.data.forEach((item) => {
-            this.branchList.push({
-              label: item.name,
-              value: item.id,
-            });
-          });
-        }
-      });
+    async __init() {
+      // 获取分部
+      await this.$store.dispatch('setBranchs')
 
-      subjectListTree({
-        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) => {
-              subject.push({
-                value: s.id,
-                label: s.name,
-              });
-            });
+      await this.$store.dispatch('setSubjects')
+      // getEmployeeOrgan().then((res) => {
+      //   if (res.code == 200) {
+      //     this.branchList = [];
+      //     res.data.forEach((item) => {
+      //       this.branchList.push({
+      //         label: item.name,
+      //         value: item.id,
+      //       });
+      //     });
+      //   }
+      // });
 
-            tempArray[index] = {
-              label: item.name,
-              options: subject,
-            };
-          });
-          this.subjectList = tempArray;
-        }
-      });
+      // subjectListTree({
+      //   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) => {
+      //         subject.push({
+      //           value: s.id,
+      //           label: s.name,
+      //         });
+      //       });
+
+      //       tempArray[index] = {
+      //         label: item.name,
+      //         options: subject,
+      //       };
+      //     });
+      //     this.subjectList = tempArray;
+      //   }
+      // });
       // this.getList();
     },
     onTeacher(type, row) {