diff --git a/src/components/drawers/MemberList.vue b/src/components/drawers/MemberList.vue index 7195d97c..aaa8afd6 100644 --- a/src/components/drawers/MemberList.vue +++ b/src/components/drawers/MemberList.vue @@ -8,7 +8,7 @@ >
-
组员名单1
+
组员名单
{ - deleteOne(value.record.key); + deleteOne(value.record.key,value.record); }} > 删除 @@ -323,13 +323,17 @@ export default { }; //点击确认批量删除弹窗 const sureDeModal = () => { - debugger + // 判断选择的人员中是否有小组长 + let arr = [...state.tabledata].filter(x => [...state.selectedRowKeys].some(id => id === x.key)).filter(item => item.leaderId !== null); + if (arr.length > 0) { + return message.warning("选择人员中:"+arr[0].name + "是小组长,请勿删除!"); + } + console.log(arr) let obj = { projectGroupId: props.chooseGroupId, projectId: props.projectId, ids: state.selectedRowKeys, }; - delGroupStudent(obj) .then((res) => { console.log(res, "删除成功"); @@ -363,6 +367,7 @@ export default { groupId: value.groupId, //小组id group: value.groupName, //小组名 studentId: value.studentId, //学生id + leaderId: value.leaderId, //小组长 currentStageId: value.currentStageId, //当前关卡id name: value.studentName, //用户名 bum: value.studentDepartName, //部门 @@ -472,8 +477,11 @@ export default { //重新获取列表 getStu(); }; - const deleteOne = (id) => { - // console.log(id, "fewfew"); + const deleteOne = (id,row) => { + console.log("row", row); + if (row.leaderId !== null) { + return message.warning(""+row.name + "是小组长,请勿删除!"); + } console.log(`${id}`); state.deone = true; state.selectedRows = []; diff --git a/src/views/learningpath/LearningPath.vue b/src/views/learningpath/LearningPath.vue index 8c50040f..d6e6dbb7 100644 --- a/src/views/learningpath/LearningPath.vue +++ b/src/views/learningpath/LearningPath.vue @@ -239,7 +239,7 @@ >
查看更多 diff --git a/src/views/projectcenter/ProjectManage.vue b/src/views/projectcenter/ProjectManage.vue index 496a4ec0..7182ae1a 100644 --- a/src/views/projectcenter/ProjectManage.vue +++ b/src/views/projectcenter/ProjectManage.vue @@ -48,7 +48,7 @@