|
|
@@ -73,7 +73,7 @@
|
|
|
<template slot-scope="scope">
|
|
|
<div>
|
|
|
<el-button type="text"
|
|
|
- v-if="scope.row.type === 'HIGH' || scope.row.type==='HIGH_ONLINE'
|
|
|
+ v-if="scope.row.type === 'HIGH' || scope.row.type==='HIGH_ONLINE'
|
|
|
"
|
|
|
v-permission="'classGroupStudent/findAllStudent'"
|
|
|
@click='lookDeatil(scope.row)'>查看</el-button>
|
|
|
@@ -255,7 +255,19 @@
|
|
|
width="700px"
|
|
|
:visible.sync="studentVisible"
|
|
|
:modal-append-to-body="true">
|
|
|
- <div class="studentMask">
|
|
|
+ <selectStudent
|
|
|
+ :activeListStudent="activeListStudent"
|
|
|
+ :studentList="studentList"
|
|
|
+ :soundList="soundList"
|
|
|
+ :classGroupId="activeClass"
|
|
|
+ :isOnlyChangeUser="true"
|
|
|
+ :activeType="activeType"
|
|
|
+ @changeActiveChioseSound="changeActiveChioseSound"
|
|
|
+ @searchStudent="searchStudent"
|
|
|
+ @submited="getList"
|
|
|
+ @close="studentVisible = false"
|
|
|
+ />
|
|
|
+ <!-- <div class="studentMask">
|
|
|
<div class="left">
|
|
|
<div class="chioseStudentList">
|
|
|
<h4 style="padding-left:10px;">当前已选学员</h4>
|
|
|
@@ -286,8 +298,6 @@
|
|
|
</div>
|
|
|
</div>
|
|
|
<div class="right">
|
|
|
- <!-- multiple
|
|
|
- collapse-tags v-if="isSearch" -->
|
|
|
<el-select v-model.trim="activeChioseSound"
|
|
|
style="width:180px"
|
|
|
@change="searchStudent"
|
|
|
@@ -299,12 +309,7 @@
|
|
|
:label="item.name"
|
|
|
:value="item.id"></el-option>
|
|
|
</el-select>
|
|
|
- <!-- <el-button v-if="isSearch"
|
|
|
- type="danger"
|
|
|
- style="margin-left:20px;"
|
|
|
- @click="searchStudent">搜索</el-button>-->
|
|
|
|
|
|
- <!-- 列表开始 -->
|
|
|
<div class="tableList">
|
|
|
<el-table tooltip-effect="dark"
|
|
|
v-if="!isNewClass"
|
|
|
@@ -332,7 +337,6 @@
|
|
|
align="center"
|
|
|
label="学员声部"></el-table-column>
|
|
|
</el-table>
|
|
|
- <!-- 临时调整table -->
|
|
|
<el-table tooltip-effect="dark"
|
|
|
v-if="isNewClass"
|
|
|
style="width: 100%; margin-top:10px;"
|
|
|
@@ -361,19 +365,17 @@
|
|
|
</el-table>
|
|
|
</div>
|
|
|
</div>
|
|
|
- </div>
|
|
|
- <div slot="footer"
|
|
|
+ </div> -->
|
|
|
+ <!-- <div slot="footer"
|
|
|
class="dialog-footer">
|
|
|
<el-button @click="studentVisible = false">取 消</el-button>
|
|
|
- <!-- 班级学员修改 -->
|
|
|
<el-button type="primary"
|
|
|
v-if="!isNewClass"
|
|
|
@click="addSomeStudent">确 定</el-button>
|
|
|
- <!-- 临时调整或者新建班级 -->
|
|
|
<el-button type="primary"
|
|
|
v-if="isNewClass"
|
|
|
@click="createMusiceClass">确 定</el-button>
|
|
|
- </div>
|
|
|
+ </div> -->
|
|
|
</el-dialog>
|
|
|
<!-- 老师以及课程设置 -->
|
|
|
<el-dialog title="老师调整"
|
|
|
@@ -684,6 +686,7 @@ import axios from "axios";
|
|
|
import { getToken } from "@/utils/auth";
|
|
|
import pagination from "@/components/Pagination/index";
|
|
|
import load from "@/utils/loading";
|
|
|
+import selectStudent from '../../../teamDetail/components/modals/select-student'
|
|
|
import {
|
|
|
getTeacher,
|
|
|
getEmployeeOrgan,
|
|
|
@@ -704,7 +707,7 @@ import {
|
|
|
import { sysConfigList } from "@/api/generalSettings";
|
|
|
|
|
|
export default {
|
|
|
- components: { pagination },
|
|
|
+ components: { pagination, selectStudent },
|
|
|
props: {
|
|
|
isSetSalary: {
|
|
|
type: Boolean,
|
|
|
@@ -722,6 +725,8 @@ export default {
|
|
|
searchForm: {
|
|
|
classType: null
|
|
|
},
|
|
|
+ activeType: null,
|
|
|
+ activeClass: null,
|
|
|
soundList: [],
|
|
|
teacherList: [],
|
|
|
|
|
|
@@ -852,6 +857,9 @@ export default {
|
|
|
}
|
|
|
});
|
|
|
},
|
|
|
+ changeActiveChioseSound(val) {
|
|
|
+ this.activeChioseSound = val
|
|
|
+ },
|
|
|
getList () {
|
|
|
this.teamid = this.$route.query.id;
|
|
|
//
|
|
|
@@ -1781,4 +1789,4 @@ export default {
|
|
|
/deep/.el-date-editor.el-input__inner {
|
|
|
width: 100px !important;
|
|
|
}
|
|
|
-</style>
|
|
|
+</style>
|
wolyshaw