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