From c5d3f6fdd95da48342a7fc56d77b86263401d5d5 Mon Sep 17 00:00:00 2001
From: lpq <lpq@ultron-soft.com>
Date: Sat, 25 Feb 2023 21:42:12 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AD=A6=E5=91=98=E4=BA=BA=E6=95=B0=E9=99=90?=
 =?UTF-8?q?=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/student/CommonStudent.vue | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/src/components/student/CommonStudent.vue b/src/components/student/CommonStudent.vue
index 55e37577..de01dd4d 100644
--- a/src/components/student/CommonStudent.vue
+++ b/src/components/student/CommonStudent.vue
@@ -412,7 +412,6 @@ const projectChangePagination = (page) => {
   getStu();
 };
 function onProjectSelectChange(e, l) {
-  debugger
   console.log("eeeee", e, l);
   projectSelectKeys.value = e;
   selectsData.value.projectMemberList = l;
@@ -768,7 +767,6 @@ const resetAudienceInfo = () => {
 // };
 //确定添加授权
 const submitAuth = () => {
-  debugger
   if (props.type === 2) {
     stageVisible.value = true;
   } else {
@@ -779,7 +777,17 @@ const submitAuth = () => {
 function handleStageOk() {
   // 判断添加人数是否已超过限制人数 限制 = 本次添加的人 + 原有的人
   if (props.type === 1) {
-    if (props.groupMemberCount < selectsData.value.projectMemberList.length + Number(props.groupMemberNumber)) {
+    let selectMember = 0;
+    if (activeKey.value === 4) { // 项目内选人
+      selectMember = selectsData.value.projectMemberList.length
+    } else if (activeKey.value === 1) {
+      selectMember = selectsData.value.studentList.length
+    } else if (activeKey.value === 2) {
+      selectMember = selectsData.value.groupList.length
+    } else if (activeKey.value === 3) {
+      selectMember = selectsData.value.deptList.length
+    }
+    if (props.groupMemberCount < selectMember + Number(props.groupMemberNumber)) {
       return message.warning("添加小组学员超过最大值");
     }
     // 判断是否是组长，组长不能添加
@@ -788,7 +796,6 @@ function handleStageOk() {
       return message.warning("当前选中学员"+leaderArray[0].realName+"已是小组长，请勿重复选择。");
     }
     // 对选中的人员进行判断是否已经分组了
-    debugger
     let haveGroupNum = selectsData.value.projectMemberList.filter(item => item.groupId !== null);
     if (haveGroupNum.length > 0) {
       message.warning("部分学员已经有小组，再次添加会被添加到当前小组.");