Merge branch '0601Action' into test

src/views/teamBuild/signupList.vue

@@ -623,8 +623,8 @@
         </el-table-column>
         <el-table-column label="年级班级" align="center">
           <template slot-scope="scope">
-            <div>
-              {{ scope.row.currentGrade + scope.row.currentClass }}
+            <div v-if=" gradeListObj[scope.row.currentGrade]">
+              {{ gradeListObj[scope.row.currentGrade] + scope.row.currentClass }}
             </div>
           </template>
         </el-table-column>
@@ -1243,6 +1243,7 @@ export default {
       ischeckCanReg: false,
       courseViewType: null, // 乐团模式
       isManage: false,
+      gradeListObj:{}
     };
   },
   created() {},
@@ -1299,6 +1300,7 @@ export default {
 
       getMusicGroupGradeList({ musicGroupId: this.id }).then((res) => {
         let result = res.data;
+        this.gradeListObj = res.data
         if (res.code == 200 && result) {
           for (let i in result) {
             this.gradeList.push({

src/views/teamDetail/components/studentList.vue

@@ -328,9 +328,11 @@
             <div>{{ scope.row.registerTime | dayjsFormat("YYYY年") }}</div>
           </template>
         </el-table-column> -->
+        <!-- 年纪班级修改 -->
         <el-table-column align="center" label="年级班级">
           <template slot-scope="scope">
-            <div>{{ scope.row.currentGrade + scope.row.currentClass }}</div>
+
+            <div v-if="gradeListObj[scope.row.currentGrade]">{{ gradeListObj[scope.row.currentGrade] + scope.row.currentClass }}</div>
           </template>
         </el-table-column>
         <!-- <el-table-column align="center" label="报名专业" prop="subjectName">
@@ -1181,6 +1183,7 @@ export default {
       addTryVisible: false,
       memberRankList: [],
       isManage: false,
+      gradeListObj:{}
     };
   },
   components: {
@@ -1264,6 +1267,7 @@ export default {
       // }
       getMusicGroupGradeList({ musicGroupId: this.teamid }).then((res) => {
         let result = res.data;
+        this.gradeListObj = res.data
         if (res.code == 200 && result) {
           for (let i in result) {
             this.gradeList.push({