05/14

排课 重复提交问题修复

dist/static/css/chunk-259be4f4.60d54082.css → dist/static/css/chunk-0380af78.27cbed91.css

@@ -1 +1 @@
-.pagination-container[data-v-31cb099a]{background:#fff;padding:32px 16px;width:100%;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center}.pagination-container.hidden[data-v-31cb099a]{display:none}.imc[data-v-14f80d04]{-webkit-box-sizing:border-box;box-sizing:border-box;padding:30px 42px;background-color:#fff;min-height:80vh}.imc .addBtn[data-v-14f80d04]{margin-right:20px;background-color:#4eada7}.imc .addBtn[data-v-14f80d04],.setBtn[data-v-9e601d48]{line-height:40px;text-align:center;color:#fff;border-radius:4px;cursor:pointer;width:120px;height:40px}.setBtn[data-v-9e601d48]{background-color:#444;margin:20px 0}
+.pagination-container[data-v-31cb099a]{background:#fff;padding:32px 16px;width:100%;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center}.pagination-container.hidden[data-v-31cb099a]{display:none}.imc[data-v-14f80d04]{-webkit-box-sizing:border-box;box-sizing:border-box;padding:30px 42px;background-color:#fff;min-height:80vh}.imc .addBtn[data-v-14f80d04]{margin-right:20px;background-color:#4eada7}.imc .addBtn[data-v-14f80d04],.setBtn[data-v-72ed78f5]{line-height:40px;text-align:center;color:#fff;border-radius:4px;cursor:pointer;width:120px;height:40px}.setBtn[data-v-72ed78f5]{background-color:#444;margin:20px 0}

dist/static/css/chunk-276b5bb4.60093657.css

@@ -1 +0,0 @@
-.floor[data-v-b347d25a]{padding-right:20px;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:end;-ms-flex-pack:end;justify-content:flex-end;width:100%;height:48px;line-height:48px;background:#edeef0;font-size:14px;color:#444;-webkit-box-align:center;-ms-flex-align:center;align-items:center;position:relative;z-index:1}.floor .remove[data-v-b347d25a]{background:#f85043;margin-left:164px}.floor .add[data-v-b347d25a],.floor .remove[data-v-b347d25a]{width:98px;height:32px;border-radius:3px;color:#fff;line-height:32px;text-align:center;cursor:pointer}.floor .add[data-v-b347d25a]{background:#14928a;margin-left:20px}.studentMask[data-v-b347d25a]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:start;-ms-flex-pack:start;justify-content:flex-start}.studentMask .left[data-v-b347d25a]{width:200px;margin-right:20px}.studentMask .left .wrap[data-v-b347d25a]{margin-bottom:20px}.studentMask .left h4[data-v-b347d25a]{font-size:16px;color:#444;line-height:38px}.studentMask .left .chioseStudentList[data-v-b347d25a]{height:500px;overflow-y:auto;border:1px solid #ccc}.studentMask .left .chioseStudentList .studentItem[data-v-b347d25a]{padding-left:10px;line-height:25px}.studentMask .right[data-v-b347d25a]{width:calc(100% - 200px)}.studentMask .right .tableList[data-v-b347d25a]{max-height:500px;overflow-y:auto}.resetClassForm[data-v-b347d25a] .el-date-editor.el-input,.resetClassForm[data-v-b347d25a] .el-date-editor.el-input__inner{width:180px!important}[data-v-b347d25a] .el-date-editor.el-input,[data-v-b347d25a] .el-date-editor.el-input__inner{width:100px!important}

dist/static/css/chunk-2b695c2e.18168e53.css

@@ -0,0 +1 @@
+.floor[data-v-73789d26]{padding-right:20px;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:end;-ms-flex-pack:end;justify-content:flex-end;width:100%;height:48px;line-height:48px;background:#edeef0;font-size:14px;color:#444;-webkit-box-align:center;-ms-flex-align:center;align-items:center;position:relative;z-index:1}.floor .remove[data-v-73789d26]{width:98px;background:#f85043;margin-left:164px}.floor .add[data-v-73789d26],.floor .remove[data-v-73789d26]{height:32px;border-radius:3px;color:#fff;line-height:32px;text-align:center;cursor:pointer}.floor .add[data-v-73789d26]{width:auto;padding:0 10px;background:#14928a;margin-left:20px}.studentMask[data-v-73789d26]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:start;-ms-flex-pack:start;justify-content:flex-start}.studentMask .left[data-v-73789d26]{width:200px;margin-right:20px}.studentMask .left .wrap[data-v-73789d26]{margin-bottom:20px}.studentMask .left h4[data-v-73789d26]{font-size:16px;color:#444;line-height:38px}.studentMask .left .chioseStudentList[data-v-73789d26]{height:500px;overflow-y:auto;border:1px solid #ccc}.studentMask .left .chioseStudentList .studentItem[data-v-73789d26]{padding-left:10px;line-height:25px}.studentMask .right[data-v-73789d26]{width:calc(100% - 200px)}.studentMask .right .tableList[data-v-73789d26]{max-height:500px;overflow-y:auto}.resetClassForm[data-v-73789d26] .el-date-editor.el-input,.resetClassForm[data-v-73789d26] .el-date-editor.el-input__inner{width:180px!important}[data-v-73789d26] .el-date-editor.el-input,[data-v-73789d26] .el-date-editor.el-input__inner{width:100px!important}

src/api/buildTeam.js

@@ -354,7 +354,7 @@ export function setClassGroupTeacherSalary (data) {
   })
 }
 
-// 根据乐团id查询乐团详情
+// 获取班级详情
 export function getMusicGroup (data) {
   return request({
     url: api + `/musicGroup/get`,
@@ -362,6 +362,14 @@ export function getMusicGroup (data) {
     params: data
   })
 }
+// 根据乐团id查询乐团详情
+export function superFindClassGroups (data) {
+  return request({
+    url: api + `/classGroup/superFindClassGroups`,
+    method: 'get',
+    params: data
+  })
+}
 
 // 根据乐团id获取乐团流程
 export function getMusicGroupProcess (data) {

src/views/teamBuild/teamSeting/components/lookCourse.vue

@@ -134,7 +134,7 @@ export default {
     },
     getList () {
       // musicGroupId: this.teamid,
-      getCourseSchedule({ classScheduleType: this.classScheduleType, musicGroupId: this.teamid, rows: this.rules.limit }).then(res => {
+      getCourseSchedule({ classScheduleType: this.classScheduleType, musicGroupId: this.teamid, rows: this.rules.limit, page: this.rules.page }).then(res => {
         if (res.code == 200) {
           this.tableList = res.data.rows;
           this.rules.total = res.data.total;

src/views/teamBuild/teamSeting/components/setClassV2.vue

@@ -49,7 +49,13 @@
         </el-table-column>
         <el-table-column align="center"
                          prop="studentNum"
-                         label="班级人数"></el-table-column>
+                         label="班级人数">
+          <template slot-scope="scope">
+            <div>
+              {{scope.row.studentNum+'/'+scope.row.expectStudentNum}}
+            </div>
+          </template>
+        </el-table-column>
         <el-table-column align="center"
                          prop="studentId"
                          label="主教老师名称">
@@ -77,7 +83,7 @@
             <div>
               <el-button type="text"
                          v-permission="'classGroup/classGroupUpdate'"
-                         @click="classAdjustment(scope.row)">班级调整</el-button>
+                         @click="classAdjustment(scope.row)">老师调整</el-button>
               <el-popover placement="top"
                           width="160"
                           :ref="scope.$index"
@@ -96,7 +102,7 @@
                            slot="reference">删除班级</el-button>
               </el-popover>
               <!-- v-if="scope.row.type
-                         !='HIGHT'
+                         !='HIGH'
                          &&scope.row.type
                          !='HIGH_ONLINE'
                          " -->
@@ -349,7 +355,7 @@
       </div>
     </el-dialog>
     <!-- 老师以及课程设置 -->
-    <el-dialog title="班级设置"
+    <el-dialog title="老师调整"
                width="700px"
                :visible.sync="infoVisible"
                :modal-append-to-body="false">
@@ -369,15 +375,15 @@
                        :value="item.id"></el-option>
           </el-select>
         </el-form-item>-->
-        <el-form-item label="调整方式"
+        <!-- <el-form-item label="调整方式"
                       v-if="!isNewClass"
-                      prop="isAdd">
-          <el-radio v-model.trim="teacherForm.isAdd"
+                      prop="isAdd"> -->
+        <!-- <el-radio v-model.trim="teacherForm.isAdd"
                     label="new">班级加课</el-radio>
           <el-radio v-model.trim="teacherForm.isAdd"
-                    label="renew">重新排课</el-radio>
-          <el-radio v-model.trim="teacherForm.isAdd"
-                    label="onlyUpdateTeacher">修改老师</el-radio>
+                    label="renew">重新排课</el-radio> -->
+        <!-- <el-radio v-model.trim="teacherForm.isAdd"
+                    label="onlyUpdateTeacher">修改老师</el-radio> -->
         </el-form-item>
         <br />
         <el-form-item label="主教老师"
@@ -619,7 +625,7 @@ import axios from "axios";
 import { getToken } from "@/utils/auth";
 import pagination from "@/components/Pagination/index";
 import load from "@/utils/loading";
-import { getTeacher, getEmployeeOrgan, getMusicGroupClass, createClass, findSound, getMusicGroupStuNoClassType, classGroupUpdate, removeSingleClass, workOut } from "@/api/buildTeam";
+import { getTeacher, getEmployeeOrgan, getMusicGroupClass, createClass, findSound, getMusicGroupStuNoClassType, classGroupUpdate, removeSingleClass, workOut, superFindClassGroups } from "@/api/buildTeam";
 import {
   getClassAllStudent,
   removeStudents,
@@ -632,10 +638,6 @@ import {
 export default {
   components: { pagination },
   props: {
-    teamid: {
-      type: String,
-      required: true
-    },
     isSetSalary: {
       type: Boolean,
       required: true
@@ -688,7 +690,7 @@ export default {
       activeChioseSound: null, // 默认选择的声部
       infoVisible: false, // 班级调整弹窗
       teacherForm: {
-        isAdd: null,
+        isAdd: 'onlyUpdateTeacher',
         coreTeacher: "",
         assistant: [],
         courseType: "",
@@ -735,7 +737,8 @@ export default {
       }, // 排课信息
       chioseTab: [], // 记录选中的项
 
-      classCardList: [] // 课表的集合
+      classCardList: [], // 课表的集合
+      teamid: null
     };
   },
   //生命周期 - 创建完成（可以访问当前this实例）
@@ -772,14 +775,13 @@ export default {
   },
   methods: {
     init () {
-      this.isInit = true;
+
       this.getList();
     },
     getList () {
-      // 
-      getMusicGroupClass({ groupType: 'MUSIC', musicGroupId: this.teamid, type: this.searchForm.classType }).then(res => {
+      this.teamid = this.$route.query.id;
+      getMusicGroupClass({ groupType: 'MUSIC', musicGroupId: this.teamid, type: this.searchForm.classType, page: this.rules.page }).then(res => {
         if (res.code == 200) {
-          this.isInit = false;
           this.tableList = res.data.rows;
           this.rules.total = res.data.total
         }
@@ -817,7 +819,13 @@ export default {
           obj.name = this.newClassForm.className;
           obj.type = this.newClassForm.type;
           obj.groupType = 'MUSIC'
-          obj.subjectIdList = this.newClassForm.subjectIdList.length > 0 ? this.newClassForm.subjectIdList.join(',') : null
+          let subjectIdList;
+          if (this.newClassForm.type == 'HIGH_ONLINE') {
+            subjectIdList = this.newClassForm.subjectIdList
+          } else {
+            subjectIdList = this.newClassForm.subjectIdList.length > 0 ? this.newClassForm.subjectIdList.join(',') : null
+          }
+          obj.subjectIdList = subjectIdList
           obj.expectStudentNum = this.newClassForm.expectStudentNum;
           obj.teacherMapperList = [];
           obj.teacherMapperList.push({ userId: this.newClassForm.bishop, teacherRole: 'BISHOP' })
@@ -863,18 +871,36 @@ export default {
         this.$message.error("至少添加一名学员");
         return;
       }
-      addStudents({
-        classGroupId: this.activeClass,
-        userIdsStr: arr.join(",")
-      }).then(res => {
-        if (res.code == 200) {
-          this.studentVisible = false;
-          this.$message.success("添加成功");
-          this.getList();
-        }
-      });
+      if (this.activeType == 'HIGH_ONLINE') {
+        superFindClassGroups({ classGroupId: this.activeClass }).then(res => {
+          if (res.code == 200) {
+            let maxNum = res.data.rows[0].expectStudentNum;
+            if (arr.length + this.activeListStudent.length > maxNum) {
+              this.$message.error('超过预计招生人数');
+              return;
+
+            } else {
+              addStudents({
+                classGroupId: this.activeClass,
+                userIdsStr: arr.join(",")
+              }).then(res => {
+                if (res.code == 200) {
+                  this.studentVisible = false;
+                  this.$message.success("添加成功");
+                  this.getList();
+                }
+              });
+            }
+          }
+        })
+      }
+
+
+      //  在此处做拦截
+
     },
     temporaryRemoveStudent (item) {
+      console.log(item);
       // 列表中删除
       for (let i in this.activeListStudent) {
         if (this.activeListStudent[i].userId == item.userId) {
@@ -940,16 +966,6 @@ export default {
     },
     // 根据声部id 获取学生
     searchStudent (val) {
-      // 搜索学生
-      // 根据声部id  乐团id搜索学生
-      // teamSoundStudent({
-      //   musicGroupId: this.teamid,
-      //   actualSubjectId: this.activeChioseSound
-      // }).then(res => {
-      //   if (res.code == 200) {
-      //     this.studentList = res.data;
-      //   }
-      // });
       this.getNoClassStudent(this.newClassForm.type, val)
     },
     createMusiceClass () {
@@ -968,6 +984,14 @@ export default {
       obj.groupType = 'MUSIC'
       obj.userIds = userIds;
       obj.teacherMapperList = [];
+      obj.expectStudentNum = this.newClassForm.expectStudentNum;
+      let subjectIdList;
+      if (this.newClassForm.type == 'HIGH_ONLINE') {
+        subjectIdList = this.newClassForm.subjectIdList
+      } else {
+        subjectIdList = this.newClassForm.subjectIdList.length > 0 ? this.newClassForm.subjectIdList.join(',') : null
+      }
+      obj.subjectIdList = subjectIdList;
       obj.teacherMapperList.push({ userId: this.newClassForm.bishop, teacherRole: 'BISHOP' })
       for (let i in this.newClassForm.teaching) {
         obj.teacherMapperList.push({ userId: this.newClassForm.teaching[i], teacherRole: 'TEACHING' })
@@ -1088,6 +1112,8 @@ export default {
       }
     },
     SelectionStudent (val) {
+      // console.log(val);
+      // this.activeListStudent = val;
       this.chioseStudent = val;
     },
     addWeek () {
@@ -1358,7 +1384,10 @@ export default {
         }
       }).catch(res => {
         // this.tableList = [];
+        console.log('排课来了')
         this.classCardList = [];
+        this.resetTime();
+
 
       })
     },
@@ -1388,6 +1417,17 @@ export default {
       }
 
     },
+    resetTime () {
+      this.arrangeForm.courseTime = null;
+      this.weekList = [
+        {
+          week: "",
+          startTime: "",
+          endTime: "",
+          id: new Date().getTime()
+        }
+      ]
+    }
   },
   filters: {
     getBishopName (val) {
@@ -1411,7 +1451,8 @@ export default {
         }
       }
       return num;
-    }
+    },
+
 
   },
   watch: {
@@ -1447,6 +1488,27 @@ export default {
         }
         this.$refs['teacherForm'].resetFields()
       }
+    },
+    arrangeVisible (val) {
+      if (!val) {
+        this.arrangeForm = {
+          courseNum: null,
+          classNum: null,
+          courseType: null,
+          courseTime: null,
+          teachMode: null,
+          checked: false,
+        }
+        this.$refs['arrangeForm'].resetFields()
+        this.weekList = [
+          {
+            week: "",
+            startTime: "",
+            endTime: "",
+            id: new Date().getTime()
+          }
+        ]
+      }
     }
 
   }

src/views/teamDetail/components/resetClass.vue

@@ -37,7 +37,13 @@
           </el-table-column>
           <el-table-column align="center"
                            prop="studentNum"
-                           label="班级人数"></el-table-column>
+                           label="班级人数">
+            <template slot-scope="scope">
+              <div>
+                {{scope.row.studentNum+'/'+scope.row.expectStudentNum}}
+              </div>
+            </template>
+          </el-table-column>
           <el-table-column align="center"
                            prop
                            label="主教老师">
@@ -129,6 +135,8 @@
                @click="addNewClass('MIX')">新建合奏班</div>
           <div class="add"
                @click="addNewClass('HIGH')">基础技能班</div>
+          <div class="add"
+               @click="addNewClass('HIGH_ONLINE')">线上基础技能班</div>
         </div>
       </div>
     </div>
@@ -637,7 +645,8 @@ import {
   getMusicGroupStuNoClassType,
   classGroupUpdate,
   getTeamBaseInfo,
-  clearClassCourse
+  clearClassCourse,
+  superFindClassGroups
 } from "@/api/buildTeam";
 import {
   getClassAllStudent,
@@ -1133,16 +1142,28 @@ export default {
         this.$message.error("至少添加一名学员");
         return;
       }
-      addStudents({
-        classGroupId: this.activeClass,
-        userIdsStr: arr.join(",")
-      }).then(res => {
-        if (res.code == 200) {
-          this.studentVisible = false;
-          this.$message.success("添加成功");
-          this.getList();
-        }
-      });
+      if (this.activeType == 'HIGH_ONLINE') {
+        superFindClassGroups({ classGroupId: this.activeClass }).then(res => {
+          if (res.code == 200) {
+            let maxNum = res.data.rows[0].expectStudentNum;
+            if (arr.length + this.activeListStudent.length > maxNum) {
+              this.$message.error('超过预计招生人数');
+              return;
+            } else {
+              addStudents({
+                classGroupId: this.activeClass,
+                userIdsStr: arr.join(",")
+              }).then(res => {
+                if (res.code == 200) {
+                  this.studentVisible = false;
+                  this.$message.success("添加成功");
+                  this.getList();
+                }
+              });
+            }
+          }
+        })
+      }
     },
     SelectionMix (val) {
       this.activeSingleLists = val;
@@ -1378,7 +1399,8 @@ export default {
     cursor: pointer;
   }
   .add {
-    width: 98px;
+    width: auto;
+    padding: 0 10px;
     height: 32px;
     background: rgba(20, 146, 138, 1);
     border-radius: 3px;