Merge branch '04/22-index' into test

src/views/main/baseinfo/curriculum.vue

@@ -235,7 +235,7 @@ export default {
           ...rest,
           ...getTimes(this.mdate, ["startDate", "endDate"]),
           dataTypes:
-            "MUSIC_GROUP_COURSE,VIP_GROUP_COURSE,PRACTICE_GROUP_COURSE",
+            "MUSIC_GROUP_COURSE,VIP_GROUP_COURSE,PRACTICE_GROUP_COURSE,VIP_GROUP_OFFLINE_COURSE,VIP_GROUP_ONLINE_COURSE",
         });
         for (const item of res.data) {
           // 再循环一遍

src/views/studentManager/studentList.vue

@@ -1047,6 +1047,7 @@ export default {
     },
     async changeStudentOrgan(val) {
       this.studentForm.teacherId = null;
+      this.studentForm.school=null;
       if (val) {
         await getTeacher({ organId: val }).then((res) => {
           if (res.code == 200) {