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

课程时间段异常,超管配置所有分部

lex-xin пре 4 година
родитељ
комит
e6ab945df6

+ 9 - 0
src/api/systemManage.js

@@ -343,3 +343,12 @@ export function updateEducationTeacherId (data) {
     data: qs.stringify(data)
   })
 }
+
+// 获取员工所在分部列表(管理员查看所有的分部)
+export function queryEmployeeOrganByUser(data) {
+  return request({
+    url: api + '/organization/queryEmployeeOrganByUser',
+    method: 'get',
+    params: data
+  })
+}

BIN
src/assets/images/base/login-bg.png


+ 10 - 3
src/views/categroyManager/insideSetting/staffManager.vue

@@ -212,7 +212,7 @@
                      collapse-tags
                      v-model.trim="form.organIdLists"
                      multiple>
-            <el-option v-for="item in selects.branchs"
+            <el-option v-for="item in organList"
                        :key="item.id"
                        :label="item.name"
                        :value="item.id"></el-option>
@@ -318,7 +318,7 @@
 <script>
 import pagination from '@/components/Pagination/index'
 import { permission } from "@/utils/directivePage";
-import { queryEmployByOrganId, employeeOperate, getUserRole, employeeAdd, employeeUpdate, hasCourseGroupRelation, updateEducationTeacherId } from '@/api/systemManage'
+import { queryEmployByOrganId, employeeOperate, getUserRole, employeeAdd, employeeUpdate, hasCourseGroupRelation, updateEducationTeacherId, queryEmployeeOrganByUser } from '@/api/systemManage'
 import { findEducationTeacher } from '@/api/specialSetting'
 import { findEducationUsers } from '@/api/buildTeam'
 import Tooltip from '@/components/Tooltip/index'
@@ -338,6 +338,7 @@ export default {
   components: { pagination, Tooltip, handover },
   data () {
     return {
+      organList: [],
       tableList: [],
       educationList: [],
       educationForm: {
@@ -478,7 +479,13 @@ export default {
       })
       this.$store.dispatch('setBranchs')
     },
-    roleOperation (type, data) {
+    async roleOperation (type, data) {
+      // 获取分部
+      await queryEmployeeOrganByUser().then(res => {
+        if(res.code == 200) {
+          this.organList = res.data
+        }
+      })
       this.formActionTitle = type
       this.roleStatus = true
       // 修改的时候

+ 12 - 1
src/views/main/constant.js

@@ -44,7 +44,8 @@ export const descs = {
   TEACHER_NOT_A_CLASS:'课程无老师考勤',
   TEACHER_SERVE_ERROR:'服务指标生成的作业未布置',
   WAIT_CREATE_PAYMENT_CALENDER:'缴费项目有效期结束前7天',
-  NO_CLASS_MUSIC_GROUP_STUDENT_INFO: '进行中乐团不在班级中的在读学员提醒'
+  NO_CLASS_MUSIC_GROUP_STUDENT_INFO: '进行中乐团不在班级中的在读学员提醒',
+  COURSE_TIME_ERROR: '上课时间在00:00~06:00时间段内为时间安排异常',
 }
 
 const dates = {
@@ -53,6 +54,16 @@ const dates = {
 }
 
 export const errorType = {
+  COURSE_TIME_ERROR: {
+    name: '课程时间安排异常',
+    isError: false,
+    url: '/business/teamCourseList',
+    always: true,
+    query: {
+      searchType: 'COURSE_TIME_ERROR',
+      // ...dates
+    },
+  },
   MUSIC_PATROL_ITEM: {
     name: '乐团巡查事项异常',
     isError: false,

+ 9 - 4
src/views/teamDetail/teamCourseList.vue

@@ -748,6 +748,10 @@ export default {
         this.searchForm.timer = [nowTime, nowTime];
       }
     }
+    // 课程时间段异常,不需要时间搜索
+    if(query.searchType == 'COURSE_TIME_ERROR') {
+      this.searchForm.timer = []
+    }
 
     if (query.organId) {
       this.searchForm.organIdList = Number(query.organId);
@@ -829,10 +833,11 @@ export default {
           count++;
         }
       }
-      if (count <= 0) {
-        this.$message.error("请至少选择一个搜索条件");
-        return false;
-      }
+      //  课程时间段异常,不需要时间搜索,则课表列表搜索可以不要条件搜索
+      // if (count <= 0) {
+      //   this.$message.error("请至少选择一个搜索条件");
+      //   return false;
+      // }
       const { creatTimer, timer, ...rest } = searchForm;
       return {
         ...rest,