hz/fe-manage
1
0
Fork 0
mirror of https://codeup.aliyun.com/67762337eccfc218f6110e0e/vue/fe-manage.git synced 2025-12-20 08:16:46 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into develop

Browse Source 
# Conflicts:
#	src/components/student/CommonStudent.vue
This commit is contained in:
yuping
2023-02-27 23:34:44 +08:00
parent 1b4a271eec 9fb7e49190
commit 8b4f112699
4 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/components/student/CommonStudent.vue
View File

@@ -799,6 +799,11 @@ function handleStageOk() {
let selectMember = 0;
if (activeKey.value === 4) { // 项目内选人
selectMember = selectsData.value.projectMemberList.length;
// 对选中的人员进行判断是否已经分组了
let haveGroupNum = selectsData.value.projectMemberList.filter(item => item.groupId !== null);
if (haveGroupNum.length > 0) {
message.warning("部分学员已经有小组，再次添加会被添加到当前小组.");
}
} else if (activeKey.value === 1) {
selectMember = selectsData.value.studentList.length;
} else if (activeKey.value === 2) {
@@ -814,11 +819,7 @@ function handleStageOk() {
if (leaderArray.length > 0) {
return message.warning("当前选中学员" + leaderArray[0].realName + "已是小组长，请勿重复选择。");
}
// 对选中的人员进行判断是否已经分组了
let haveGroupNum = selectsData.value.projectMemberList.filter(item => item.groupId !== null);
if (haveGroupNum.length > 0) {
message.warning("部分学员已经有小组，再次添加会被添加到当前小组.");
}
}
}
stageVisible.value = false;