From edac59161fb41a0bc0fbef6acfd008dd66e6ff61 Mon Sep 17 00:00:00 2001
From: peiqingliu <1226880979@qq.com>
Date: Mon, 27 Feb 2023 23:13:39 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=85=9A=E7=BB=84=E5=91=98?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=97=B6=E6=9C=89=E6=8F=90=E7=A4=BA=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/student/CommonStudent.vue | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/components/student/CommonStudent.vue b/src/components/student/CommonStudent.vue
index 48596614..7d0e1806 100644
--- a/src/components/student/CommonStudent.vue
+++ b/src/components/student/CommonStudent.vue
@@ -781,10 +781,16 @@ function handleStageOk() {
   // debugger
   // 判断添加人数是否已超过限制人数 限制 = 本次添加的人 + 原有的人
   if (props.type === 1) {
+    debugger
     if (props.groupMemberCount !== null) {  // 只有添加组员的时候判断
       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) {
@@ -800,11 +806,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;