From 39e9e8220d390a6f61c5bde68e1da22613adaf94 Mon Sep 17 00:00:00 2001
From: zhontai <361243234@qq.com>
Date: Sun, 15 Dec 2024 19:42:44 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=9E=E7=8E=B0=E7=94=A8=E6=88=B7=E9=83=A8?=
 =?UTF-8?q?=E9=97=A8=E8=BD=AC=E7=A7=BB=E5=8A=9F=E8=83=BD=20=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4=EF=BC=9A=E7=94=A8=E6=88=B7=E4=BF=AE=E6=94=B9=E5=8F=96?=
 =?UTF-8?q?=E6=B6=88=E9=83=A8=E9=97=A8=E8=AE=BE=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Services/User/Dto/UserAddInput.cs         |  10 +
 .../Services/User/Dto/UserBatchSetOrgInput.cs |  22 ++
 .../Services/User/Dto/UserFormInput.cs        |  10 -
 .../Services/User/Dto/UserGetOutput.cs        |  10 -
 .../Services/User/UserService.cs              |  69 ++++--
 .../src/api/admin/User.ts                     |  19 ++
 .../src/api/admin/data-contracts.ts           |  49 ++--
 .../src/layout/navBars/topBar/user.vue        |   2 +-
 .../views/admin/user/components/user-form.vue |   2 -
 .../admin/user/components/user-set-org.vue    | 181 +++++++++++++++
 .../user/components/user-update-form.vue      | 211 ++++++++++++++++++
 .../src/views/admin/user/index.vue            |  53 ++++-
 12 files changed, 561 insertions(+), 77 deletions(-)
 create mode 100644 src/modules/admin/ZhonTai.Admin/Services/User/Dto/UserBatchSetOrgInput.cs
 create mode 100644 ui/zhontai.ui.admin.vue3/src/views/admin/user/components/user-set-org.vue
 create mode 100644 ui/zhontai.ui.admin.vue3/src/views/admin/user/components/user-update-form.vue

diff --git a/src/modules/admin/ZhonTai.Admin/Services/User/Dto/UserAddInput.cs b/src/modules/admin/ZhonTai.Admin/Services/User/Dto/UserAddInput.cs
index f0d3ce68..338ae5fc 100644
--- a/src/modules/admin/ZhonTai.Admin/Services/User/Dto/UserAddInput.cs
+++ b/src/modules/admin/ZhonTai.Admin/Services/User/Dto/UserAddInput.cs
@@ -5,6 +5,16 @@
 /// </summary>
 public class UserAddInput: UserFormInput
 {
+    /// <summary>
+    /// 所属部门Ids
+    /// </summary>
+    public virtual long[] OrgIds { get; set; }
+
+    /// <summary>
+    /// 主属部门Id
+    /// </summary>
+    public long OrgId { get; set; }
+
     /// <summary>
     /// 密码
     /// </summary>
diff --git a/src/modules/admin/ZhonTai.Admin/Services/User/Dto/UserBatchSetOrgInput.cs b/src/modules/admin/ZhonTai.Admin/Services/User/Dto/UserBatchSetOrgInput.cs
new file mode 100644
index 00000000..7a27fa96
--- /dev/null
+++ b/src/modules/admin/ZhonTai.Admin/Services/User/Dto/UserBatchSetOrgInput.cs
@@ -0,0 +1,22 @@
+namespace ZhonTai.Admin.Services.User.Dto;
+
+/// <summary>
+/// 批量设置部门
+/// </summary>
+public class UserBatchSetOrgInput
+{
+    /// <summary>
+    /// 用户Id列表
+    /// </summary>
+    public long[] UserIds { get; set; }
+
+    /// <summary>
+    /// 所属部门Ids
+    /// </summary>
+    public virtual long[] OrgIds { get; set; }
+
+    /// <summary>
+    /// 主属部门Id
+    /// </summary>
+    public long OrgId { get; set; }
+}
\ No newline at end of file
diff --git a/src/modules/admin/ZhonTai.Admin/Services/User/Dto/UserFormInput.cs b/src/modules/admin/ZhonTai.Admin/Services/User/Dto/UserFormInput.cs
index fb4b73a1..ad1c4816 100644
--- a/src/modules/admin/ZhonTai.Admin/Services/User/Dto/UserFormInput.cs
+++ b/src/modules/admin/ZhonTai.Admin/Services/User/Dto/UserFormInput.cs
@@ -40,16 +40,6 @@ public class UserFormInput
     /// </summary>
     public virtual long[] RoleIds { get; set; }
 
-    /// <summary>
-    /// 所属部门Ids
-    /// </summary>
-    public virtual long[] OrgIds { get; set; }
-
-    /// <summary>
-    /// 主属部门Id
-    /// </summary>
-    public long OrgId { get; set; }
-
     /// <summary>
     /// 直属主管Id
     /// </summary>
diff --git a/src/modules/admin/ZhonTai.Admin/Services/User/Dto/UserGetOutput.cs b/src/modules/admin/ZhonTai.Admin/Services/User/Dto/UserGetOutput.cs
index 11709e38..8b413a59 100644
--- a/src/modules/admin/ZhonTai.Admin/Services/User/Dto/UserGetOutput.cs
+++ b/src/modules/admin/ZhonTai.Admin/Services/User/Dto/UserGetOutput.cs
@@ -10,16 +10,6 @@ public class UserGetOutput : UserUpdateInput
     /// </summary>
     public ICollection<UserGetRoleDto> Roles { get; set; }
 
-    /// <summary>
-    /// 部门列表
-    /// </summary>
-    public ICollection<UserGetOrgDto> Orgs { get; set; }
-
-    /// <summary>
-    /// 所属部门Ids
-    /// </summary>
-    public override long[] OrgIds => Orgs?.Select(a => a.Id)?.ToArray();
-
     /// <summary>
     /// 角色Ids
     /// </summary>
diff --git a/src/modules/admin/ZhonTai.Admin/Services/User/UserService.cs b/src/modules/admin/ZhonTai.Admin/Services/User/UserService.cs
index 462ee845..aee94bc2 100644
--- a/src/modules/admin/ZhonTai.Admin/Services/User/UserService.cs
+++ b/src/modules/admin/ZhonTai.Admin/Services/User/UserService.cs
@@ -40,6 +40,7 @@
 using ZhonTai.Admin.Resources;
 using ZhonTai.Admin.Domain.Permission;
 using Microsoft.Extensions.Options;
+using ZhonTai.Admin.Core.Db;
 
 namespace ZhonTai.Admin.Services.User;
 
@@ -594,26 +595,6 @@ public virtual async Task UpdateAsync(UserUpdateInput input)
             await _userStaffRep.InsertAsync(staff);
         }
 
-        //所属部门
-        var orgIds = await _userOrgRep.Select.Where(a => a.UserId == userId).ToListAsync(a => a.OrgId);
-        var insertOrgIds = input.OrgIds.Except(orgIds);
-
-        var deleteOrgIds = orgIds.Except(input.OrgIds);
-        if (deleteOrgIds != null && deleteOrgIds.Any())
-        {
-            await _userOrgRep.DeleteAsync(a => a.UserId == userId && deleteOrgIds.Contains(a.OrgId));
-        }
-
-        if (insertOrgIds != null && insertOrgIds.Any())
-        {
-            var orgs = insertOrgIds.Select(orgId => new UserOrgEntity
-            {
-                UserId = userId,
-                OrgId = orgId
-            }).ToList();
-            await _userOrgRep.InsertAsync(orgs);
-        }
-
         await Cache.DelByPatternAsync(CacheKeys.GetDataPermissionPattern(userId));
     }
 
@@ -833,6 +814,54 @@ public async Task SetEnableAsync(UserSetEnableInput input)
         await _userRep.UpdateAsync(entity);
     }
 
+    /// <summary>
+    /// 批量设置部门
+    /// </summary>
+    /// <returns></returns>
+    [AdminTransaction]
+    public virtual async Task BatchSetOrgAsync(UserBatchSetOrgInput input)
+    {
+        //主属部门
+        await _userRep.UpdateDiy.Set(a => new UserEntity
+        {
+            OrgId = input.OrgId,
+            ModifiedUserId = User.Id,
+            ModifiedUserName = User.UserName,
+            ModifiedUserRealName = User.Name,
+            ModifiedTime = DbHelper.ServerTime,
+        })
+       .Where(a => a.Id.In(input.UserIds))
+       .ExecuteAffrowsAsync();
+
+        //所属部门
+        var orgIds = await _userOrgRep.Select.Where(a => a.UserId.In(input.UserIds)).ToListAsync(a => a.OrgId);
+        var insertOrgIds = input.OrgIds.Except(orgIds);
+
+        var deleteOrgIds = orgIds.Except(input.OrgIds).ToArray();
+        if (deleteOrgIds != null && deleteOrgIds.Any())
+        {
+            await _userOrgRep.DeleteAsync(a => a.UserId.In(input.UserIds) && a.OrgId.In(deleteOrgIds));
+        }
+
+        if (insertOrgIds != null && insertOrgIds.Any())
+        {
+            var orgs = new List<UserOrgEntity>();
+            foreach (var userId in input.UserIds)
+            {
+                orgs.AddRange(insertOrgIds.Select(orgId => new UserOrgEntity
+                {
+                    UserId = userId,
+                    OrgId = orgId
+                }).ToList());
+            }
+          
+            await _userOrgRep.InsertAsync(orgs);
+        }
+
+        //发送cap消息
+
+    }
+
     /// <summary>
     /// 彻底删除用户
     /// </summary>
diff --git a/ui/zhontai.ui.admin.vue3/src/api/admin/User.ts b/ui/zhontai.ui.admin.vue3/src/api/admin/User.ts
index 051f259f..eda00d2a 100644
--- a/ui/zhontai.ui.admin.vue3/src/api/admin/User.ts
+++ b/ui/zhontai.ui.admin.vue3/src/api/admin/User.ts
@@ -21,6 +21,7 @@ import {
   ResultOutputUserGetPermissionOutput,
   UserAddInput,
   UserAddMemberInput,
+  UserBatchSetOrgInput,
   UserChangePasswordInput,
   UserResetPasswordInput,
   UserSetEnableInput,
@@ -274,6 +275,24 @@ export class UserApi<SecurityDataType = unknown> extends HttpClient<SecurityData
       type: ContentType.Json,
       ...params,
     })
+  /**
+   * No description
+   *
+   * @tags user
+   * @name BatchSetOrg
+   * @summary 批量设置部门
+   * @request PUT:/api/admin/user/batch-set-org
+   * @secure
+   */
+  batchSetOrg = (data: UserBatchSetOrgInput, params: RequestParams = {}) =>
+    this.request<AxiosResponse, any>({
+      path: `/api/admin/user/batch-set-org`,
+      method: 'PUT',
+      body: data,
+      secure: true,
+      type: ContentType.Json,
+      ...params,
+    })
   /**
    * No description
    *
diff --git a/ui/zhontai.ui.admin.vue3/src/api/admin/data-contracts.ts b/ui/zhontai.ui.admin.vue3/src/api/admin/data-contracts.ts
index c035837c..d7ee9af3 100644
--- a/ui/zhontai.ui.admin.vue3/src/api/admin/data-contracts.ts
+++ b/ui/zhontai.ui.admin.vue3/src/api/admin/data-contracts.ts
@@ -5002,13 +5002,6 @@ export interface UserAddInput {
   email?: string | null
   /** 角色Ids */
   roleIds?: number[] | null
-  /** 所属部门Ids */
-  orgIds?: number[] | null
-  /**
-   * 主属部门Id
-   * @format int64
-   */
-  orgId?: number
   /**
    * 直属主管Id
    * @format int64
@@ -5018,6 +5011,13 @@ export interface UserAddInput {
   managerUserName?: string | null
   /** 员工添加 */
   staff: StaffAddInput
+  /** 所属部门Ids */
+  orgIds?: number[] | null
+  /**
+   * 主属部门Id
+   * @format int64
+   */
+  orgId?: number
   /** 密码 */
   password?: string | null
   /** 启用 */
@@ -5051,6 +5051,19 @@ export interface UserAddMemberInput {
   status?: UserStatus
 }
 
+/** 批量设置部门 */
+export interface UserBatchSetOrgInput {
+  /** 用户Id列表 */
+  userIds?: number[] | null
+  /** 所属部门Ids */
+  orgIds?: number[] | null
+  /**
+   * 主属部门Id
+   * @format int64
+   */
+  orgId?: number
+}
+
 /** 修改密码 */
 export interface UserChangePasswordInput {
   /**
@@ -5209,12 +5222,6 @@ export interface UserGetBasicOutput {
   lastLoginCity?: string | null
 }
 
-export interface UserGetOrgDto {
-  /** @format int64 */
-  id?: number
-  name?: string | null
-}
-
 export interface UserGetOutput {
   /**
    * 账号
@@ -5230,11 +5237,6 @@ export interface UserGetOutput {
   mobile?: string | null
   /** 邮箱 */
   email?: string | null
-  /**
-   * 主属部门Id
-   * @format int64
-   */
-  orgId?: number
   /**
    * 直属主管Id
    * @format int64
@@ -5251,10 +5253,6 @@ export interface UserGetOutput {
   id: number
   /** 角色列表 */
   roles?: UserGetRoleDto[] | null
-  /** 部门列表 */
-  orgs?: UserGetOrgDto[] | null
-  /** 所属部门Ids */
-  orgIds?: number[] | null
   /** 角色Ids */
   roleIds?: number[] | null
 }
@@ -5464,13 +5462,6 @@ export interface UserUpdateInput {
   email?: string | null
   /** 角色Ids */
   roleIds?: number[] | null
-  /** 所属部门Ids */
-  orgIds?: number[] | null
-  /**
-   * 主属部门Id
-   * @format int64
-   */
-  orgId?: number
   /**
    * 直属主管Id
    * @format int64
diff --git a/ui/zhontai.ui.admin.vue3/src/layout/navBars/topBar/user.vue b/ui/zhontai.ui.admin.vue3/src/layout/navBars/topBar/user.vue
index cb15bb6e..dda07b0a 100644
--- a/ui/zhontai.ui.admin.vue3/src/layout/navBars/topBar/user.vue
+++ b/ui/zhontai.ui.admin.vue3/src/layout/navBars/topBar/user.vue
@@ -208,7 +208,7 @@ const checkUnreadMsg = async () => {
     state.unread = res.data
   }
 }
-const initWebSocket = async () => {
+const initWebSocket = () => {
   wsClient.value = new WebSocketClient({
     onMessage: (event: MessageEvent) => {
       if (event.data) {
diff --git a/ui/zhontai.ui.admin.vue3/src/views/admin/user/components/user-form.vue b/ui/zhontai.ui.admin.vue3/src/views/admin/user/components/user-form.vue
index 5013ef80..5273ecf6 100644
--- a/ui/zhontai.ui.admin.vue3/src/views/admin/user/components/user-form.vue
+++ b/ui/zhontai.ui.admin.vue3/src/views/admin/user/components/user-form.vue
@@ -262,8 +262,6 @@ const open = async (row: UserUpdateInput & UserUpdateInput) => {
     }
   } else {
     state.form = {
-      orgIds: row.orgIds,
-      orgId: row.orgId,
       roleIds: [] as number[],
       staff: {},
     } as UserAddInput & UserUpdateInput
diff --git a/ui/zhontai.ui.admin.vue3/src/views/admin/user/components/user-set-org.vue b/ui/zhontai.ui.admin.vue3/src/views/admin/user/components/user-set-org.vue
new file mode 100644
index 00000000..aae8a468
--- /dev/null
+++ b/ui/zhontai.ui.admin.vue3/src/views/admin/user/components/user-set-org.vue
@@ -0,0 +1,181 @@
+<template>
+  <div>
+    <el-dialog
+      v-model="state.showDialog"
+      destroy-on-close
+      :title="title"
+      draggable
+      :close-on-click-modal="false"
+      :close-on-press-escape="false"
+      width="769px"
+    >
+      <el-form ref="formRef" :model="form" size="default" label-width="80px">
+        <el-row :gutter="35">
+          <el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24">
+            <el-form-item label="部门" prop="orgIds" :rules="[{ required: true, message: '请选择部门', trigger: ['change'] }]">
+              <el-tree-select
+                ref="orgTreeSelectRef"
+                v-model="form.orgIds"
+                placeholder="请选择部门"
+                :data="state.orgTreeData"
+                node-key="id"
+                :props="{ label: 'name' }"
+                check-strictly
+                default-expand-all
+                render-after-expand
+                fit-input-width
+                clearable
+                multiple
+                collapse-tags
+                collapse-tags-tooltip
+                filterable
+                class="w100"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24">
+            <el-form-item label="主属部门" prop="orgId" :rules="[{ required: true, message: '请选择主属部门', trigger: ['change'] }]">
+              <el-select v-model="form.orgId" placeholder="请选择主属部门" class="w100">
+                <el-option v-for="item in state.orgs" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <template #footer>
+        <span class="dialog-footer">
+          <el-button @click="onCancel" size="default">取 消</el-button>
+          <el-button type="primary" @click="onSure" size="default" :loading="state.sureLoading">确 定</el-button>
+        </span>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+
+<script lang="ts" setup name="admin/user/form">
+import { reactive, toRefs, getCurrentInstance, ref, watch } from 'vue'
+import { UserBatchSetOrgInput, OrgListOutput } from '/@/api/admin/data-contracts'
+import { UserApi } from '/@/api/admin/User'
+import { OrgApi } from '/@/api/admin/Org'
+import { listToTree, treeToList } from '/@/utils/tree'
+import { cloneDeep } from 'lodash-es'
+import eventBus from '/@/utils/mitt'
+import { FormInstance } from 'element-plus'
+
+const userIds = defineModel('userIds', { type: Array, default: [] })
+
+defineProps({
+  title: {
+    type: String,
+    default: '部门转移',
+  },
+})
+
+const { proxy } = getCurrentInstance() as any
+
+const orgTreeSelectRef = ref()
+const formRef = ref<FormInstance>()
+const state = reactive({
+  showDialog: false,
+  sureLoading: false,
+  form: {
+    userIds: userIds.value as number[],
+  } as UserBatchSetOrgInput,
+  orgs: [] as any,
+  orgTreeData: [] as OrgListOutput[],
+})
+const { form } = toRefs(state)
+
+watch(
+  () => state.form.orgIds,
+  (value) => {
+    if (value && value.length > 0) {
+      let orgs = [] as any
+      treeToList(cloneDeep(state.orgTreeData)).forEach((a: any) => {
+        if (value.some((b) => a.id === b)) {
+          orgs.push(a)
+        }
+      })
+      state.orgs = orgs
+    } else {
+      state.orgs = []
+    }
+  },
+  {
+    immediate: true,
+  }
+)
+
+watch(
+  () => state.orgs,
+  () => {
+    if (state.orgs?.some((a: any) => a.id === state.form.orgId)) {
+      return
+    }
+    state.form.orgId = state.orgs && state.orgs.length > 0 ? state.orgs[0].id : undefined
+  },
+  {
+    immediate: true,
+    deep: true,
+  }
+)
+
+const getOrgs = async () => {
+  const res = await new OrgApi().getList().catch(() => {
+    state.orgTreeData = []
+  })
+  if (res?.success && res.data && res.data.length > 0) {
+    state.orgTreeData = listToTree(res.data)
+  } else {
+    state.orgTreeData = []
+  }
+}
+
+// 打开对话框
+const open = async () => {
+  proxy.$modal.loading()
+  state.form.orgId = undefined
+  state.form.orgIds = []
+  await getOrgs()
+
+  proxy.$modal.closeLoading()
+  state.showDialog = true
+}
+
+// 取消
+const onCancel = () => {
+  state.showDialog = false
+}
+
+// 确定
+const onSure = () => {
+  formRef.value!.validate(async (valid: boolean) => {
+    if (!valid) return
+
+    state.sureLoading = true
+    let res = {} as any
+    res = await new UserApi()
+      .batchSetOrg(
+        {
+          userIds: userIds.value as number[],
+          orgIds: state.form.orgIds,
+          orgId: state.form.orgId,
+        },
+        { showSuccessMessage: true }
+      )
+      .catch(() => {
+        state.sureLoading = false
+      })
+    state.sureLoading = false
+
+    if (res?.success) {
+      eventBus.emit('refreshUser')
+      state.showDialog = false
+    }
+  })
+}
+
+defineExpose({
+  open,
+})
+</script>
diff --git a/ui/zhontai.ui.admin.vue3/src/views/admin/user/components/user-update-form.vue b/ui/zhontai.ui.admin.vue3/src/views/admin/user/components/user-update-form.vue
new file mode 100644
index 00000000..6767042a
--- /dev/null
+++ b/ui/zhontai.ui.admin.vue3/src/views/admin/user/components/user-update-form.vue
@@ -0,0 +1,211 @@
+<template>
+  <div>
+    <el-dialog
+      v-model="state.showDialog"
+      destroy-on-close
+      :title="title"
+      draggable
+      :close-on-click-modal="false"
+      :close-on-press-escape="false"
+      width="769px"
+    >
+      <el-form ref="formRef" :model="form" size="default" label-width="80px">
+        <el-row :gutter="35">
+          <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12">
+            <el-form-item label="姓名" prop="name" :rules="[{ required: true, message: '请输入姓名', trigger: ['blur', 'change'] }]">
+              <el-input v-model="form.name" autocomplete="off" />
+            </el-form-item>
+          </el-col>
+          <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12">
+            <el-form-item
+              label="手机号"
+              prop="mobile"
+              :rules="[
+                { required: true, message: '请输入手机号', trigger: ['blur', 'change'] },
+                { validator: testMobile, trigger: ['blur', 'change'] },
+              ]"
+            >
+              <el-input v-model="form.mobile" autocomplete="off" maxlength="11" @blur="onBlurMobile" />
+            </el-form-item>
+          </el-col>
+          <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12">
+            <el-form-item label="账号" prop="userName" :rules="[{ required: true, message: '请输入账号', trigger: ['blur', 'change'] }]">
+              <el-input v-model="form.userName" autocomplete="off" />
+            </el-form-item>
+          </el-col>
+          <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12">
+            <el-form-item label="直属主管" prop="managerUserId">
+              <my-select-user v-model="form.managerUserId" :name="form.managerUserName" clearable></my-select-user>
+            </el-form-item>
+          </el-col>
+          <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12">
+            <el-form-item label="角色" prop="roles">
+              <el-tree-select
+                v-model="form.roleIds"
+                placeholder="请选择角色"
+                :data="state.roleTreeData"
+                node-key="id"
+                :props="{ label: 'name' }"
+                default-expand-all
+                render-after-expand
+                fit-input-width
+                clearable
+                multiple
+                collapse-tags
+                collapse-tags-tooltip
+                filterable
+                class="w100"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :xs="24" :sm="span" :md="span" :lg="span" :xl="span">
+            <el-form-item label="邮箱" prop="email" :rules="[{ validator: testEmail, trigger: ['blur', 'change'] }]">
+              <el-input v-model="form.email" autocomplete="off" />
+            </el-form-item>
+          </el-col>
+          <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12">
+            <el-form-item label="职位">
+              <el-input v-model="form.staff.position" autocomplete="off" />
+            </el-form-item>
+          </el-col>
+          <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12">
+            <el-form-item label="性别">
+              <el-select v-model="form.staff.sex" placeholder="请选择性别" class="w100">
+                <el-option label="" :value="undefined" />
+                <el-option v-for="item in state.sexList" :key="item.label" :label="item.label" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <template #footer>
+        <span class="dialog-footer">
+          <el-button @click="onCancel" size="default">取 消</el-button>
+          <el-button type="primary" @click="onSure" size="default" :loading="state.sureLoading">确 定</el-button>
+        </span>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+
+<script lang="ts" setup name="admin/user/form">
+import { reactive, toRefs, getCurrentInstance, ref, defineAsyncComponent, computed } from 'vue'
+import { UserAddInput, UserUpdateInput, RoleGetListOutput } from '/@/api/admin/data-contracts'
+import { UserApi } from '/@/api/admin/User'
+import { RoleApi } from '/@/api/admin/Role'
+import { listToTree } from '/@/utils/tree'
+import { isMobile, testMobile, testEmail } from '/@/utils/test'
+import eventBus from '/@/utils/mitt'
+import { FormInstance } from 'element-plus'
+import { Sex } from '/@/api/admin/enum-contracts'
+import { toOptionsByValue } from '/@/utils/enum'
+
+// 引入组件
+const MySelectUser = defineAsyncComponent(() => import('./my-select-user.vue'))
+
+defineProps({
+  title: {
+    type: String,
+    default: '',
+  },
+})
+
+const { proxy } = getCurrentInstance() as any
+
+const formRef = ref<FormInstance>()
+const state = reactive({
+  showDialog: false,
+  sureLoading: false,
+  form: {
+    roleIds: [] as any,
+  } as UserAddInput & UserUpdateInput,
+  roleTreeData: [] as RoleGetListOutput[],
+  sexList: toOptionsByValue(Sex),
+})
+const { form } = toRefs(state)
+
+const isUpdate = computed(() => {
+  return state.form.id > 0
+})
+
+const span = computed(() => {
+  return isUpdate.value ? 12 : 24
+})
+
+const getRoles = async () => {
+  const res = await new RoleApi().getList().catch(() => {
+    state.roleTreeData = []
+  })
+  if (res?.success && res.data && res.data.length > 0) {
+    state.roleTreeData = listToTree(res.data)
+  } else {
+    state.roleTreeData = []
+  }
+}
+
+// 打开对话框
+const open = async (row: UserUpdateInput & UserUpdateInput) => {
+  proxy.$modal.loading()
+
+  await getRoles()
+
+  if (row.id > 0) {
+    const res = await new UserApi().get({ id: row.id }).catch(() => {
+      proxy.$modal.closeLoading()
+    })
+
+    if (res?.success) {
+      state.form = res.data as UserAddInput & UserUpdateInput
+    }
+  } else {
+    state.form = {
+      roleIds: [] as number[],
+      staff: {},
+    } as UserAddInput & UserUpdateInput
+  }
+
+  proxy.$modal.closeLoading()
+  state.showDialog = true
+}
+
+//手机号失去焦点
+const onBlurMobile = () => {
+  if (!state.form.userName && state.form.mobile && isMobile(state.form.mobile)) {
+    state.form.userName = state.form.mobile
+  }
+}
+
+// 取消
+const onCancel = () => {
+  state.showDialog = false
+}
+
+// 确定
+const onSure = () => {
+  formRef.value!.validate(async (valid: boolean) => {
+    if (!valid) return
+
+    state.sureLoading = true
+    let res = {} as any
+    if (state.form.id != undefined && state.form.id > 0) {
+      res = await new UserApi().update(state.form, { showSuccessMessage: true }).catch(() => {
+        state.sureLoading = false
+      })
+    } else {
+      res = await new UserApi().add(state.form, { showSuccessMessage: true }).catch(() => {
+        state.sureLoading = false
+      })
+    }
+    state.sureLoading = false
+
+    if (res?.success) {
+      eventBus.emit('refreshUser')
+      state.showDialog = false
+    }
+  })
+}
+
+defineExpose({
+  open,
+})
+</script>
diff --git a/ui/zhontai.ui.admin.vue3/src/views/admin/user/index.vue b/ui/zhontai.ui.admin.vue3/src/views/admin/user/index.vue
index d256494a..bf190318 100644
--- a/ui/zhontai.ui.admin.vue3/src/views/admin/user/index.vue
+++ b/ui/zhontai.ui.admin.vue3/src/views/admin/user/index.vue
@@ -7,7 +7,7 @@
     </pane>
     <pane size="80">
       <div class="my-flex-column w100 h100">
-        <el-card class="my-query-box mt8" shadow="never" :body-style="{ paddingBottom: '0' }">
+        <el-card v-show="state.showQuery" class="my-query-box mt8" shadow="never" :body-style="{ paddingBottom: '0' }">
           <el-form :inline="true" label-width="auto" @submit.stop.prevent>
             <el-form-item>
               <my-select-input v-model="state.pageInput.dynamicFilter" :filters="state.filters" @search="onQuery" />
@@ -15,13 +15,25 @@
             <el-form-item>
               <el-button type="primary" icon="ele-Search" @click="onQuery"> 查询 </el-button>
               <el-button type="primary" icon="ele-Search" @click="onFilter"> 高级查询 </el-button>
-              <el-button v-auth="'api:admin:user:add'" type="primary" icon="ele-Plus" @click="onAdd"> 新增 </el-button>
             </el-form-item>
           </el-form>
         </el-card>
 
         <el-card class="my-fill mt8" shadow="never">
-          <el-table v-loading="state.loading" :data="state.userListData" row-key="id" border>
+          <div class="my-tools-box mb8 my-flex my-flex-between">
+            <div>
+              <el-button v-auth="'api:admin:user:add'" type="primary" icon="ele-Plus" @click="onAdd"> 新增 </el-button>
+              <el-button type="primary" :disabled="!isRowSelect" :loading="state.loadingBatchSetOrg" @click="onBatchSetOrg">部门转移</el-button>
+            </div>
+            <div>
+              <el-tooltip effect="dark" :content="state.showQuery ? '隐藏查询' : '显示查询'" placement="top">
+                <el-button :icon="state.showQuery ? 'ele-ArrowUp' : 'ele-ArrowDown'" circle @click="state.showQuery = !state.showQuery" />
+              </el-tooltip>
+            </div>
+          </div>
+
+          <el-table ref="tableRef" v-loading="state.loading" :data="state.userListData" row-key="id" border>
+            <el-table-column type="selection" />
             <el-table-column prop="userName" label="账号" min-width="180" show-overflow-tooltip>
               <template #default="{ row }">
                 <el-badge :type="row.online ? 'success' : 'info'" is-dot :offset="[0, 12]"></el-badge>
@@ -94,6 +106,8 @@
         </el-card>
 
         <user-form ref="userFormRef" :title="state.userFormTitle"></user-form>
+        <user-update-form ref="userUpdateFormRef" :title="state.userFormTitle"></user-update-form>
+        <user-set-org ref="userSetOrgRef" v-model:user-ids="selectionIds"></user-set-org>
         <user-reset-pwd ref="userRestPwdRef" title="提示"></user-reset-pwd>
         <MyFilterDialog ref="myFilterDialogRef" :fields="state.filters" @sure="onFilterSure"></MyFilterDialog>
       </div>
@@ -102,7 +116,7 @@
 </template>
 
 <script lang="ts" setup name="admin/user">
-import { ref, reactive, onMounted, getCurrentInstance, onBeforeMount, defineAsyncComponent } from 'vue'
+import { ref, reactive, onMounted, getCurrentInstance, onBeforeMount, defineAsyncComponent, computed } from 'vue'
 import { UserGetPageOutput, PageInputUserGetPageDto, OrgListOutput, UserSetManagerInput } from '/@/api/admin/data-contracts'
 import { UserApi } from '/@/api/admin/User'
 import eventBus from '/@/utils/mitt'
@@ -110,9 +124,12 @@ import { auth } from '/@/utils/authFunction'
 import { Pane } from 'splitpanes'
 import { useUserInfo } from '/@/stores/userInfo'
 import { Session } from '/@/utils/storage'
+import { ElTable } from 'element-plus'
 
 // 引入组件
 const UserForm = defineAsyncComponent(() => import('./components/user-form.vue'))
+const UserUpdateForm = defineAsyncComponent(() => import('./components/user-update-form.vue'))
+const UserSetOrg = defineAsyncComponent(() => import('./components/user-set-org.vue'))
 const UserResetPwd = defineAsyncComponent(() => import('./components/user-reset-pwd.vue'))
 const OrgMenu = defineAsyncComponent(() => import('/@/views/admin/org/components/org-menu.vue'))
 const MyDropdownMore = defineAsyncComponent(() => import('/@/components/my-dropdown-more/index.vue'))
@@ -122,7 +139,10 @@ const MyFilterDialog = defineAsyncComponent(() => import('/@/components/my-filte
 
 const { proxy } = getCurrentInstance() as any
 
+const tableRef = ref<InstanceType<typeof ElTable>>()
 const userFormRef = ref()
+const userUpdateFormRef = ref()
+const userSetOrgRef = ref()
 const userRestPwdRef = ref()
 const myFilterDialogRef = ref()
 
@@ -130,6 +150,8 @@ const storesUseUserInfo = useUserInfo()
 
 const state = reactive({
   loading: false,
+  loadingBatchSetOrg: false,
+  showQuery: true,
   userFormTitle: '',
   total: 0,
   pageInput: {
@@ -182,6 +204,22 @@ const state = reactive({
   ] as Array<DynamicFilterInfo>,
 })
 
+const selectionRows = computed(() => {
+  return tableRef.value?.getSelectionRows()
+})
+
+const rowSelectCount = computed(() => {
+  return selectionRows.value?.length
+})
+
+const isRowSelect = computed(() => {
+  return rowSelectCount.value > 0
+})
+
+const selectionIds = computed(() => {
+  return selectionRows.value?.map((a: any) => a.id)
+})
+
 onMounted(() => {
   eventBus.off('refreshUser')
   eventBus.on('refreshUser', async () => {
@@ -227,7 +265,7 @@ const onAdd = () => {
 //修改
 const onEdit = (row: UserGetPageOutput) => {
   state.userFormTitle = '编辑用户'
-  userFormRef.value.open(row)
+  userUpdateFormRef.value.open(row)
 }
 
 //删除
@@ -322,6 +360,11 @@ const onForceOffline = (row: UserGetPageOutput) => {
     .catch(() => {})
 }
 
+//部门转移
+const onBatchSetOrg = () => {
+  userSetOrgRef.value.open()
+}
+
 const onSizeChange = (val: number) => {
   state.pageInput.currentPage = 1
   state.pageInput.pageSize = val