Merge branch 'wxl_01_15' into online

src/views/resetTeaming/components/strudentPayInfo.vue

@@ -603,7 +603,7 @@ export default {
     // },
     goBack() {
       let query = this.$route.query;
-      if (query.type == "resetTeam") {
+      if (query.type == "resetTeam" || query.type == 'look') {
         this.$store.dispatch("delVisitedViews", this.$route);
         this.$router.push({
           path: "/business/resetTeaming",

src/views/resetTeaming/modals/subject-preview.vue

@@ -295,7 +295,11 @@ export default {
                         }]
                     }
                     this.courseInfo.forEach(item => {
-                        item.isStatus = true
+                        if(item.isStudentOptional) {
+                            item.isStatus = false
+                        } else {
+                            item.isStatus = true
+                        }
                     })
 
                     this.musicGroupSubject = tempResult.musicGroupSubjectPlan