01/13 班级类型修改

1

src/views/teamDetail/componentClass/classCompound.vue

@@ -37,7 +37,7 @@
                 ></el-table-column>
                 <el-table-column align="center" label="班级类型">
                   <template slot-scope="scope">
-                    <div>{{ scope.row.type | coursesType }}</div>
+                    <div>{{ scope.row.type | classType }}</div>
                   </template>
                 </el-table-column>
                 <el-table-column

src/views/teamDetail/components/resetClass.vue

@@ -346,20 +346,19 @@
             { required: true, message: '请选择主教老师', trigger: 'blur' },
           ]"
         >
-           <el-select
-          v-model.trim="newClassForm.bishop"
-          placeholder="请选择主教老师"
-          clearable
-          filterable
-
-        >
-          <el-option
-            v-for="(item, index) in teacherList"
-            :key="index"
-            :label="item.realName"
-            :value="String(item.id)"
-          ></el-option>
-        </el-select>
+          <el-select
+            v-model.trim="newClassForm.bishop"
+            placeholder="请选择主教老师"
+            clearable
+            filterable
+          >
+            <el-option
+              v-for="(item, index) in teacherList"
+              :key="index"
+              :label="item.realName"
+              :value="String(item.id)"
+            ></el-option>
+          </el-select>
           <!-- <remote-search
             :commit="'setTeachers'"
             v-model="newClassForm.bishop"
@@ -382,24 +381,28 @@
         </el-form-item>
         <el-form-item
           label="助教老师"
-          v-if="newClassForm.type != 'HIGH_ONLINE' && newClassForm.type != 'HIGH'&&newClassForm.type"
+          v-if="
+            newClassForm.type != 'HIGH_ONLINE' &&
+            newClassForm.type != 'HIGH' &&
+            newClassForm.type
+          "
           prop="teaching"
         >
-              <el-select
-          v-model.trim="newClassForm.teaching"
-          placeholder="请选择助教老师"
-          filterable
-          clearable
-          multiple
+          <el-select
+            v-model.trim="newClassForm.teaching"
+            placeholder="请选择助教老师"
+            filterable
+            clearable
+            multiple
             @change="setAssistant1"
-        >
-          <el-option
-            v-for="(item, index) in cooperationList"
-            :key="index"
-            :label="item.realName"
-            :value="item.id"
-          ></el-option>
-        </el-select>
+          >
+            <el-option
+              v-for="(item, index) in cooperationList"
+              :key="index"
+              :label="item.realName"
+              :value="item.id"
+            ></el-option>
+          </el-select>
           <!-- <remote-search
             :commit="'setTeachers'"
             v-model="newClassForm.teaching"
@@ -552,7 +555,7 @@ export default {
   },
   data() {
     return {
-      musicGroupInfos:this.musicGroupInfo,
+      musicGroupInfos: this.musicGroupInfo,
       classType: 0,
       pickerOptions: {
         firstDayOfWeek: 1,
@@ -698,54 +701,52 @@ export default {
       } else {
         getTeamBaseInfo({ musicGroupId: this.teamid }).then((res) => {
           if (res.code == 200) {
-            this.musicGroupInfos = res.data.musicGroup
-               this.organId = this.musicGroupInfos.organId;
+            this.musicGroupInfos = res.data.musicGroup;
+            this.organId = this.musicGroupInfos.organId;
             this.chargeTypeId = this.musicGroupInfos.chargeTypeId;
           }
         });
       }
-    this.$nextTick( async res=>{
-            try {
-        if (this.organId && this.chargeTypeId) {
-          const res = await getOrganizationCourseUnitPriceSettings({
-            chargeTypeId: this.chargeTypeId,
-            organId: this.organId,
-            rows: 9999,
-          });
-          const d = {};
-          this.courseTypes = res.data.rows;
-          for (const item of this.courseTypes) {
-            d[item.courseType] = item;
+      this.$nextTick(async (res) => {
+        try {
+          if (this.organId && this.chargeTypeId) {
+            const res = await getOrganizationCourseUnitPriceSettings({
+              chargeTypeId: this.chargeTypeId,
+              organId: this.organId,
+              rows: 9999,
+            });
+            const d = {};
+            this.courseTypes = res.data.rows;
+            for (const item of this.courseTypes) {
+              d[item.courseType] = item;
+            }
+            this.courseTypesByType = d;
+            console.log(this.courseTypesByType);
           }
-          this.courseTypesByType = d;
-          console.log(this.courseTypesByType)
-        }
-      } catch (error) {}
-      // 根据乐团id获取乐团所属分部
-      getTeacher({ organId: this.organId }).then((res) => {
-        if (res.code == 200) {
-          this.cooperationList = res.data;
-          this.teacherList = res.data;
-        }
-      });
-      getAllClass({ musicGroupId: this.teamid }).then((res) => {
-        if (res.code == 200) {
-          this.maxClassList = res.data;
-        }
-      });
+        } catch (error) {}
+        // 根据乐团id获取乐团所属分部
+        getTeacher({ organId: this.organId }).then((res) => {
+          if (res.code == 200) {
+            this.cooperationList = res.data;
+            this.teacherList = res.data;
+          }
+        });
+        getAllClass({ musicGroupId: this.teamid }).then((res) => {
+          if (res.code == 200) {
+            this.maxClassList = res.data;
+          }
+        });
 
-      // 获取默认乐团内的所有班
-      this.changeMixClass();
-      // 根据乐团id获取乐团的所有声部
-      findSound({ musicGroupId: this.teamid }).then((res) => {
-        if (res.code == 200) {
-          this.soundList = res.data;
-        }
+        // 获取默认乐团内的所有班
+        this.changeMixClass();
+        // 根据乐团id获取乐团的所有声部
+        findSound({ musicGroupId: this.teamid }).then((res) => {
+          if (res.code == 200) {
+            this.soundList = res.data;
+          }
+        });
       });
-
-    })
       // 根据分部id和缴费类型获取 可选课程类型
-
     },
     studentSubmited(data) {
       if (!this.isOnlyChangeUser) {
@@ -789,10 +790,11 @@ export default {
         (res) => {
           if (res.code == 200) {
             this.activeSingleList = res.data;
-            this.mergeList = res.data.filter((item) => {
-              return item.type != "MUSIC_NETWORK";
-            });
-
+            if (res.data?.length > 0) {
+              this.mergeList = res.data.filter((item) => {
+                return item.type != "MUSIC_NETWORK";
+              });
+            }
             // this.topForm.count = this.activeSingleList.length
           }
         }