1.0.3 的相关功能

src/views/admin/user/index.vue

@@ -14,6 +14,9 @@
           </el-select>
         </el-form-item>
       </div>
+      <el-button type="primary" @click="leaveUserfn">
+        <i class="iconfont-sys">&#xe794;</i> 离职客户分配
+      </el-button>
     </div>
     <div class="boxshadow">
       <!-- 表格 -->
@@ -27,7 +30,7 @@
         :total="pagination.total"
         @size-change="handleSizeChange"
         @current-change="handleCurrentChange"
-        lass="customer-table"
+        class="customer-table"
       >
         <template #default>
           <!-- <el-table-column prop="id" label="用户ID" align="center" /> -->
@@ -117,7 +120,7 @@
         @selection-change="handleSelectionChange"
         @size-change="handleSizeChangekh"
         @current-change="handleCurrentChangekh"
-        lass="customer-table"
+        class="customer-table"
       >
         <template #default>
           <el-table-column type="selection" width="55px" align="center"></el-table-column>
@@ -227,39 +230,38 @@
     :hide-on-click-modal="true"
     @close="showImageViewer = false"
   />
-  <ElDialog
-    v-model="permissionDialog"
-    title="菜单权限"
-    width="520px"
-    align-center
-    class="el-dialog-border"
-  >
-    <ElScrollbar height="70vh">
-      <ElTree
-        ref="treeRef"
-        :data="processedMenuList"
-        show-checkbox
-        node-key="id"
-        :default-expand-all="isExpandAll"
-        :props="defaultProps"
-        @check="handleTreeCheck"
+  <ElDialog v-model="permissionDialog" title="菜单权限" align-center>
+    <el-tabs v-model="activeName" class="demo-tabs">
+      <el-tab-pane
+        v-for="sys in systemsList"
+        :key="sys.id"
+        :label="sys.name"
+        :name="String(sys.id)"
       >
-        <template #default="{ data }">
-          <div style="display: flex; align-items: center">
-            <span v-if="data.isAuth">
-              {{ data.label }}
-            </span>
-            <span v-else>{{ defaultProps.label(data) }}</span>
-          </div>
-        </template>
-      </ElTree>
-    </ElScrollbar>
+        <ElScrollbar height="70vh">
+          <ElTree
+            :ref="(el: any) => setTreeRef(sys.id, el)"
+            :data="processedMenuBySystem[sys.id] || []"
+            show-checkbox
+            node-key="id"
+            :default-expand-all="isExpandAll"
+            :props="defaultProps"
+            @check="() => handleTreeCheck(sys.id)"
+          >
+            <template #default="{ data }">
+              <div style="display: flex; align-items: center">
+                <span v-if="data.isAuth">
+                  {{ data.label }}
+                </span>
+                <span v-else>{{ defaultProps.label(data) }}</span>
+              </div>
+            </template>
+          </ElTree>
+        </ElScrollbar>
+      </el-tab-pane>
+    </el-tabs>
     <template #footer>
       <div class="dialog-footer">
-        <ElButton @click="toggleExpandAll">{{ isExpandAll ? '全部收起' : '全部展开' }}</ElButton>
-        <ElButton @click="toggleSelectAll" style="margin-left: 8px">{{
-          isSelectAll ? '取消全选' : '全部选择'
-        }}</ElButton>
         <ElButton type="primary" @click="savePermission">保存</ElButton>
       </div>
     </template>
@@ -318,17 +320,69 @@
       </div>
     </el-form>
   </el-dialog>
+  <!-- 离职客户分配对话框 -->
+  <el-dialog
+    title="离职客户分配"
+    v-model="leaveUserDialogVisible"
+    width="500px"
+    :close-on-click-modal="false"
+  >
+    <el-form :model="leaveUserForm" ref="leaveUserFormRef" label-width="80px" class="add-form">
+      <el-row :gutter="16">
+        <el-col :span="24">
+          <el-form-item label="公司" prop="corp_id">
+            <el-select
+              v-model="leaveUserForm.corp_id"
+              filterable
+              placeholder="请选择公司"
+              style="width: 100%"
+            >
+              <el-option
+                v-for="item in companyList"
+                :key="item.id"
+                :label="item.name"
+                :value="item.id"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="24">
+          <el-form-item label="用户" prop="user_id">
+            <el-select
+              v-model="leaveUserForm.user_id"
+              multiple
+              filterable
+              placeholder="请选择要分配的用户"
+              style="width: 100%"
+            >
+              <el-option
+                v-for="item in companyUserList"
+                :key="item.id"
+                :label="item.name"
+                :value="item.id"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <div class="form-submit-row">
+        <el-button @click="leaveUserDialogVisible = false">取消</el-button>
+        <el-button type="primary" @click="handleLeaveUserSubmit">确定</el-button>
+      </div>
+    </el-form>
+  </el-dialog>
 </template>
 
 <script setup lang="ts">
-  import { ref, reactive, onMounted, watch } from 'vue'
-  import { ElImageViewer } from 'element-plus'
+  import { ref, reactive, onMounted, watch, computed, nextTick } from 'vue'
+  import { ElImageViewer, ElMessage } from 'element-plus'
   import { manageService } from '@/api/adminApi'
   import { useAuth } from '@/composables/useAuth'
   import { systemService } from '@/api/systemApi'
   import { formatMenuTitle } from '@/router/utils/utils'
   import { UserService } from '@/api/usersApi'
   const { hasAuth } = useAuth()
+  const activeName = ref('1')
   const selectValue = ref<string[]>([])
   const keyword = ref<string>('')
   const loading = ref(false)
@@ -338,8 +392,18 @@
   const AddDialogVisible = ref(false)
   const permissionDialog = ref(false)
   const roleDialogVisible = ref(false)
+  const leaveUserDialogVisible = ref(false)
   // 权限树数据（来自接口 getPermissionMenuList）
   const permissionMenuList = ref<any[]>([])
+  const permissionMenuListwork = ref<any[]>([])
+  const permissionMenuListcrm = ref<any[]>([])
+  // 精简后的多系统映射
+  const permissionMenuBySystem = reactive<Record<number, any[]>>({})
+  const processedMenuBySystem = reactive<Record<number, any[]>>({})
+  const treeRefs = reactive<Record<number, any>>({})
+  const setTreeRef = (systemId: number, el: any) => {
+    if (el) treeRefs[systemId] = el
+  }
   const treeRef = ref()
   const isExpandAll = ref(true)
   const isSelectAll = ref(false)
@@ -373,13 +437,29 @@
     role_ids: '',
     system_ids: ''
   })
+  const leaveUserForm = reactive({
+    corp_id: '',
+    user_id: []
+  })
   const userOptions = ref<any>()
   //系统
   const systemsList = ref<any>()
+  const companyList = ref<any>()
+  const companyUserList = ref<any>()
   const getsystemsList = async () => {
     const response = await UserService.getsystemsList()
     systemsList.value = response || []
   }
+  // 获取公司列表
+  const getCompanyList = async () => {
+    const response = await UserService.getCompanyList()
+    companyList.value = response || []
+  }
+  // 获取用户列表
+  const getCompanyUserList = async () => {
+    const response = await manageService.presetusers()
+    companyUserList.value = response || []
+  }
   //角色下拉框
   const roleOptions = ref<any>()
   const getroleOptions = async () => {
@@ -502,25 +582,50 @@
     permissionDialog.value = true
     userId.value = row.id
     try {
-      const res = await systemService.getPermissionMenuList({ user_id: row.id })
-      // 兼容不同返回结构（data/records/直接数组）
-      const list = (res as any)?.data ?? (res as any)?.records ?? (res as any)
-      permissionMenuList.value = Array.isArray(list) ? list : []
-      // 根据接口返回的 selected 字段设置默认选中
+      await getsystemsList()
+      // 并行请求所选用户的各系统权限
+      const sysIds = (systemsList.value || []).map((s: any) => s.id)
+      const results = await Promise.all(
+        sysIds.map((id: number) =>
+          systemService.getPermissionMenuList({ user_id: row.id, system_id: id })
+        )
+      )
+      sysIds.forEach((id: number, idx: number) => {
+        const raw = results[idx] as any
+        const list = raw?.data ?? raw?.records ?? raw
+        permissionMenuBySystem[id] = Array.isArray(list) ? list : []
+        processedMenuBySystem[id] = buildProcessedMenu(permissionMenuBySystem[id])
+      })
+      // 兼容旧变量，避免其它逻辑引用报错
+      permissionMenuList.value = permissionMenuBySystem[1] || []
+      permissionMenuListwork.value = permissionMenuBySystem[2] || []
+      permissionMenuListcrm.value = permissionMenuBySystem[3] || []
+      // 设置默认选中
       nextTick(() => {
-        const keys = buildDefaultCheckedKeys(permissionMenuList.value)
-        treeRef.value?.setCheckedKeys(keys)
-        handleTreeCheck()
+        sysIds.forEach((id: number) => {
+          const keys = buildDefaultCheckedKeys(permissionMenuBySystem[id] || [])
+          treeRefs[id]?.setCheckedKeys?.(keys)
+          handleTreeCheck(id)
+        })
       })
     } catch (e) {
+      ;(systemsList.value || []).forEach((s: any) => {
+        permissionMenuBySystem[s.id] = []
+        processedMenuBySystem[s.id] = []
+      })
       permissionMenuList.value = []
+      permissionMenuListwork.value = []
+      permissionMenuListcrm.value = []
     }
   }
   // 构建默认选中的 key 列表（与 node-key="id" 一致）
   const buildDefaultCheckedKeys = (source: any[]): Array<string | number> => {
     const keys: Array<string | number> = []
     const walk = (node: any) => {
-      if (node?.meta?.selected) {
+      const hasChildren = Array.isArray(node?.children) && node.children.length > 0
+      const hasAuths = Array.isArray(node?.meta?.authList) && node.meta.authList.length > 0
+      // 仅当没有子节点且没有权限子项时，才勾选父节点，避免级联误选
+      if (node?.meta?.selected && !hasChildren && !hasAuths) {
         keys.push(node.id)
       }
       if (Array.isArray(node?.meta?.authList)) {
@@ -530,7 +635,7 @@
           }
         })
       }
-      if (Array.isArray(node?.children)) node.children.forEach(walk)
+      if (hasChildren) node.children.forEach(walk)
     }
     source.forEach(walk)
     return keys
@@ -568,11 +673,29 @@
     const source = permissionMenuList.value || []
     return source.map(processNode)
   })
-
   const defaultProps = {
     children: 'children',
     label: (data: any) => formatMenuTitle(data.meta?.title) || ''
   }
+  // 通用：处理节点，展开权限为子节点
+  const processNode = (node: any) => {
+    const processed: any = { ...node, id: node.id }
+    if (node.meta && node.meta.authList && node.meta.authList.length) {
+      const authNodes = node.meta.authList.map((auth: any) => ({
+        id: `${node.id}__auth__${auth.authMark}`,
+        name: `${node.name}_${auth.authMark}`,
+        label: auth.title,
+        auth_mark: auth.authMark,
+        auth_id: auth.id,
+        isAuth: true,
+        checked: auth.selected || false
+      }))
+      processed.children = processed.children ? [...processed.children, ...authNodes] : authNodes
+    }
+    if (processed.children) processed.children = processed.children.map(processNode)
+    return processed
+  }
+  const buildProcessedMenu = (source: any[]) => (source || []).map(processNode)
   const toggleExpandAll = () => {
     const tree = treeRef.value
     if (!tree) return
@@ -616,47 +739,36 @@
     traverse(nodes)
     return keys
   }
-  const handleTreeCheck = () => {
-    const tree = treeRef.value
+  const handleTreeCheck = (systemId?: number) => {
+    const sysId = systemId ?? Number(activeName.value)
+    const tree = treeRefs[sysId] || treeRef.value
     if (!tree) return
-
-    // 使用树组件的getCheckedKeys方法获取选中的节点
-    const checkedKeys = tree.getCheckedKeys()
-    const allKeys = getAllNodeKeys(processedMenuList.value)
-
-    // 判断是否全选：选中的节点数量等于总节点数量
+    const checkedKeys = tree.getCheckedKeys?.() || []
+    const allKeys = getAllNodeKeys(processedMenuBySystem[sysId] || [])
     isSelectAll.value = checkedKeys.length === allKeys.length && allKeys.length > 0
   }
-  const getSelectedIds = () => {
-    const tree = treeRef.value
-    if (!tree) return { menuIds: [], authIds: [] }
-
+  const getSelectedIdsBySystem = (systemId: number) => {
+    const tree = treeRefs[systemId]
+    if (!tree) return [] as (string | number)[]
     const checkedNodes = tree.getCheckedNodes?.(false) || []
     const halfCheckedNodes = tree.getHalfCheckedNodes?.() || []
     const allNodes = [...checkedNodes, ...halfCheckedNodes]
-
     const menuIds = Array.from(
-      new Set(
-        allNodes
-          .filter((n: any) => !n.isAuth && n.id !== undefined && n.id !== null)
-          .map((n: any) => n.id)
-      )
+      new Set(allNodes.filter((n: any) => !n.isAuth && n.id != null).map((n: any) => n.id))
     )
     const authIds = Array.from(
       new Set(
         checkedNodes.filter((n: any) => n.isAuth && n.auth_id != null).map((n: any) => n.auth_id)
       )
     )
-
-    const ids = Array.from(new Set([...(menuIds as any[]), ...(authIds as any[])]))
-    return { menuIds, authIds, ids }
+    return Array.from(new Set([...(menuIds as any[]), ...(authIds as any[])]))
   }
-
   const savePermission = async () => {
-    const { ids } = getSelectedIds()
+    const sysIds = (systemsList.value || []).map((s: any) => s.id)
+    const idall = Array.from(new Set(sysIds.flatMap((id: number) => getSelectedIdsBySystem(id))))
     const res = await manageService.userMenuAuth({
       user_id: userId.value,
-      resources: ids
+      resources: idall
     })
     ElMessage.success(res?.message || '权限保存成功')
     permissionDialog.value = false
@@ -714,6 +826,42 @@
       showImageViewer.value = true
     }
   }
+  //离职客户分配
+  const leaveUserfn = () => {
+    getCompanyList()
+    getCompanyUserList()
+    leaveUserDialogVisible.value = true
+    leaveUserForm.corp_id = ''
+    leaveUserForm.user_id = []
+    companyUserList.value = []
+  }
+  // 提交离职客户分配
+  const handleLeaveUserSubmit = async () => {
+    if (!leaveUserForm.corp_id) {
+      ElMessage.warning('请选择公司')
+      return
+    }
+    if (!leaveUserForm.user_id || leaveUserForm.user_id.length === 0) {
+      ElMessage.warning('请选择用户')
+      return
+    }
+    
+    try {
+      // 将 user_id 数组转换为逗号分隔的字符串
+      const submitData = {
+        ...leaveUserForm,
+        user_id: leaveUserForm.user_id.join(',')
+      }
+      
+      // 这里调用离职客户分配的API
+      const res = await UserService.leaveUser(submitData)
+      ElMessage.success(res?.message || '离职客户分配成功')
+      leaveUserDialogVisible.value = false
+      gettableList()
+    } catch (error) {
+      console.error('离职客户分配失败:', error)
+    }
+  }
 </script>
 
 <style scoped lang="scss">