diff --git a/src/components/student/CommonStudent.vue b/src/components/student/CommonStudent.vue index 2e8be039..70b30238 100644 --- a/src/components/student/CommonStudent.vue +++ b/src/components/student/CommonStudent.vue @@ -374,7 +374,6 @@ const projectRowSelection = computed(() => ({ preserveSelectedRowKeys: true, })); const getStu = () => { - debugger let obj = { studentName: proStudentName.value, pageNo: procurrentPage.value, @@ -394,6 +393,7 @@ const getStu = () => { id: value.id, realName: value.studentName, userNo: value.studentId, + isLeader: value.isLeader, orgName: value.studentOrgName ? value.studentOrgName : "-", departName: value.studentDepartName ? value.studentDepartName : "-", }; @@ -758,11 +758,17 @@ const submitAuth = () => { }; function handleStageOk() { + debugger // 判断添加人数是否已超过限制人数 限制 = 本次添加的人 + 原有的人 if (props.type === 1) { if (props.groupMemberCount < selectsData.value.studentList.length + 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+"已在其他小组为小组长,请勿重复选择。"); + } // 对选中的人员进行判断是否已经分组了 let haveGroupNum = selectsData.value.projectMemberList.filter(item => item.groupId !== null); if (haveGroupNum.length > 0) { diff --git a/src/views/learningpath/LevelAdd.vue b/src/views/learningpath/LevelAdd.vue index 7b519ecf..0e1063be 100644 --- a/src/views/learningpath/LevelAdd.vue +++ b/src/views/learningpath/LevelAdd.vue @@ -2105,7 +2105,6 @@ export default { pid: state.routerId, type: 2, }; - debugger getStuPage(stuobj) .then((res) => { console.log("获取学员列表", res.data.data.total);