16:13 05/15

111

src/layout/components/TagsView.vue

@@ -131,10 +131,7 @@ export default {
       this.visible = false
     },
     async refresh (view) {
-      // this.$router.push(view.fullPath)
-      // location.reload()
       this.reloads()
-      console.log(this.reloads)
     }
   }
 }

src/views/resetTeaming/index.vue

@@ -26,13 +26,12 @@
                      name="3">
           <resetClass v-if="activeIndex == 3" />
         </el-tab-pane>
-        <el-tab-pane label="新增排课"
+        <!-- <el-tab-pane label="新增排课"
                      v-if="permission('/resetTeaming/coursePlan')"
                      name="4">
           <coursePlan :teamid='teamid'
                       v-if="activeIndex == 4" />
-          <!-- <lookCourse /> -->
-        </el-tab-pane>
+        </el-tab-pane> -->
         <!-- <el-tab-pane label="新增小班课"
                      name="5">
           <improvement :teamid='teamid' />

src/views/teamDetail/components/resetClass.vue

@@ -135,8 +135,8 @@
                @click="addNewClass('MIX')">新建合奏班</div>
           <div class="add"
                @click="addNewClass('HIGH')">基础技能班</div>
-          <!-- <div class="add"
-               @click="addNewClass('HIGH_ONLINE')">线上基础技能班</div> -->
+          <div class="add"
+               @click="addNewClass('HIGH_ONLINE')">线上基础技能班</div>
         </div>
       </div>
     </div>
@@ -339,6 +339,27 @@
                        :label="item.label"></el-option>
           </el-select>
         </el-form-item>
+        <el-form-item label="声部"
+                      v-if="activeType=='HIGH_ONLINE'"
+                      prop="sound">
+          <el-select v-model.trim="teacherForm.sound"
+                     style="width:180px"
+                     clearable
+                     filterable
+                     placeholder="声部选择">
+            <el-option v-for="(item,index) in soundList"
+                       :key="index"
+                       :label="item.name"
+                       :value="item.id"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="预计招生人数"
+                      prop="expectStudentNum"
+                      v-if="activeType=='HIGH_ONLINE'">
+          <el-input type="number"
+                    @mousewheel.native.prevent
+                    v-model="teacherForm.expectStudentNum"></el-input>
+        </el-form-item>
         <br />
         <el-form-item label="排课次数"
                       prop="courseNum"
@@ -698,7 +719,9 @@ export default {
         courseTime: "",
         checked: false,
         courseNum: "",
-        mixClassGroupId: ""
+        mixClassGroupId: "",
+        sound: '',
+        expectStudentNum: ''
       },
       teacherRules: {
         isAdd: [{ required: true, message: "请选择调整类型" }],
@@ -706,7 +729,9 @@ export default {
         courseType: [{ required: true, message: "请选择上课类型" }],
         courseTime: [{ required: true, message: "请选择开始时间" }],
         courseNum: [{ required: true, message: "请输入排课次数" }],
-        mixClassGroupId: [{ required: true, message: "请选择合奏班" }]
+        mixClassGroupId: [{ required: true, message: "请选择合奏班" }],
+        sound: [{ required: true, message: "请选择合声部" }],
+        expectStudentNum: [{ required: true, message: "请填写预计招生人数" }],
       },
       weekList: [
         {
@@ -1171,8 +1196,6 @@ export default {
       //     }
       //   })
       // } else {
-
-      // }
       addStudents({
         classGroupId: this.activeClass,
         userIdsStr: arr.join(",")
@@ -1183,7 +1206,7 @@ export default {
           this.getList();
         }
       });
-
+      // }
     },
     SelectionMix (val) {
       this.activeSingleLists = val;
@@ -1235,9 +1258,12 @@ export default {
         this.$message.error("班级里至少要有一名学生");
         return;
       }
-      if (this.activeType == 'HIGH_ONLINE' && (this.activeListStudent.length > 5 || this.activeListStudent.length < 3)) {
-        this.$message.error("线上技能班必须为3-5人");
-        return;
+      if (this.activeType == 'HIGH_ONLINE') {
+        if (this.activeListStudent.length > 5 || this.activeListStudent.length < 3) {
+          this.$message.error("线上技能班必须为3-5人");
+          return;
+        }
+
       }
       this.infoVisible = true;
     },
@@ -1358,6 +1384,8 @@ export default {
               }
             });
           } else if (type == 2) {
+            obj.subjectId = this.teacherForm.sound,
+              obj.expectStudentNum = this.teacherForm.expectStudentNum
             // 新增单技班
             revisionAddClassGroup(obj).then(res => {
               if (res.code == 200) {
@@ -1369,7 +1397,7 @@ export default {
               }
             });
           } else if (type == 3) {
-            // activeClass
+            // 乐团修改
             obj.classGroupId = this.activeClass;
             classGroupUpdate(obj).then(res => {
               if (res.code == 200) {