|
@@ -81,7 +81,7 @@
|
|
|
v-permission="'classGroup/classGroupUpdate'"
|
|
|
@click="classAdjustment(scope.row)">老师调整</el-button>
|
|
|
<el-button type="text"
|
|
|
- v-permission="'classGroupStudent/addStudents'"
|
|
|
+ v-permission="'classGroupStudent/updateClassGroupStudents'"
|
|
|
@click="resetClass(scope.row)">学员调整</el-button>
|
|
|
<el-popover placement="top"
|
|
|
width="160"
|
|
@@ -683,6 +683,7 @@ 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 { updateClassGroupStudents } from '../../../teamDetail/api'
|
|
|
import {
|
|
|
getTeacher,
|
|
|
getEmployeeOrgan,
|
|
@@ -988,13 +989,13 @@ export default {
|
|
|
superFindClassGroups({ classGroupId: this.activeClass }).then(res => {
|
|
|
if (res.code == 200) {
|
|
|
let maxNum = res.data.rows[0].expectStudentNum;
|
|
|
- if (arr.length + this.activeListStudent.length > maxNum) {
|
|
|
+ if (arr.length > maxNum) {
|
|
|
this.$message.error("超过预计招生人数");
|
|
|
return;
|
|
|
} else {
|
|
|
- addStudents({
|
|
|
+ updateClassGroupStudents({
|
|
|
classGroupId: this.activeClass,
|
|
|
- userIdsStr: arr.join(",")
|
|
|
+ studentIds: arr.join(",")
|
|
|
}).then(res => {
|
|
|
if (res.code == 200) {
|
|
|
this.studentVisible = false;
|
|
@@ -1007,9 +1008,9 @@ export default {
|
|
|
}
|
|
|
});
|
|
|
} else {
|
|
|
- addStudents({
|
|
|
+ updateClassGroupStudents({
|
|
|
classGroupId: this.activeClass,
|
|
|
- userIdsStr: arr.join(",")
|
|
|
+ studentIds: arr.join(",")
|
|
|
}).then(res => {
|
|
|
if (res.code == 200) {
|
|
|
this.studentVisible = false;
|
|
@@ -1386,7 +1387,7 @@ export default {
|
|
|
} else if (type == 3) {
|
|
|
// activeClass
|
|
|
obj.classGroupId = this.activeClass;
|
|
|
- classGroupUpdate(obj).then(res => {
|
|
|
+ classGroupUpdate([obj]).then(res => {
|
|
|
if (res.code == 200) {
|
|
|
this.$message.success("修改成功");
|
|
|
this.infoVisible = false;
|