课表加乐团主管以及衔接老师

1

src/store/modules/permission.js

@@ -1,5 +1,8 @@
 import { asyncRoutes, constantRoutes } from '@/router'
+import router  from '@/router'
 import { getSilder } from '@/api/silder'
+import store from "@/store";
+import { Message } from 'element-ui'
 // import { stat } from 'fs'
 // import { removeToken } from '@/utils/auth'
 // import Layout from '@/layout'
@@ -603,11 +606,14 @@ const actions = {
           if(res.data?.length <1){
             // 一条权限都没有
             //退出 跳到登录页 提示'该账号无任何权限'
-            await this.$store.dispatch("user/logout");
+            console.log(store.dispatch)
+            await store.dispatch("user/logout");
             localStorage.removeItem("firstMenuUrl");
             // await this.$store.dispatch("permission/removePermission")
-            this.$router.push(`/login`);
-            window.location.reload();
+            Message.error('该用户无访问权限')
+            router.push(`/login`);
+
+            // window.location.reload();
           }
           let newData = recursionRouter(result);
 

src/views/buildVip/index.vue

@@ -151,7 +151,7 @@
               </el-option>
             </el-select>
           </el-form-item>
-          <el-form-item label="活动方案1" prop="activeType" v-if="isMusicTheory">
+          <el-form-item label="活动方案" prop="activeType" v-if="isMusicTheory">
             <el-select
               v-model.trim="leftForm.activeType"
               filterable
@@ -168,7 +168,7 @@
             </el-select>
           </el-form-item>
           <el-form-item
-            label="活动方案2"
+            label="活动方案"
             prop="activeType"
             v-else
             :rules="[

src/views/indexErrDataRecord/components/errorCourse.vue

@@ -52,6 +52,27 @@
             <el-option label="已结束" value="OVER"></el-option>
           </el-select>
         </el-form-item>
+        <el-form-item prop="educationUserId">
+          <el-select
+            class="multiple"
+            v-model.trim="searchForm.educationUserId"
+            filterable
+            clearable
+            placeholder="请选择乐团主管"
+          >
+            <el-option
+              v-for="(item, index) in educationList"
+              :key="index"
+              :label="item.userName"
+              :value="item.userId"
+            >
+              <span style="float: left">{{ item.userName }}</span>
+              <span style="float: right; color: #8492a6; font-size: 13px">{{
+                item.userId
+              }}</span>
+            </el-option>
+          </el-select>
+        </el-form-item>
         <el-form-item>
           <el-select
             v-model.trim="searchForm.hasDealTime"
@@ -61,7 +82,6 @@
           >
             <el-option label="是" value="1"></el-option>
             <el-option label="否" value="0"></el-option>
-
           </el-select>
         </el-form-item>
         <el-form-item>
@@ -409,7 +429,7 @@ import { objectToOptions, getTimes } from "@/utils";
 import { getTeacherPersonalAttendanceDetail } from "@/api/teacherManager";
 import { courseType, courseListType } from "@/utils/searchArray";
 import { permission } from "@/utils/directivePage";
-import { getHistoryErrCourse } from "../api";
+import { getHistoryErrCourse, getAllEducationUsers } from "../api";
 let nowTime = new Date();
 nowTime =
   nowTime.getFullYear() +
@@ -433,7 +453,8 @@ const initSearch = {
   schoolId: null, // 教学点编号
   creatTimer: [],
   courseIdSearch: null,
-  hasDealTime:null,
+  hasDealTime: null,
+  educationUserId: null,
 };
 export default {
   props: ["searchType"],
@@ -468,6 +489,7 @@ export default {
       isMainGo: false,
       isDetele: false,
       showMove: false,
+      educationList: [],
     };
   },
   components: {
@@ -497,7 +519,7 @@ export default {
       );
     },
   },
-  mounted() {
+  async mounted() {
     const { query } = this.$route;
     if (query.start || query.end) {
       this.searchForm.timer = [query.start, query.end];
@@ -527,6 +549,12 @@ export default {
     if (query.organId) {
       this.searchForm.organIdList = Number(query.organId);
     }
+
+    try {
+      const res = await getAllEducationUsers();
+      this.educationList = res.data;
+    } catch (e) {}
+
     this.$store.dispatch("setBranchs");
     this.$store.dispatch("setTeachers");
     this.$store.dispatch("setSchools");
@@ -645,8 +673,8 @@ export default {
     },
     lookDetail(row) {
       this.$router.push({
-       name:'teamCourseList',
-       params:{courseIdSearch: row.id}
+        name: "teamCourseList",
+        params: { courseIdSearch: row.id },
       });
       // this.maskForm = row;
       // 发请求 获取详情 row.id

src/views/teamDetail/teamCourseList.vue

@@ -986,6 +986,7 @@ export default {
       } else {
         this.searchForm.timer = [];
         // this.reset()
+        this.searchForm = {...initSearch}
       }
 
     },