Merge branch 'Nov16thResetMusic' of http://git.dayaedu.com/molingzhide/dy-admin-manager into Nov16thResetMusic

src/views/teamDetail/components/modals/class-pay-list.vue

@@ -89,8 +89,9 @@ export default {
       this.classGroupStudents = classGroupStudents
       this.teamid = this.$route.query.id
       this.activeType = this.form.classList[0].type
+      console.log(this.form.classList)
       this.courseTypeList = getCourseType(this.activeType)
-
+      console.log('courseTypeList:',this.courseTypeList)
       this.studentSubmitedData = {
         name:'',
         seleched:this.studentList.map(stu=> {return stu.userId})

src/views/teamDetail/components/modals/classList-group.vue

@@ -121,27 +121,33 @@ export default {
             item = classes;
           }
         });
+        this.form.classList.forEach((classes) => {
+          if (classes.classId == id) {
+            classes.type = item.type
+          }
+        });
+
         // 过滤类型不一样的
         this.activeClassList = this.classList.filter((classes) => {
           return item.type == classes.type;
         });
-        this.addDisabled(arr)
+        this.addDisabled(arr);
       } else {
         if (arr.length == 0) {
-          this.activeClassList = this.classList
+          this.activeClassList = this.classList;
         } else {
-         this.addDisabled(arr)
+          this.addDisabled(arr);
         }
       }
     },
-    addDisabled(arr){
-       this.activeClassList = this.activeClassList.map((classes) => {
-            return {
-              ...classes,
-              disabled: arr.indexOf(classes.id) != -1
-            };
-          });
-    }
+    addDisabled(arr) {
+      this.activeClassList = this.activeClassList.map((classes) => {
+        return {
+          ...classes,
+          disabled: arr.indexOf(classes.id) != -1,
+        };
+      });
+    },
   },
 };
 </script>

src/views/teamDetail/components/modals/classroom-setting.vue

@@ -249,6 +249,7 @@ export default {
         this.musicCourseSettings = res.data;
 
         const classs = {};
+          console.log(this.courseTypeList)
         for (const item of this.courseTypeList) {
           const key = item.value;
           if (res.data[key]) {
@@ -262,6 +263,7 @@ export default {
             };
           }
         }
+        console.log(classs)
         this.$set(this.form, "classs", classs);
         // this.courseTimes = courseTimes
       } catch (error) {