From fd19d93ef0772174839f72038c88f472c335c870 Mon Sep 17 00:00:00 2001
From: lpq <lpq@ultron-soft.com>
Date: Tue, 28 Feb 2023 23:14:00 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=AD=A6=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/components/student/CommonStudent.vue b/src/components/student/CommonStudent.vue
index 381fe1f0..d19306c3 100644
--- a/src/components/student/CommonStudent.vue
+++ b/src/components/student/CommonStudent.vue
@@ -393,6 +393,7 @@ const getStu = () => {
     type: props.type
   };
   projectListTotal.value = -1;
+  debugger
   console.log("获取项目学员", obj);
   getStuPage(obj).then((res) => {
     console.log("获取项目学员", res);
@@ -401,8 +402,9 @@ const getStu = () => {
     arr.map((value) => {
       let obj = {
         id: value.id,
+        studentId: value.studentId,
         realName: value.studentName,
-        userNo: value.studentId,
+        userNo: value.studentUserNo,
         isLeader: value.isLeader,
         groupId: value.groupId,
         orgName: value.studentOrgName ? value.studentOrgName : "-",
@@ -792,7 +794,7 @@ function handleDialogOk() {
 }
 
 function handleStageOk() {
-  // debugger
+   debugger
   // 判断添加人数是否已超过限制人数 限制 = 本次添加的人 + 原有的人
   if (props.type === 1) {
     if (props.groupMemberCount !== null) {  // 只有添加组员的时候判断
@@ -804,21 +806,26 @@ function handleStageOk() {
         if (haveGroupNum.length > 0) {
           message.warning("部分学员已经有小组，再次添加会被添加到当前小组.");
         }
+        // 判断是否是组长，组长不能添加
+        const leaderArray = selectsData.value.projectMemberList.filter(item => item.isLeader === "1");
+        if (leaderArray.length > 0) {
+          return message.warning("当前选中学员" + leaderArray[0].realName + "已是小组长，请勿重复选择。");
+        }
       } 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("添加小组学员超过最大值");
       }
-      // 判断是否是组长，组长不能添加
-      const leaderArray = selectsData.value.projectMemberList.filter(item => item.isLeader === "1");
-      if (leaderArray.length > 0) {
-        return message.warning("当前选中学员" + leaderArray[0].realName + "已是小组长，请勿重复选择。");
-      }
+
 
     }
   }
@@ -826,6 +833,7 @@ function handleStageOk() {
   visiable.value = false;
   emit("finash", false);
   nameSearch.value.keyword = "";
+  debugger
   saveStu({
     targetId: props.id,
     type: props.type,