Merge remote-tracking branch 'origin/04/13classAddSound'

src/views/teamDetail/components/modals/select-student.vue

@@ -69,9 +69,9 @@
         </el-col>
         <!-- :offset="showName ? 4 : 0" -->
         <el-col :span="10" >
-          <el-form-item label="声部" style="margin-right: 0;" >
+          <el-form-item label="声部" style="margin-right: 0;" prop="sound"  :rules="[{ required: true, message: '请选择声部',trigger: 'blur' }]">
             <el-select
-              v-model="sound"
+              v-model="form.sound"
               style="width: 100%"
               clearable
               multiple
@@ -132,8 +132,8 @@ export default {
     data() {
       return uniqBy([...this.studentList, ...this.activeListStudent], 'userId')
         .filter(item => {
-          if (this.sound.length) {
-            return this.sound.includes(item.actualSubjectId) || this.seleched.includes(item.userId)
+          if (this.form.sound.length) {
+            return this.form.sound.includes(item.actualSubjectId) || this.seleched.includes(item.userId)
           }
           return true
         })
@@ -160,6 +160,7 @@ export default {
         name: '',
         coreTeacher: '',
         assistant: '',
+         sound: []
       },
       seleched: [],
     };

src/views/teamDetail/components/resetClass.vue

@@ -460,14 +460,15 @@
             ></el-option>
           </el-select>
         </el-form-item>
-        <!-- <el-form-item 辜经理和焕焕狗要求不要可选声部
+        <!-- 恢复可报名声部 因为建班和加学生分开所以又要添加可报名声部(焕焕狗乱吠) -->
+        <el-form-item
           label="可报名声部"
           prop="memo"
           :rules="[
             { required: true, message: '请选择可报名声部', trigger: 'blur' },
           ]"
           v-if="
-            newClassForm.type == 'HIGH' || newClassForm.type == 'HIGH_ONLINE'
+            newClassForm.type == 'HIGH'
           "
         >
           <el-select
@@ -484,7 +485,7 @@
               :value="item.id"
             ></el-option>
           </el-select>
-        </el-form-item> -->
+        </el-form-item>
         <el-form-item
           label="网络教室声部"
           prop="subjectId"
@@ -864,7 +865,7 @@ export default {
         name: data?.name,
         musicGroupId: this.teamid,
         subjectIdList:
-          data?.soundList.length > 0 ? data?.soundList.join(",") : null,
+          data?.sound.length > 0 ? data?.sound.join(",") : null,
         teacherMapperList: formatClassGroupTeacherMapperList(
           data.coreTeacher,
           data.assistant
@@ -873,6 +874,7 @@ export default {
       };
     },
     async submitClass(data) {
+
       const list = this.getSubmitData(data, { onlyCreateClassGroup: true });
       let obj = this.getClassDate(data);
       if (this.activeType == "MUSIC_NETWORK") {