diff --git a/src/components/custom-navbar/index.vue b/src/components/custom-navbar/index.vue index baafad4..3b3466a 100644 --- a/src/components/custom-navbar/index.vue +++ b/src/components/custom-navbar/index.vue @@ -9,6 +9,9 @@ + diff --git a/src/pages/chatSettings/groupManage/manageGroupAdmin.vue b/src/pages/chatSettings/groupManage/manageGroupAdmin.vue index 33a11f2..7ccca4c 100644 --- a/src/pages/chatSettings/groupManage/manageGroupAdmin.vue +++ b/src/pages/chatSettings/groupManage/manageGroupAdmin.vue @@ -210,16 +210,11 @@ const removeGroupAdmin = (adminItem) => { ) { let positionInfos = [] if (state?.groupAdminList?.length > 0) { - state?.groupAdminList.forEach((item) => { - if ( + positionInfos = state?.groupAdminList.filter((item) => { + return ( item.dept_id != adminItem.dept_id || item.position_id != adminItem.position_id - ) { - positionInfos.push({ - position_id: item.position_id, - position_name: item.deptPos, - }) - } + ) }) let params = { source: 'app', diff --git a/src/pages/chatSettings/groupManage/selectMembers.vue b/src/pages/chatSettings/groupManage/selectMembers.vue index 97ac25d..0c07990 100644 --- a/src/pages/chatSettings/groupManage/selectMembers.vue +++ b/src/pages/chatSettings/groupManage/selectMembers.vue @@ -364,7 +364,8 @@ const handleClickItem = (item) => { if ( state.manageType === 'admin' && (groupParams.groupInfo.group_type == 2 || - groupParams.groupInfo.group_type == 4) + groupParams.groupInfo.group_type == 4 || + state.isCreateDepGroup === 1) ) { itemList = state.resultMemberList[0].memberList } @@ -388,7 +389,8 @@ const confirmSelectMembers = () => { if ( state.manageType === 'admin' && (groupParams.groupInfo.group_type == 2 || - groupParams.groupInfo.group_type == 4) + groupParams.groupInfo.group_type == 4 || + state.isCreateDepGroup === 1) ) { itemList = state.resultMemberList[0].memberList } @@ -404,7 +406,15 @@ const confirmSelectMembers = () => { ele.checkArr?.length > 0 || (ele.leader && (ele.leader == 1 || ele.leader == 2)) ) { - positionInfos.push(ele.positionInfo) + if (state.isCreateDepGroup === 1) { + let posInfo = Object.assign({}, ele.positionInfo, { + name: ele.nickname, + id: ele.id, + }) + positionInfos.push(posInfo) + } else { + positionInfos.push(ele.positionInfo) + } } }) console.log(selectedUserIds) @@ -426,45 +436,53 @@ const confirmSelectMembers = () => { }) resp.catch(() => {}) } else if (state.manageType === 'admin') { - if ( - groupParams.groupInfo.group_type == 1 || - groupParams.groupInfo.group_type == 3 - ) { - let params = { - mode: 1, //1管理员,2不是管理员 - group_id: dialogueParams.receiverId, //群id - user_ids: selectedUserIds, - } - console.log(params) - const resp = ServeGroupAssignAdmin(params) - resp.then(({ code, data }) => { - console.log(data) - if (code == 200) { - useDialogueStore().updateGroupMembers() - } else { - } + if (state.isCreateDepGroup === 1) { + // console.log(positionInfos) + groupTypeStore.groupAdmins.value = positionInfos + uni.navigateBack({ + delta: 1, }) - resp.catch(() => {}) - } else if ( - groupParams.groupInfo.group_type == 2 || - groupParams.groupInfo.group_type == 4 - ) { - let params = { - source: 'app', - id: dialogueParams.receiverId, - deptInfos: groupParams.groupInfo.deptInfos, - positionInfos: positionInfos, - } - console.log(params) - const resp = ServeEditGroupAdmin(params) - resp.then(({ code, data }) => { - console.log(data) - if (code == 200) { - groupStore.ServeGroupDetail() - } else { + } else { + if ( + groupParams.groupInfo.group_type == 1 || + groupParams.groupInfo.group_type == 3 + ) { + let params = { + mode: 1, //1管理员,2不是管理员 + group_id: dialogueParams.receiverId, //群id + user_ids: selectedUserIds, } - }) - resp.catch(() => {}) + console.log(params) + const resp = ServeGroupAssignAdmin(params) + resp.then(({ code, data }) => { + console.log(data) + if (code == 200) { + useDialogueStore().updateGroupMembers() + } else { + } + }) + resp.catch(() => {}) + } else if ( + groupParams.groupInfo.group_type == 2 || + groupParams.groupInfo.group_type == 4 + ) { + let params = { + source: 'app', + id: dialogueParams.receiverId, + deptInfos: groupParams.groupInfo.deptInfos, + positionInfos: positionInfos, + } + console.log(params) + const resp = ServeEditGroupAdmin(params) + resp.then(({ code, data }) => { + console.log(data) + if (code == 200) { + groupStore.ServeGroupDetail() + } else { + } + }) + resp.catch(() => {}) + } } } else if (state.manageType === 'removeMembers') { let params = { @@ -523,10 +541,9 @@ const assembleAlphabetMemberList = async (newMemberList) => { } getPosiByDep(departmentIdsArr) } else if (state.isCreateDepGroup === 1) { - console.log(groupTypeStore.depCheckedKeys) let departmentIdsArr = [] - if (groupTypeStore?.depCheckedKeys?.length > 0) { - groupTypeStore.depCheckedKeys.forEach((item) => { + if (groupTypeStore?.depCheckedKeys?.value?.length > 0) { + groupTypeStore.depCheckedKeys.value.forEach((item) => { departmentIdsArr.push(item.ID) }) } @@ -571,7 +588,18 @@ const getPosiByDep = async (departmentIdsArr) => { }) }) } - // console.log(departmentAllPositions) + if ( + state.isCreateDepGroup === 1 && + groupTypeStore?.groupAdmins?.value?.length > 0 + ) { + departmentAllPositions.forEach((allPos) => { + groupTypeStore.groupAdmins.value.forEach((admin) => { + if (allPos.id === admin.id) { + allPos.checkArr = [allPos.id] + } + }) + }) + } state.resultMemberList = [ { key: '', diff --git a/src/pages/dialog/index.vue b/src/pages/dialog/index.vue index 4d5fbd3..1265976 100644 --- a/src/pages/dialog/index.vue +++ b/src/pages/dialog/index.vue @@ -1,44 +1,42 @@