|
|
@@ -80,10 +80,10 @@
|
|
|
<div>
|
|
|
<!-- v-if="scope.row.type !='MIX'" -->
|
|
|
<el-button type="text"
|
|
|
- @click="resetClass(scope.row)">修改</el-button>
|
|
|
- <!-- <el-button type="text"
|
|
|
- @click="classAdjustment(scope.row)">班级调整</el-button>
|
|
|
+ @click="resetClass(scope.row)">学员调整</el-button>
|
|
|
<el-button type="text"
|
|
|
+ @click="classAdjustment(scope.row)">班级调整</el-button>
|
|
|
+ <!--<el-button type="text"
|
|
|
@click="recourse(scope.row)">重新排课</el-button> -->
|
|
|
<el-popover placement="top"
|
|
|
width="160"
|
|
|
@@ -117,6 +117,7 @@
|
|
|
</div>
|
|
|
</div>
|
|
|
</div>
|
|
|
+ <!-- 学员选择 -->
|
|
|
<el-dialog title="学员选择"
|
|
|
width="700px"
|
|
|
:visible.sync="studentVisible"
|
|
|
@@ -454,7 +455,7 @@
|
|
|
</div>
|
|
|
</el-dialog>
|
|
|
<!-- 班级调整 -->
|
|
|
- <el-dialog title="班级调整"
|
|
|
+ <!-- <el-dialog title="班级调整"
|
|
|
width="500px"
|
|
|
:visible.sync="resetClassVisible"
|
|
|
:modal-append-to-body="false">
|
|
|
@@ -504,13 +505,12 @@
|
|
|
<div slot="footer"
|
|
|
class="dialog-footer">
|
|
|
<el-button @click="resetClassVisible = false">取 消</el-button>
|
|
|
- <!-- 班级学员修改 -->
|
|
|
<el-button type="primary"
|
|
|
@click="">确 定</el-button>
|
|
|
</div>
|
|
|
- </el-dialog>
|
|
|
+ </el-dialog> -->
|
|
|
<!-- 重新排课 -->
|
|
|
- <el-dialog title="重新排课"
|
|
|
+ <!-- <el-dialog title="重新排课"
|
|
|
width="700px"
|
|
|
:visible.sync="resetCourseVisible"
|
|
|
:modal-append-to-body="false">
|
|
|
@@ -585,11 +585,10 @@
|
|
|
<div slot="footer"
|
|
|
class="dialog-footer">
|
|
|
<el-button @click="resetCourseVisible = false">取 消</el-button>
|
|
|
- <!-- 班级学员修改 -->
|
|
|
<el-button type="primary"
|
|
|
@click="">确 定</el-button>
|
|
|
</div>
|
|
|
- </el-dialog>
|
|
|
+ </el-dialog> -->
|
|
|
</div>
|
|
|
</template>
|
|
|
<script>
|
|
|
@@ -861,7 +860,8 @@ export default {
|
|
|
this.studentVisible = true;
|
|
|
this.activeClass = row.id
|
|
|
this.isSearch = false;
|
|
|
- console.log(row);
|
|
|
+ this.activeType = row.type;
|
|
|
+ // console.log(row);
|
|
|
// 根据单机班id 查询单技班内的所有学生
|
|
|
getClassAllStudent({ classGroupId: row.id }).then(res => {
|
|
|
if (res.code == 200) {
|
|
|
@@ -876,16 +876,16 @@ export default {
|
|
|
},
|
|
|
// 班级调整
|
|
|
classAdjustment (row) {
|
|
|
- this.resetClassForm.assistant = [];
|
|
|
+ this.teacherForm.assistant = [];
|
|
|
for (let i in row.classGroupTeacherMapperList) {
|
|
|
if (row.classGroupTeacherMapperList[i].teacherRole == 'BISHOP') {
|
|
|
- this.resetClassForm.coreTeacher = row.classGroupTeacherMapperList[i].userId;
|
|
|
+ this.teacherForm.coreTeacher = row.classGroupTeacherMapperList[i].userId;
|
|
|
}
|
|
|
if (row.classGroupTeacherMapperList[i].teacherRole == 'TEACHING') {
|
|
|
- this.resetClassForm.assistant.push(row.classGroupTeacherMapperList[i].userId)
|
|
|
+ this.teacherForm.assistant.push(row.classGroupTeacherMapperList[i].userId)
|
|
|
}
|
|
|
}
|
|
|
- this.resetClassVisible = true;
|
|
|
+ this.infoVisible = true;
|
|
|
},
|
|
|
getNoClassStudent (type) {
|
|
|
// 获取乐团内所有未分班的学生
|
|
|
@@ -911,7 +911,6 @@ export default {
|
|
|
},
|
|
|
// 删除学生 调整
|
|
|
removeStudent (item) {
|
|
|
- // console.log(item.userId);
|
|
|
// removeStudents({ classGroupId:}).then(res => {
|
|
|
removeStudents({ classGroupId: this.activeClass, userId: item.userId }).then(res => {
|
|
|
if (res.code == 200) {
|
|
|
@@ -923,16 +922,17 @@ export default {
|
|
|
this.activeListStudent = res.data;
|
|
|
}
|
|
|
})
|
|
|
- getNoClassStudentAll({ musicGroupId: this.teamid }).then(res => {
|
|
|
- if (res.code == 200) {
|
|
|
- this.$message.success('删除成功');
|
|
|
- this.studentList = res.data.map(item => {
|
|
|
- item.isVisible = false;
|
|
|
- return item;
|
|
|
- });
|
|
|
+ this.getNoClassStudent(this.activeType);
|
|
|
+ // getNoClassStudentAll({ musicGroupId: this.teamid }).then(res => {
|
|
|
+ // if (res.code == 200) {
|
|
|
+ // this.$message.success('删除成功');
|
|
|
+ // this.studentList = res.data.map(item => {
|
|
|
+ // item.isVisible = false;
|
|
|
+ // return item;
|
|
|
+ // });
|
|
|
|
|
|
- }
|
|
|
- })
|
|
|
+ // }
|
|
|
+ // })
|
|
|
}
|
|
|
})
|
|
|
},
|
