lex-xin 4 年之前
父節點
當前提交
01a07f84ed

+ 1 - 1
src/views/main/abnormal/index.vue

@@ -42,7 +42,7 @@
         :type="item[0].isError ? 'error' : 'warning'"
         :type="item[0].isError ? 'error' : 'warning'"
         :data="item.map(title => ({name: title.desc, num: title.num, num2: title.num2, errorType:title.errorType}))"
         :data="item.map(title => ({name: title.desc, num: title.num, num2: title.num2, errorType:title.errorType}))"
       >
       >
-        <span style="color: #14928A;" v-if='errorType == "NO_CLASS_MUSIC_GROUP_STUDENT_INFO"'>
+        <span style="color: #14928A;" v-if='item[0].errorType == "NO_CLASS_MUSIC_GROUP_STUDENT_INFO"'>
           <template v-if="permission('/notClassStudent')">
           <template v-if="permission('/notClassStudent')">
             立即处理<i class="el-icon-d-arrow-right"/>
             立即处理<i class="el-icon-d-arrow-right"/>
           </template>
           </template>

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

@@ -43,7 +43,8 @@ export const descs = {
   TEACHER_EXCEPTION_ATTENDANCE:'课程上有老师或学员考勤异常',
   TEACHER_EXCEPTION_ATTENDANCE:'课程上有老师或学员考勤异常',
   TEACHER_NOT_A_CLASS:'课程无老师考勤',
   TEACHER_NOT_A_CLASS:'课程无老师考勤',
   TEACHER_SERVE_ERROR:'服务指标生成的作业未布置',
   TEACHER_SERVE_ERROR:'服务指标生成的作业未布置',
-  WAIT_CREATE_PAYMENT_CALENDER:'缴费项目有效期结束前7天'
+  WAIT_CREATE_PAYMENT_CALENDER:'缴费项目有效期结束前7天',
+  NO_CLASS_MUSIC_GROUP_STUDENT_INFO: '进行中乐团不在班级中的在读学员提醒'
 }
 }
 
 
 const dates = {
 const dates = {

+ 4 - 0
src/views/main/notClassStudent.vue

@@ -126,6 +126,10 @@ export default {
     },
     },
     //生命周期 - 挂载完成(可以访问DOM元素)
     //生命周期 - 挂载完成(可以访问DOM元素)
     mounted() {
     mounted() {
+        const { query } = this.$route
+        if (query.organId) {
+            this.searchForm.organIds = Number(query.organId)
+        }
         this.$store.dispatch("setBranchs");
         this.$store.dispatch("setBranchs");
 
 
         this.getList()
         this.getList()

+ 4 - 3
src/views/teamDetail/components/modals/select-student.vue

@@ -124,7 +124,7 @@ import { genderType } from "@/constant";
 import { updateClassGroupStudents } from '../../api'
 import { updateClassGroupStudents } from '../../api'
 import { uniqBy } from 'lodash'
 import { uniqBy } from 'lodash'
 export default {
 export default {
-  props: ["studentList", "soundList", "activeType", 'activeListStudent', 'isOnlyChangeUser', 'classGroupId', 'type', 'teacherList', 'cooperationList'],
+  props: ["studentList", "soundList", "activeType", 'activeListStudent', 'isOnlyChangeUser', 'classGroupId', 'type', 'teacherList', 'cooperationList', 'isStudentRemove'],
   computed: {
   computed: {
     data() {
     data() {
       return uniqBy([...this.studentList, ...this.activeListStudent], 'userId')
       return uniqBy([...this.studentList, ...this.activeListStudent], 'userId')
@@ -146,7 +146,8 @@ export default {
       return !this.isOnlyChangeUser && this.activeType != 'MUSIC_NETWORK'
       return !this.isOnlyChangeUser && this.activeType != 'MUSIC_NETWORK'
     },
     },
     canDelUser() {
     canDelUser() {
-      return this.$route.query.type !== 'resetTeam' || !this.isOnlyChangeUser
+      // console.log(this.isStudentRemove)
+      return this.$route.query.type !== 'resetTeam' || !this.isOnlyChangeUser || this.isStudentRemove
     }
     }
   },
   },
   data() {
   data() {
@@ -203,7 +204,7 @@ export default {
       if (!this.isOnlyChangeUser && this.activeType == 'HIGH_ONLINE' && (this.seleched.length < 3 || this.seleched.length > 5)) {
       if (!this.isOnlyChangeUser && this.activeType == 'HIGH_ONLINE' && (this.seleched.length < 3 || this.seleched.length > 5)) {
         return this.$message.error('线上技能班必须为3-5人')
         return this.$message.error('线上技能班必须为3-5人')
       }
       }
-      if (this.seleched.length < 1) {
+      if (this.seleched.length < 1 && !this.isStudentRemove) {
         return this.$message.error('请至少选择一名学生')
         return this.$message.error('请至少选择一名学生')
       }
       }
       if (this.activeType == 'MUSIC_NETWORK' && this.seleched.length > 1) {
       if (this.activeType == 'MUSIC_NETWORK' && this.seleched.length > 1) {

+ 3 - 0
src/views/teamDetail/components/resetClass.vue

@@ -221,6 +221,7 @@
         :teacherList="teacherList"
         :teacherList="teacherList"
         :cooperationList="cooperationList"
         :cooperationList="cooperationList"
         :isOnlyChangeUser="isOnlyChangeUser"
         :isOnlyChangeUser="isOnlyChangeUser"
+        :isStudentRemove="isStudentRemove"
         :activeType="activeType"
         :activeType="activeType"
         @changeActiveChioseSound="changeActiveChioseSound"
         @changeActiveChioseSound="changeActiveChioseSound"
         @searchStudent="searchStudent(activeClass)"
         @searchStudent="searchStudent(activeClass)"
@@ -663,6 +664,7 @@ export default {
       chioseStudent: [], // 勾选的学生信息
       chioseStudent: [], // 勾选的学生信息
       isNewClass: false, // 是否为新建班级
       isNewClass: false, // 是否为新建班级
       isOnlyChangeUser: false,
       isOnlyChangeUser: false,
+      isStudentRemove: false, // 班级上没有未开始课程时
       isSearch: false, // 是否需要搜索
       isSearch: false, // 是否需要搜索
       isTemporary: false, // 是否为临时班级
       isTemporary: false, // 是否为临时班级
       className: "", // 班级名称
       className: "", // 班级名称
@@ -1067,6 +1069,7 @@ export default {
       this.isSearch = false;
       this.isSearch = false;
       this.activeType = row.type;
       this.activeType = row.type;
       this.activeChioseSound = null;
       this.activeChioseSound = null;
+      this.isStudentRemove = row.currentClassTimes == row.totalClassTimes ? true : false // 上课时长是否没有
       // 根据单机班id 查询声部班内的所有学生
       // 根据单机班id 查询声部班内的所有学生
       getClassAllStudent({ classGroupId: row.id }).then((res) => {
       getClassAllStudent({ classGroupId: row.id }).then((res) => {
         if (res.code == 200) {
         if (res.code == 200) {