From d516ce00efc49c14889e7d3fbe317233172c5ebb Mon Sep 17 00:00:00 2001
From: wangyifeng <812766448@qq.com>
Date: Tue, 21 Jan 2025 18:43:14 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E6=88=90=E9=83=A8=E9=97=A8=E7=BE=A4?=
 =?UTF-8?q?=E5=B2=97=E4=BD=8D=E7=AE=A1=E7=90=86=E5=91=98=E6=9D=83=E9=99=90?=
 =?UTF-8?q?=E7=9A=84=E8=AE=BE=E7=BD=AE=E3=80=81=E7=A7=BB=E9=99=A4=E3=80=81?=
 =?UTF-8?q?=E6=9F=A5=E7=9C=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/deps/index.js                         |  18 +-
 src/api/group/index.js                        |   9 +
 .../components/groupMembersList.vue           |  36 ++-
 .../components/select-member-item.vue         |  54 +++--
 .../components/settingFormItem.vue            |   4 +
 .../chatSettings/groupManage/editAvatar.vue   |  20 +-
 .../groupManage/manageGroupAdmin.vue          | 161 ++++++++++----
 .../groupManage/selectMembers.vue             | 205 ++++++++++++++----
 src/pages/chatSettings/index.vue              |   7 +-
 src/static/image/chatSettings/add-member.png  | Bin 0 -> 2046 bytes
 src/static/image/chatSettings/is-mine.png     | Bin 0 -> 2112 bytes
 .../image/chatSettings/remove-member.png      | Bin 0 -> 1987 bytes
 src/store/groupType/index.js                  |  36 ++-
 src/store/modules/dialogue.js                 |   2 +-
 src/store/modules/group.js                    |   6 +-
 src/uni_modules/tmui/locale/zh-Hans.json      |   3 +-
 16 files changed, 428 insertions(+), 133 deletions(-)
 create mode 100644 src/static/image/chatSettings/add-member.png
 create mode 100644 src/static/image/chatSettings/is-mine.png
 create mode 100644 src/static/image/chatSettings/remove-member.png

diff --git a/src/api/deps/index.js b/src/api/deps/index.js
index 505d54c..3e80cca 100644
--- a/src/api/deps/index.js
+++ b/src/api/deps/index.js
@@ -3,7 +3,7 @@ import request from '@/service/index.js'
 export const departmentV2TreeMy = (data) => {
   return request({
     url: '/department/v2/tree/my',
-    baseURL:import.meta.env.VITE_EPR_BASEURL,
+    baseURL: import.meta.env.VITE_EPR_BASEURL,
     method: 'POST',
     data,
   })
@@ -12,7 +12,7 @@ export const departmentV2TreeMy = (data) => {
 export const departmentV2AllPosition = (data) => {
   return request({
     url: '/department/v2/tree/all/position',
-    baseURL:import.meta.env.VITE_EPR_BASEURL,
+    baseURL: import.meta.env.VITE_EPR_BASEURL,
     method: 'POST',
     data,
   })
@@ -21,7 +21,17 @@ export const departmentV2AllPosition = (data) => {
 export const departmentV2TreeAll = (data) => {
   return request({
     url: '/department/v2/tree/all',
-    baseURL:import.meta.env.VITE_EPR_BASEURL,
+    baseURL: import.meta.env.VITE_EPR_BASEURL,
+    method: 'POST',
+    data,
+  })
+}
+
+//获取指定部门下的所有岗位
+export const v2TreePositionByDepartment = (data) => {
+  return request({
+    url: '/department/v2/position',
+    baseURL: import.meta.env.VITE_EPR_BASEURL,
     method: 'POST',
     data,
   })
@@ -30,7 +40,7 @@ export const departmentV2TreeAll = (data) => {
 export const userV2List = (data) => {
   return request({
     url: '/user/v2/list',
-    baseURL:import.meta.env.VITE_EPR_BASEURL,
+    baseURL: import.meta.env.VITE_EPR_BASEURL,
     method: 'POST',
     data,
   })
diff --git a/src/api/group/index.js b/src/api/group/index.js
index a6d34a6..37176aa 100644
--- a/src/api/group/index.js
+++ b/src/api/group/index.js
@@ -224,3 +224,12 @@ export const ServeGroupNoSpeak = (data) => {
     data,
   })
 }
+
+//修改公司群、部门群的部门和岗位
+export const ServeEditGroupAdmin = (data) => {
+  return request({
+    url: '/api/v1/group/edit-dept',
+    method: 'POST',
+    data,
+  })
+}
diff --git a/src/pages/chatSettings/components/groupMembersList.vue b/src/pages/chatSettings/components/groupMembersList.vue
index 3ce0d59..fb87e5f 100644
--- a/src/pages/chatSettings/components/groupMembersList.vue
+++ b/src/pages/chatSettings/components/groupMembersList.vue
@@ -2,6 +2,13 @@
   <div class="group-member-list">
     <div
       class="group-member-list-each"
+      :style="{
+        width: (
+          props.memberListsLimit ? memberIndex < props.memberListsLimit : true
+        )
+          ? ''
+          : '0',
+      }"
       v-for="(memberItem, memberIndex) in props?.memberList"
       @click="toUserDetailPage(memberItem)"
     >
@@ -21,7 +28,10 @@
             }}
           </span>
         </div>
-        <div class="group-member-tag" v-if="memberItem?.leader === 1">
+        <div
+          class="group-member-tag"
+          v-if="memberItem?.leader === 1 || memberItem?.leader === 2"
+        >
           <span class="text-[16rpx] font-regular">
             {{ $t('group.identify.admin') }}
           </span>
@@ -33,6 +43,26 @@
         </div>
       </div>
     </div>
+    <div class="group-member-list-each">
+      <div class="group-member-each">
+        <div class="group-member-avatar" :style="{ background: 'unset' }">
+          <img src="/src/static/image/chatSettings/add-member.png" />
+        </div>
+        <div class="group-member-name">
+          <span class="text-[24rpx] font-regular">添加</span>
+        </div>
+      </div>
+    </div>
+    <div class="group-member-list-each" v-if="props?.is_manager">
+      <div class="group-member-each">
+        <div class="group-member-avatar" :style="{ background: 'unset' }">
+          <img src="/src/static/image/chatSettings/remove-member.png" />
+        </div>
+        <div class="group-member-name">
+          <span class="text-[24rpx] font-regular">移除</span>
+        </div>
+      </div>
+    </div>
   </div>
 </template>
 <script setup>
@@ -40,13 +70,15 @@ import { defineProps } from 'vue'
 const props = defineProps({
   memberList: Array, //人员列表
   memberListsLimit: Number, //人员列表数量限制
+  is_manager: Boolean, //是否管理员
 })
 
 //点击跳转到用户详情页面
 const toUserDetailPage = (userItem) => {
   console.log(userItem.erp_user_id)
   uni.navigateTo({
-    url: '/pages/dialog/dialogDetail/userDetail?erpUserId=' + userItem.erp_user_id,
+    url:
+      '/pages/dialog/dialogDetail/userDetail?erpUserId=' + userItem.erp_user_id,
   })
 }
 </script>
diff --git a/src/pages/chatSettings/components/select-member-item.vue b/src/pages/chatSettings/components/select-member-item.vue
index ec2ea45..8aa8b08 100644
--- a/src/pages/chatSettings/components/select-member-item.vue
+++ b/src/pages/chatSettings/components/select-member-item.vue
@@ -13,8 +13,10 @@
       <div
         class="select-member-item-avatar"
         v-if="
-          props?.manageType === 'silence' ||
-          props?.manageType === 'searchRecord'
+          !(
+            (props?.groupType == 2 || props?.groupType == 4) &&
+            props?.manageType === 'admin'
+          )
         "
       >
         <img v-if="avatarImg !== 'textImg'" :src="avatarImg" />
@@ -22,25 +24,33 @@
           {{ imgText }}
         </span>
       </div>
-      <div
-        class="select-member-item-name"
-        v-if="
-          props?.manageType === 'silence' ||
-          props?.manageType === 'searchRecord'
-        "
-      >
+      <div class="select-member-item-name">
         <span class="text-[28rpx] font-medium">{{ nameText }}</span>
       </div>
     </div>
-    <div class="operate-btns">
-      <div class="btn-undo-silence">
-        <span
-          v-if="props?.memberItem?.is_mute === 1"
-          class="text-[28rpx] font-regular"
-        >
+    <div class="select-member-tags">
+      <div
+        class="done-silence-tag"
+        v-if="
+          props?.memberItem?.is_mute === 1 && props?.manageType === 'silence'
+        "
+      >
+        <span class="text-[28rpx] font-regular">
           {{ $t('silence.tag.hasDone') }}
         </span>
       </div>
+      <div
+        class="is-admin-tag"
+        v-if="
+          (props?.memberItem?.leader === 1 ||
+            props?.memberItem?.leader === 2) &&
+          props?.manageType === 'admin'
+        "
+      >
+        <span class="text-[28rpx] font-regular">
+          {{ $t('group.identify.admin') }}
+        </span>
+      </div>
     </div>
   </div>
 </template>
@@ -54,6 +64,7 @@ const props = defineProps({
   memberItem: Object, //人员
   manageType: String, //管理类型
   itemStyle: String,
+  groupType: Number, //群类型
 })
 onMounted(() => {})
 
@@ -123,8 +134,17 @@ const clickItem = () => {
       }
     }
   }
-  .operate-btns {
-    .btn-undo-silence {
+  .select-member-tags {
+    .done-silence-tag {
+      span {
+        color: #b4b4b4;
+        line-height: 40rpx;
+      }
+    }
+    .is-admin-tag {
+      padding: 6rpx 12rpx;
+      border: 2rpx solid #b4b4b4;
+      border-radius: 8rpx;
       span {
         color: #b4b4b4;
         line-height: 40rpx;
diff --git a/src/pages/chatSettings/components/settingFormItem.vue b/src/pages/chatSettings/components/settingFormItem.vue
index 4fec984..432284d 100644
--- a/src/pages/chatSettings/components/settingFormItem.vue
+++ b/src/pages/chatSettings/components/settingFormItem.vue
@@ -125,6 +125,10 @@ const changeSwitch = (e, item) => {
 
   .item-sub {
     margin: 28rpx 0 0;
+    white-space: nowrap;
+    overflow: hidden;
+    max-width: 100%;
+    text-overflow: ellipsis;
     span {
       line-height: 44rpx;
       color: #747474;
diff --git a/src/pages/chatSettings/groupManage/editAvatar.vue b/src/pages/chatSettings/groupManage/editAvatar.vue
index 724ae2e..1c138c6 100644
--- a/src/pages/chatSettings/groupManage/editAvatar.vue
+++ b/src/pages/chatSettings/groupManage/editAvatar.vue
@@ -17,11 +17,6 @@
           </div>
         </div>
         <customBtn :btnText="$t('button.text.edit')"></customBtn>
-        <template #bottom>
-          <div class="app-logo-icon">
-            <img src="/src/static/image/chatSettings/app-icon.png" />
-          </div>
-        </template>
       </ZPaging>
     </div>
   </div>
@@ -58,9 +53,10 @@ const confirmEdit = () => {
 <style scoped lang="scss">
 .outer-layer {
   flex: 1;
-  background-image: url('@/static/image/clockIn/z3280@3x.png');
+  background-image: url('@/static/image/mine/background.png');
   background-size: cover;
   background-repeat: no-repeat;
+  background-position:center bottom;
 }
 
 .edit-group-info {
@@ -80,16 +76,4 @@ const confirmEdit = () => {
     }
   }
 }
-
-.app-logo-icon {
-  display: flex;
-  flex-direction: row;
-  align-items: center;
-  justify-content: center;
-  padding: 0 0 44rpx;
-  img {
-    width: 72rpx;
-    height: 72rpx;
-  }
-}
 </style>
diff --git a/src/pages/chatSettings/groupManage/manageGroupAdmin.vue b/src/pages/chatSettings/groupManage/manageGroupAdmin.vue
index 60e4455..f9968ba 100644
--- a/src/pages/chatSettings/groupManage/manageGroupAdmin.vue
+++ b/src/pages/chatSettings/groupManage/manageGroupAdmin.vue
@@ -18,22 +18,37 @@
           <div
             class="group-admin-list chat-settings-card"
             :style="{
-              margin: state.groupAdminList.length > 0 ? '20rpx 0 0' : '',
+              margin: state?.groupAdminList?.length > 0 ? '20rpx 0 0' : '',
             }"
           >
             <div
               class="group-admin-list-each"
-              v-for="(item, index) in state.groupAdminList"
+              v-for="(item, index) in state?.groupAdminList"
               :key="index"
             >
-              <span>{{ item }}</span>
+              <span>{{ item.deptPos }}</span>
+              <div class="group-admin-list-each-btns">
+                <img
+                  v-if="item.is_mine"
+                  src="/src/static/image/chatSettings/is-mine.png"
+                />
+                <div
+                  class="group-admin-list-each-btns-each"
+                  v-if="!item.cannotRemove"
+                  @click="removeGroupAdmin(item)"
+                >
+                  <span class="text-[28rpx] font-regular">
+                    {{ $t('chatSettings.btn.removeAdmin') }}
+                  </span>
+                </div>
+              </div>
             </div>
           </div>
           <div
             class="add-admin-member-btn chat-settings-card"
             @click="toSelectMembersPage"
             :style="{
-              margin: state.groupAdminList.length == 0 ? '20rpx 0 0' : '',
+              margin: state?.groupAdminList.length == 0 ? '20rpx 0 0' : '',
             }"
           >
             <img src="/src/static/image/chatSettings/add-btn.png" />
@@ -42,29 +57,24 @@
             </span>
           </div>
         </div>
-        <template #bottom>
-          <customBtn :isBottom="true" :btnText="$t('ok')"></customBtn>
-        </template>
       </ZPaging>
     </div>
   </div>
 </template>
 <script setup>
-import customBtn from '@/components/custom-btn/custom-btn.vue'
 import ZPaging from '@/uni_modules/z-paging/components/z-paging/z-paging.vue'
 import { onLoad } from '@dcloudio/uni-app'
-import { computed, onMounted, reactive } from 'vue'
+import { computed, onMounted, reactive, watch } from 'vue'
 
-import { useGroupTypeStore } from '@/store/groupType'
+import { ServeEditGroupAdmin } from '@/api/group/index.js'
 import { useGroupStore, useDialogueStore } from '@/store'
 
+import { useAuth } from '@/store/auth'
+const { userInfo } = useAuth()
+
 import { useI18n } from 'vue-i18n'
 const { t } = useI18n()
 
-const groupTypeStore = useGroupTypeStore()
-const groupTypeParams = reactive({
-  postTreeList: computed(() => groupTypeStore.postTreeList),
-})
 const groupStore = useGroupStore()
 const groupParams = reactive({
   groupInfo: computed(() => groupStore.groupInfo),
@@ -72,46 +82,60 @@ const groupParams = reactive({
 const dialogueStore = useDialogueStore()
 const dialogueParams = reactive({
   adminList: computed(() => dialogueStore.getAdminList),
+  receiverId: computed(() => dialogueStore.talk.receiver_id),
 })
 
 const state = reactive({
-  silenceAllBtn: null, //全员禁言按钮
   groupAdminList: [], //群管理员列表
 })
 
+watch(
+  () => groupParams?.groupInfo,
+  (newGroupInfo) => {
+    getGroupAdminList()
+  },
+  { deep: true },
+)
+
 onLoad((options) => {
   console.log(options)
 })
 
 onMounted(async () => {
-  console.log(dialogueParams.adminList)
-  await groupStore.ServeGroupDetail()
-  await groupTypeStore.getPositionsTree()
-  console.log(groupParams.groupInfo)
-  console.log(groupTypeParams.postTreeList)
-  assembleDepartmentPositions()
+  getGroupAdminList()
 })
 
-//组装部门和岗位对应关系数据
-const assembleDepartmentPositions = () => {
-  let deptPosArr = []
-  if (groupParams?.groupInfo?.deptInfos?.length > 0) {
-    if (groupParams?.groupInfo?.positionInfos?.length > 0) {
-      groupParams?.groupInfo?.deptInfos.forEach((deptInfo) => {
-        groupParams?.groupInfo?.positionInfos.forEach((positionInfo) => {
-          let deptPosItem = groupTypeStore.getDepartmentPositionsById(
-            deptInfo.dept_id,
-            positionInfo.position_id,
-          )
-          if (deptPosItem) {
-            deptPosArr.push(deptPosItem)
+//加载群聊管理员列表
+const getGroupAdminList = () => {
+  let myPositionsList = []
+  if (groupParams?.groupInfo?.groupAdminList?.length > 0) {
+    groupParams?.groupInfo?.groupAdminList.forEach((groupAdminItem) => {
+      if (userInfo?.value?.PositionUsers?.length > 0) {
+        userInfo?.value?.PositionUsers.forEach((item) => {
+          // console.log(item.DepartmentId + '-' + item.PositionID)
+          if (item.PositionID === groupAdminItem.position_id) {
+            myPositionsList.push(groupAdminItem)
           }
         })
-      })
-    }
+      }
+    })
   }
-  console.log(deptPosArr)
-  state.groupAdminList = deptPosArr
+  if (
+    groupParams?.groupInfo?.groupAdminList?.length > 0 &&
+    myPositionsList?.length > 0
+  ) {
+    groupParams.groupInfo.groupAdminList.forEach((ele) => {
+      myPositionsList.forEach((item) => {
+        if (ele.deptPos === item.deptPos) {
+          item.is_mine = true
+          if (myPositionsList?.length == 1) {
+            item.cannotRemove = true
+          }
+        }
+      })
+    })
+  }
+  state.groupAdminList = groupParams?.groupInfo?.groupAdminList
 }
 
 //点击跳转到添加禁言成员页面
@@ -120,6 +144,40 @@ const toSelectMembersPage = () => {
     url: '/pages/chatSettings/groupManage/selectMembers?manageType=admin',
   })
 }
+
+//点击移除群管理员
+const removeGroupAdmin = (adminItem) => {
+  let positionInfos = []
+  if (state?.groupAdminList?.length > 0) {
+    state?.groupAdminList.forEach((item) => {
+      if (
+        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',
+      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(() => {})
+  }
+}
 </script>
 <style scoped lang="scss">
 .outer-layer {
@@ -141,6 +199,33 @@ const toSelectMembersPage = () => {
       padding: 36rpx 0;
       margin: 0 32rpx;
       border-bottom: 1px solid $theme-border-color;
+      display: flex;
+      flex-direction: row;
+      align-items: center;
+      justify-content: space-between;
+      .group-admin-list-each-btns {
+        display: flex;
+        flex-direction: row;
+        align-items: center;
+        justify-content: flex-start;
+        img {
+          width: 52rpx;
+          height: 52rpx;
+        }
+        .group-admin-list-each-btns-each {
+          display: flex;
+          flex-direction: row;
+          align-items: center;
+          justify-content: center;
+          padding: 10rpx 30rpx;
+          border: 2rpx solid #eeeeee;
+          margin: 0 0 0 20rpx;
+          span {
+            line-height: 40rpx;
+            color: #191919;
+          }
+        }
+      }
     }
   }
   .add-admin-member-btn {
diff --git a/src/pages/chatSettings/groupManage/selectMembers.vue b/src/pages/chatSettings/groupManage/selectMembers.vue
index 3229a4a..de7f3b3 100644
--- a/src/pages/chatSettings/groupManage/selectMembers.vue
+++ b/src/pages/chatSettings/groupManage/selectMembers.vue
@@ -105,6 +105,7 @@
                 >
                   <tm-checkbox-group v-model="item.checkArr">
                     <selectMemberItem
+                      :groupType="groupParams.groupInfo.group_type"
                       :memberItem="item"
                       @clickItem="handleClickItem(item)"
                       :manageType="state.manageType"
@@ -122,12 +123,21 @@
                             item?.checkArr?.length > 0 ? '#46299d' : '#B4B4B4'
                           "
                           :outlined="
-                            item?.checkArr?.length > 0 || item.is_mute === 1
+                            item?.checkArr?.length > 0 ||
+                            (state.manageType === 'silence' &&
+                              item.is_mute === 1) ||
+                            (state.manageType === 'admin' &&
+                              (item.leader === 1 || item.leader === 2))
                               ? false
                               : true
                           "
                           :value="item.id"
-                          :disabled="item.is_mute === 1"
+                          :disabled="
+                            (state.manageType === 'silence' &&
+                              item.is_mute === 1) ||
+                            (state.manageType === 'admin' &&
+                              (item.leader === 1 || item.leader === 2))
+                          "
                         ></tm-checkbox>
                       </template>
                     </selectMemberItem>
@@ -156,22 +166,23 @@ import ZPaging from '@/uni_modules/z-paging/components/z-paging/z-paging.vue'
 import useZPaging from '@/uni_modules/z-paging/components/z-paging/js/hooks/useZPaging.js'
 import { computed, onMounted, reactive, ref, watch, nextTick } from 'vue'
 import { onLoad } from '@dcloudio/uni-app'
-import { ServeGroupNoSpeak } from '@/api/group/index.js'
-import { useDialogueStore } from '@/store'
+import { ServeGroupNoSpeak, ServeEditGroupAdmin } from '@/api/group/index.js'
+import { useDialogueStore, useGroupStore, useGroupTypeStore } from '@/store'
 
 const zPaging = ref()
 useZPaging(zPaging)
 
-const dialogueStore = useDialogueStore()
-const state = reactive({
-  searchText: '', //搜索内容
-  manageType: '', //管理类型
-  alphabet: [], //A-Z列表
-  resultMemberList: [], //按A-Z整理后的人员列表
-  currentAlphabet: 'A', //当前A-Z位置
-  scrollDirection: '', //当前列表滚动方向
-  isAssign: false, //是否指定view
+const groupStore = useGroupStore()
+const groupParams = reactive({
+  groupInfo: computed(() => groupStore.groupInfo),
 })
+
+const groupTypeStore = useGroupTypeStore()
+const groupTypeParams = reactive({
+  departmentAllPositions: computed(() => groupTypeStore.departmentAllPositions),
+})
+
+const dialogueStore = useDialogueStore()
 const dialogueParams = reactive({
   memberList: computed(() => {
     const lowerCaseSearchText = state?.searchText.toLowerCase()
@@ -184,10 +195,28 @@ const dialogueParams = reactive({
   receiverId: computed(() => dialogueStore.talk.receiver_id),
 })
 
+const state = reactive({
+  searchText: '', //搜索内容
+  manageType: '', //管理类型
+  alphabet: [], //A-Z列表
+  resultMemberList: [], //按A-Z整理后的人员列表
+  currentAlphabet: 'A', //当前A-Z位置
+  scrollDirection: '', //当前列表滚动方向
+  isAssign: false, //是否指定view
+})
+
 watch(
   () => dialogueParams?.memberList,
   (newMemberList) => {
-    assembleAlphabetMmeberList(newMemberList)
+    assembleAlphabetMemberList(newMemberList)
+  },
+  { deep: true },
+)
+
+watch(
+  () => groupParams?.groupInfo,
+  (newGroupInfo) => {
+    assembleAlphabetMemberList(dialogueParams?.memberList)
   },
   { deep: true },
 )
@@ -201,7 +230,7 @@ onLoad((options) => {
   console.log(options)
   if (options.manageType) {
     state.manageType = options.manageType
-    assembleAlphabetMmeberList(dialogueParams?.memberList)
+    assembleAlphabetMemberList(dialogueParams?.memberList)
   }
 })
 
@@ -272,10 +301,21 @@ const inputSearchText = (e) => {
 
 //点击item
 const handleClickItem = (item) => {
-  if (item.is_mute === 1) {
+  if (
+    (state.manageType === 'silence' && item.is_mute === 1) ||
+    (state.manageType === 'admin' && (item.leader === 1 || item.leader === 2))
+  ) {
     return
   }
-  dialogueParams.memberList.forEach((ele) => {
+  let itemList = dialogueParams.memberList
+  if (
+    state.manageType === 'admin' &&
+    (groupParams.groupInfo.group_type == 2 ||
+      groupParams.groupInfo.group_type == 4)
+  ) {
+    itemList = state.resultMemberList[0].memberList
+  }
+  itemList.forEach((ele) => {
     if (ele.id == item.id) {
       ele.checkArr = ele.checkArr?.length > 0 ? [] : [item.id]
     }
@@ -285,7 +325,16 @@ const handleClickItem = (item) => {
 //点击确认要禁言的成员
 const confirmSilenceMember = () => {
   let selectedUserIds = ''
-  dialogueParams.memberList.forEach((ele) => {
+  let itemList = dialogueParams.memberList
+  let positionInfos = []
+  if (
+    state.manageType === 'admin' &&
+    (groupParams.groupInfo.group_type == 2 ||
+      groupParams.groupInfo.group_type == 4)
+  ) {
+    itemList = state.resultMemberList[0].memberList
+  }
+  itemList.forEach((ele) => {
     if (ele.checkArr?.length > 0) {
       if (!selectedUserIds) {
         selectedUserIds = String(ele.checkArr[0])
@@ -293,29 +342,59 @@ const confirmSilenceMember = () => {
         selectedUserIds += ',' + ele.checkArr[0]
       }
     }
+    if (
+      ele.checkArr?.length > 0 ||
+      (ele.leader && (ele.leader == 1 || ele.leader == 2))
+    ) {
+      positionInfos.push(ele.positionInfo)
+    }
   })
   console.log(selectedUserIds)
   if (selectedUserIds) {
-    let params = {
-      mode: 1, //1禁言2解禁
-      group_id: dialogueParams.receiverId, //群id
-      user_ids: selectedUserIds, //用户ids
-    }
-    console.log(params)
-    const resp = ServeGroupNoSpeak(params)
-    resp.then(({ code, data }) => {
-      console.log(data)
-      if (code == 200) {
-        useDialogueStore().updateGroupMembers()
-      } else {
+    if (state.manageType === 'silence') {
+      let params = {
+        mode: 1, //1禁言2解禁
+        group_id: dialogueParams.receiverId, //群id
+        user_ids: selectedUserIds, //用户ids
       }
-    })
-    resp.catch(() => {})
+      console.log(params)
+      const resp = ServeGroupNoSpeak(params)
+      resp.then(({ code, data }) => {
+        console.log(data)
+        if (code == 200) {
+          useDialogueStore().updateGroupMembers()
+        } else {
+        }
+      })
+      resp.catch(() => {})
+    } else if (state.manageType === 'admin') {
+      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(() => {})
+      }
+    }
   }
 }
 
 //组装A-Z排序的人员列表
-const assembleAlphabetMmeberList = (newMemberList) => {
+const assembleAlphabetMemberList = async (newMemberList) => {
   if (state.manageType === 'searchRecord') {
     const resultMemberList = ref([])
     const alphabet = Array.from({ length: 26 }, (_, i) =>
@@ -335,12 +414,60 @@ const assembleAlphabetMmeberList = (newMemberList) => {
     state.alphabet = tempAlphabet
     state.resultMemberList = resultMemberList
   } else {
-    state.resultMemberList = [
-      {
-        key: '',
-        memberList: newMemberList,
-      },
-    ]
+    if (
+      (groupParams.groupInfo.group_type == 2 ||
+        groupParams.groupInfo.group_type == 4) &&
+      state.manageType === 'admin'
+    ) {
+      let departmentIdsArr = []
+      if (groupParams?.groupInfo?.deptInfos?.length > 0) {
+        groupParams.groupInfo.deptInfos.forEach((item) => {
+          departmentIdsArr.push(item.dept_id)
+        })
+      }
+      await groupTypeStore.getPositionByDepartment({
+        IDs: departmentIdsArr,
+      })
+      let departmentAllPositions = []
+      if (groupTypeParams?.departmentAllPositions?.value?.length > 0) {
+        groupTypeParams?.departmentAllPositions?.value?.forEach((item) => {
+          item?.AllPositions?.forEach((positionItem) => {
+            departmentAllPositions.push({
+              nickname: item.name + '-' + positionItem.name,
+              id: item.ID + '-' + positionItem.ID,
+              checkArr: [],
+              positionInfo: {
+                position_id: positionItem.ID,
+                position_name: positionItem.name,
+              },
+            })
+          })
+        })
+      }
+      if (groupParams?.groupInfo?.groupAdminList?.length > 0) {
+        groupParams?.groupInfo?.groupAdminList.forEach((item) => {
+          departmentAllPositions.forEach((idsItem) => {
+            if (item.dept_id + '-' + item.position_id == idsItem.id) {
+              idsItem.leader = 1
+            }
+          })
+        })
+      }
+      // console.log(departmentAllPositions)
+      state.resultMemberList = [
+        {
+          key: '',
+          memberList: departmentAllPositions,
+        },
+      ]
+    } else {
+      state.resultMemberList = [
+        {
+          key: '',
+          memberList: newMemberList,
+        },
+      ]
+    }
   }
 }
 
diff --git a/src/pages/chatSettings/index.vue b/src/pages/chatSettings/index.vue
index 335d7ee..01ff3ca 100644
--- a/src/pages/chatSettings/index.vue
+++ b/src/pages/chatSettings/index.vue
@@ -62,8 +62,9 @@
                 @toManagePage="toManagePage"
               ></settingFormItem>
               <groupMemberList
+                :is_manager="groupParams?.groupInfo?.is_manager"
                 :memberList="dialogueParams?.memberList"
-                :memberListsLimit="15"
+                :memberListsLimit="groupParams?.groupInfo?.is_manager ? 13 : 14"
               ></groupMemberList>
             </div>
           </div>
@@ -371,9 +372,9 @@ const updateGroupInfos = () => {
   if (groupParams?.groupInfo.groupAdminList?.length > 0) {
     groupParams?.groupInfo.groupAdminList.forEach((item) => {
       if (!groupAdmins) {
-        groupAdmins = item
+        groupAdmins = item.deptPos
       } else {
-        groupAdmins += ',' + item
+        groupAdmins += '，' + item.deptPos
       }
     })
   }
diff --git a/src/static/image/chatSettings/add-member.png b/src/static/image/chatSettings/add-member.png
new file mode 100644
index 0000000000000000000000000000000000000000..d1c9d793b61c258778f90d67096989fc6d467ad3
GIT binary patch
literal 2046
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
YU8~{g(4qnRp<n;p&W?C&vqNzDf3~8F^Z)<=

literal 0
HcmV?d00001

diff --git a/src/static/image/chatSettings/is-mine.png b/src/static/image/chatSettings/is-mine.png
new file mode 100644
index 0000000000000000000000000000000000000000..205e0a94949983b9b64d0dbc53126f47426e5751
GIT binary patch
literal 2112
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
b&(5Mxp10U>N3v%F_%DQD3eBg?n|b<gJ-cxZ

literal 0
HcmV?d00001

diff --git a/src/static/image/chatSettings/remove-member.png b/src/static/image/chatSettings/remove-member.png
new file mode 100644
index 0000000000000000000000000000000000000000..19a1ba301dcd9c87f7b0a8effee712e81b89401a
GIT binary patch
literal 1987
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
MY(T&l>N(#17k)Nm761SM

literal 0
HcmV?d00001

diff --git a/src/store/groupType/index.js b/src/store/groupType/index.js
index 4085285..2167b2a 100644
--- a/src/store/groupType/index.js
+++ b/src/store/groupType/index.js
@@ -2,16 +2,24 @@ import { defineStore } from 'pinia'
 import { useDialogueStore } from '@/store'
 import lodash from 'lodash'
 
-import {ref} from 'vue'
-import {createGlobalState,useStorage} from '@vueuse/core'
-import {uniStorage} from "@/utils/uniStorage.js"
-import {departmentV2TreeMy,departmentV2AllPosition,groupCreateDept,departmentV2TreeAll,userV2List} from '@/api/deps/index.js'
+import { ref } from 'vue'
+import { createGlobalState, useStorage } from '@vueuse/core'
+import { uniStorage } from '@/utils/uniStorage.js'
+import {
+  departmentV2TreeMy,
+  departmentV2AllPosition,
+  groupCreateDept,
+  departmentV2TreeAll,
+  userV2List,
+  v2TreePositionByDepartment,
+} from '@/api/deps/index.js'
 
 export const useGroupTypeStore = createGlobalState(() => {
   const groupName = ref('')
   const groupActiveIndex = ref(-1) // 当前激活的分组索引
   const depTreeMyList = ref([])
   const postTreeList = ref([])
+  const departmentAllPositions = ref([]) //部门下所有岗位
   const crumbs = ref([])
   const crumbsIndex = ref(0)
   const depCheckedKeys = ref([]) // 选中的部门keys
@@ -19,13 +27,21 @@ export const useGroupTypeStore = createGlobalState(() => {
   const membersCheckedKeys = ref([]) // 选中的人员keys
   const allChooseMembers = ref([])
 
-  const getDepsTreeMy= async()=>{
+  const getDepsTreeMy = async () => {
     const res = await departmentV2TreeAll()
-    if(res.status===0){
+    if (res.status === 0) {
       depTreeMyList.value = res.data.nodes
     }
   }
 
+  //获取指定部门下的所有岗位
+  const getPositionByDepartment = async (params) => {
+    const res = await v2TreePositionByDepartment(params)
+    if (res.status === 0) {
+      departmentAllPositions.value = res.data.data
+    }
+  }
+
   const getPositionsTree = async () => {
     const res = await departmentV2AllPosition()
     if (res.status === 0) {
@@ -33,9 +49,9 @@ export const useGroupTypeStore = createGlobalState(() => {
     }
   }
 
-  const getDepMembers= async(param)=>{
+  const getDepMembers = async (param) => {
     const res = await userV2List(param)
-    return res;
+    return res
   }
 
   const resetGroupInfo = () => {
@@ -100,7 +116,9 @@ export const useGroupTypeStore = createGlobalState(() => {
     groupActiveIndex,
     depTreeMyList,
     postTreeList,
+    departmentAllPositions,
     getDepsTreeMy,
+    getPositionByDepartment,
     getPositionsTree,
     crumbs,
     crumbsIndex,
@@ -111,6 +129,6 @@ export const useGroupTypeStore = createGlobalState(() => {
     getDepMembers,
     membersCheckedKeys,
     allChooseMembers,
-    getDepartmentPositionsById
+    getDepartmentPositionsById,
   }
 })
diff --git a/src/store/modules/dialogue.js b/src/store/modules/dialogue.js
index 369d046..9b454cf 100644
--- a/src/store/modules/dialogue.js
+++ b/src/store/modules/dialogue.js
@@ -73,7 +73,7 @@ export const useDialogueStore = defineStore('dialogue', {
     getSilenceMember: (state) =>
       state.members.filter((item) => item.is_mute === 1),
     //获取群管理员
-    getAdminList: (state) => state.members.filter((item) => item.leader === 1),
+    getAdminList: (state) => state.members.filter((item) => (item.leader === 1 || item.leader === 2)),
   },
   actions: {
     // 更新在线状态
diff --git a/src/store/modules/group.js b/src/store/modules/group.js
index 02dd11a..53b62b8 100644
--- a/src/store/modules/group.js
+++ b/src/store/modules/group.js
@@ -41,7 +41,11 @@ export const useGroupStore = defineStore('group', {
                   positionInfo.position_id,
                 )
                 if (deptPosItem) {
-                  deptPosArr.push(deptPosItem)
+                  deptPosArr.push({
+                    deptPos: deptPosItem,
+                    dept_id: deptInfo.dept_id,
+                    position_id: positionInfo.position_id,
+                  })
                 }
               })
             })
diff --git a/src/uni_modules/tmui/locale/zh-Hans.json b/src/uni_modules/tmui/locale/zh-Hans.json
index 30ab11c..ebf526b 100644
--- a/src/uni_modules/tmui/locale/zh-Hans.json
+++ b/src/uni_modules/tmui/locale/zh-Hans.json
@@ -130,5 +130,6 @@
   "groupNotice.confirm.clear": "清空",
   "groupNotice.quit.edit": "退出本次编辑",
   "groupNotice.continue.edit": "继续编辑",
-  "groupNotice.confirm.quit": "退出"
+  "groupNotice.confirm.quit": "退出",
+  "chatSettings.btn.removeAdmin": "移除"
 }