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

Merge branch 'develop' of http://gitlab.dongwu-inc.com:10080/BOE/fe-manage into develop

Browse Source
This commit is contained in:
quhongwei
2023-03-01 02:24:10 +08:00
parent 3a95fb725b 92b4284ae9
commit 0e2b3be798
2 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/components/drawers/MemberList.vue
View File

@@ -358,7 +358,6 @@ export default {
}; };
//把数据放到state里 //把数据放到state里
const getTableDataList = (tableData) => { const getTableDataList = (tableData) => {
debugger
let data = tableData; let data = tableData;
let array = []; let array = [];
data.map((value) => { data.map((value) => {

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

@@ -401,8 +401,9 @@ const getStu = () => {
arr.map((value) => { arr.map((value) => {
let obj = { let obj = {
id: value.id, id: value.id,
studentId: value.studentId,
realName: value.studentName, realName: value.studentName,
userNo: value.studentId, userNo: value.studentUserNo,
isLeader: value.isLeader, isLeader: value.isLeader,
groupId: value.groupId, groupId: value.groupId,
orgName: value.studentOrgName ? value.studentOrgName : "-", orgName: value.studentOrgName ? value.studentOrgName : "-",
@@ -792,7 +793,6 @@ function handleDialogOk() {
} }
function handleStageOk() { function handleStageOk() {
// debugger
// 判断添加人数是否已超过限制人数 限制 = 本次添加的人 + 原有的人 // 判断添加人数是否已超过限制人数 限制 = 本次添加的人 + 原有的人
if (props.type === 1) { if (props.type === 1) {
if (props.groupMemberCount !== null) { // 只有添加组员的时候判断 if (props.groupMemberCount !== null) { // 只有添加组员的时候判断
@@ -804,21 +804,26 @@ function handleStageOk() {
if (haveGroupNum.length > 0) { if (haveGroupNum.length > 0) {
message.warning("部分学员已经有小组，再次添加会被添加到当前小组."); 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) { } else if (activeKey.value === 1) {
selectMember = selectsData.value.studentList.length; selectMember = selectsData.value.studentList.length;
} else if (activeKey.value === 2) { } else if (activeKey.value === 2) {
selectMember = selectsData.value.groupList.length; selectMember = selectsData.value.groupList.length;
} else if (activeKey.value === 3) { } else if (activeKey.value === 3) {
selectMember = selectsData.value.deptList.length; selectMember = selectsData.value.deptList.length;
} }
if (props.groupMemberCount < selectMember + Number(props.groupMemberNumber)) { if (props.groupMemberCount < selectMember + Number(props.groupMemberNumber)) {
return message.warning("添加小组学员超过最大值"); return message.warning("添加小组学员超过最大值");
} }
// 判断是否是组长，组长不能添加
const leaderArray = selectsData.value.projectMemberList.filter(item => item.isLeader === "1");
if (leaderArray.length > 0) {
return message.warning("当前选中学员" + leaderArray[0].realName + "已是小组长，请勿重复选择。");
}
} }
} }