Merge remote-tracking branch 'origin/master'

web/.env.development

@@ -2,7 +2,7 @@
 ENV = 'development'
 
 # 本地环境接口地址
-#VITE_API_URL = 'https://demo.dvadmin.com/api'
+#`VITE_API_URL = 'https://demo.dvadmin.com/api'
 VITE_API_URL = 'http://192.168.1.160:8002'
 
 # 是否启用按钮权限

web/.gitignore

@@ -1,7 +1,6 @@
 .DS_Store
 node_modules
 /dist
-package-lock.json
 yarn.lock
 
 # local env files

web/src/views/system/dept/api.ts

@@ -52,10 +52,20 @@ export function lazyLoadDept(query: UserPageQuery) {
 /**
  * 用户相关接口
  */
-export function getUserDeptList(query: PageQuery) {
+export function getDeptUserList(query: PageQuery) {
 	return request({
-		url: "/api/system/dept/dept_lazy_tree/",
+		url: "/api/system/user/",
 		method: 'get',
 		params: query,
 	});
 }
+
+/**
+ * 获取所有部门列表
+ */
+export function getAllDeptList() {
+	return request({
+		url: "/api/system/dept/all_dept/",
+		method: 'get',
+	});
+}

web/src/views/system/dept/components/DeptFormCom.vue

@@ -4,8 +4,10 @@
     <el-form-item label="部门ID" prop="id">
       <el-input v-model="deptFormData.id" disabled />
     </el-form-item>
-    <el-form-item label="父级部门ID" prop="parent">
-      <el-input v-model="deptFormData.parent" />
+    <el-form-item label="父级部门" prop="parent">
+      <el-select v-model="deptFormData.parent" style="width: 100%">
+        <el-option v-for="item in deptAllList" :key="item.id" :label="item.name" :value="item.id" />
+      </el-select>
     </el-form-item>
     <el-form-item required label="部门名称" prop="name">
       <el-input v-model="deptFormData.name" />
@@ -26,18 +28,21 @@
       <el-input-number v-model="deptFormData.sort" controls-position="right" />
     </el-form-item>
     <el-form-item>
-      <el-button @click="handleUpdateMenu('update')" type="primary" :disabled="deptBtnLoading">保存</el-button>
+      <el-button @click="handleUpdateMenu" type="primary" :disabled="deptBtnLoading">
+        {{ deptFormData.id ? '保存' : '新增' }}
+      </el-button>
       <el-button @click="handleClose">取消
       </el-button>
     </el-form-item>
-
   </el-form>
 </template>
 
 <script lang="ts" setup>
 import { reactive, ref, onMounted } from 'vue';
 import { ElForm, FormRules } from 'element-plus';
-import { DeptFormDataType, TreeItemType } from '../types';
+import { getAllDeptList, AddObj, UpdateObj } from '../api';
+import { successNotification } from '../../../../utils/message';
+import { DeptFormDataType, TreeItemType, DeptListType } from '../types';
 
 interface IProps {
   initFormData: TreeItemType | null;
@@ -54,6 +59,7 @@ const props = withDefaults(defineProps<IProps>(), {
 })
 const emit = defineEmits(['drawerClose'])
 
+let deptAllList = ref<DeptListType[]>([]);
 let deptFormData = reactive<DeptFormDataType>({
   id: '',
   key: '',
@@ -67,15 +73,55 @@ let deptFormData = reactive<DeptFormDataType>({
 })
 let deptBtnLoading = ref(false)
 
-const handleUpdateMenu = (type: string) => { };
+const getData = async () => {
+  const res = await getAllDeptList();
+  if (res?.code === 2000) {
+    deptAllList.value = res.data
+  }
+}
 
-const handleClose = () => {
-  emit('drawerClose')
+const setDeptFormData = () => {
+  if (props.initFormData?.id) {
+    deptFormData.id = props.initFormData?.id;
+    deptFormData.key = props.initFormData.key || '';
+    deptFormData.parent = props.initFormData.parent || '';
+    deptFormData.name = props.initFormData.name || '';
+    deptFormData.owner = props.initFormData.owner || '';
+    deptFormData.phone = props.initFormData.phone || '';
+    deptFormData.email = props.initFormData.email || '';
+    deptFormData.sort = props.initFormData.sort || 0;
+  }
+}
+
+const handleUpdateMenu = () => {
+  formRef.value?.validate(async (valid) => {
+    if (!valid) return
+    try {
+      let res;
+      deptBtnLoading.value = true
+      if (deptFormData.id) {
+        res = await UpdateObj(deptFormData);
+      } else {
+        res = await AddObj(deptFormData)
+      }
+      if (res?.code === 2000) {
+        successNotification(res.msg as string);
+        handleClose('submit');
+      }
+    } finally {
+      deptBtnLoading.value = false
+    }
+  })
+};
+
+const handleClose = (type: string = '') => {
+  emit('drawerClose', type)
   formRef.value?.resetFields();
 };
 
-onMounted(() => {
-  console.log(props.initFormData?.id, '----');
+onMounted(async () => {
+  await getData()
+  setDeptFormData()
 })
 </script>
 

web/src/views/system/dept/components/DeptUserCom/api.ts

@@ -0,0 +1,58 @@
+import { request, downloadFile } from '/@/utils/service';
+import { PageQuery, AddReq, DelReq, EditReq, InfoReq } from '@fast-crud/fast-crud';
+
+export const apiPrefix = '/api/system/user/';
+
+export function GetDept(query: PageQuery) {
+	return request({
+		url: "/api/system/dept/dept_lazy_tree/",
+		method: 'get',
+		params: query,
+	});
+}
+
+export function GetList(query: PageQuery) {
+	return request({
+		url: apiPrefix,
+		method: 'get',
+		params: query,
+	});
+}
+export function GetObj(id: InfoReq) {
+	return request({
+		url: apiPrefix + id,
+		method: 'get',
+	});
+}
+
+export function AddObj(obj: AddReq) {
+	return request({
+		url: apiPrefix,
+		method: 'post',
+		data: obj,
+	});
+}
+
+export function UpdateObj(obj: EditReq) {
+	return request({
+		url: apiPrefix + obj.id + '/',
+		method: 'put',
+		data: obj,
+	});
+}
+
+export function DelObj(id: DelReq) {
+	return request({
+		url: apiPrefix + id + '/',
+		method: 'delete',
+		data: { id },
+	});
+}
+
+export function exportData(params: any) {
+	return downloadFile({
+		url: apiPrefix + 'export_data/',
+		params: params,
+		method: 'get'
+	})
+}

web/src/views/system/dept/components/DeptUserCom/crud.tsx

@@ -0,0 +1,386 @@
+import { inject } from 'vue';
+import { dict, UserPageQuery, AddReq, DelReq, EditReq, compute, CreateCrudOptionsProps, CreateCrudOptionsRet } from '@fast-crud/fast-crud';
+import { request } from '/@/utils/service';
+import * as api from './api';
+import { dictionary } from '/@/utils/dictionary';
+import { successMessage } from '/@/utils/message';
+
+export const createCrudOptions = function ({ crudExpose }: CreateCrudOptionsProps): CreateCrudOptionsRet {
+	const pageRequest = async (query: UserPageQuery) => {
+		const res = await api.GetList(query);
+		/**
+		 * 处理crud警告：Invalid prop: type check failed for prop "name". Expected String with value "2", got Number with value 2.
+		 */
+		res.data.forEach((item: any) => {
+			if (item.role && Array.isArray(item.role) && item.role.length > 0) {
+				item.role = item.role.map((r: number) => String(r));
+			}
+		});
+		return res;
+	};
+	const editRequest = async ({ form, row }: EditReq) => {
+		form.id = row.id;
+		return await api.UpdateObj(form);
+	};
+	const delRequest = async ({ row }: DelReq) => {
+		return await api.DelObj(row.id);
+	};
+	const addRequest = async ({ form }: AddReq) => {
+		return await api.AddObj(form);
+	};
+
+	const exportRequest = async (query: UserPageQuery) => {
+		return await api.exportData(query);
+	};
+
+	//权限判定
+	const hasPermissions: any = inject('$hasPermissions');
+
+	return {
+		crudOptions: {
+			table: {
+				remove: {
+					confirmMessage: '是否删除该用户？',
+				},
+			},
+			request: {
+				pageRequest,
+				addRequest,
+				editRequest,
+				delRequest,
+			},
+			actionbar: {
+				buttons: {
+					add: {
+						show: hasPermissions('user:Create'),
+						// show:true
+					},
+					export: {
+						text: '导出', //按钮文字
+						title: '导出', //鼠标停留显示的信息
+						click() {
+							return exportRequest(crudExpose!.getSearchFormData());
+						},
+					},
+				},
+			},
+			search: {
+				container: {
+					action: {
+						col: {
+							span: 6,
+						},
+					},
+				},
+			},
+			rowHandle: {
+				//固定右侧
+				fixed: 'right',
+				width: 250,
+				buttons: {
+					view: {
+						show: false,
+					},
+					edit: {
+						show: hasPermissions('user:Update'),
+					},
+					remove: {
+						show: hasPermissions('user:Delete'),
+					},
+					custom: {
+						text: '重设密码',
+						type: 'primary',
+						show: hasPermissions('user:ResetPassword'),
+						tooltip: {
+							placement: 'top',
+							content: '重设密码',
+						},
+						click: (ctx: any) => {
+							const { row } = ctx;
+						},
+					},
+				},
+			},
+			columns: {
+				_index: {
+					title: '序号',
+					form: { show: false },
+					column: {
+						type: 'index',
+						align: 'center',
+						width: '70px',
+						columnSetDisabled: true, //禁止在列设置中选择
+					},
+				},
+				username: {
+					title: '账号',
+					search: {
+						show: true,
+					},
+					type: 'input',
+					column: {
+						minWidth: 100, //最小列宽
+					},
+					form: {
+						rules: [
+							// 表单校验规则
+							{
+								required: true,
+								message: '账号必填项',
+							},
+						],
+						component: {
+							placeholder: '请输入账号',
+						},
+					},
+				},
+				password: {
+					title: '密码',
+					type: 'input',
+					column: {
+						show: false,
+					},
+					editForm: {
+						show: false,
+					},
+					form: {
+						rules: [
+							// 表单校验规则
+							{
+								required: true,
+								message: '密码必填项',
+							},
+						],
+						component: {
+							span: 12,
+							showPassword: true,
+							placeholder: '请输入密码',
+						},
+						// value: vm.systemConfig('base.default_password'),
+					},
+					/* valueResolve(row, key) {
+                        if (row.password) {
+                            row.password = vm.$md5(row.password)
+                        }
+                    } */
+				},
+				name: {
+					title: '姓名',
+					search: {
+						show: true,
+					},
+					type: 'input',
+					column: {
+						minWidth: 100, //最小列宽
+					},
+					form: {
+						rules: [
+							// 表单校验规则
+							{
+								required: true,
+								message: '姓名必填项',
+							},
+						],
+						component: {
+							span: 12,
+							placeholder: '请输入姓名',
+						},
+					},
+				},
+				dept: {
+					title: '部门',
+					search: {
+						disabled: true,
+					},
+					type: 'dict-tree',
+					dict: dict({
+						isTree: true,
+						url: '/api/system/dept/all_dept/',
+						value: 'id',
+						label: 'name',
+						getData: async ({ url }: { url: string }) => {
+							return request({
+								url: url,
+							}).then((ret: any) => {
+								return ret.data;
+							});
+						},
+					}),
+					column: {
+						minWidth: 150, //最小列宽
+					},
+					form: {
+						rules: [
+							// 表单校验规则
+							{
+								required: true,
+								message: '必填项',
+							},
+						],
+						component: {
+							filterable: true,
+							placeholder: '请选择',
+							props: {
+								props: {
+									value: 'id',
+									label: 'name',
+								},
+							},
+						},
+					},
+				},
+				role: {
+					title: '角色',
+					search: {
+						disabled: true,
+					},
+					type: 'dict-select',
+					dict: dict({
+						url: '/api/system/role/',
+						value: 'id',
+						label: 'name',
+						isTree: true,
+						getData: async ({ url }: { url: string }) => {
+							return request({
+								url: url,
+								params: {
+									page: 1,
+									limit: 10,
+								},
+							}).then((ret: any) => {
+								return ret.data;
+							});
+						},
+					}),
+					column: {
+						minWidth: 100, //最小列宽
+					},
+					form: {
+						rules: [
+							// 表单校验规则
+							{
+								required: true,
+								message: '必填项',
+							},
+						],
+						component: {
+							multiple: true,
+							filterable: true,
+							placeholder: '请选择角色',
+						},
+					},
+				},
+				mobile: {
+					title: '手机号码',
+					search: {
+						show: true,
+					},
+					type: 'input',
+					column: {
+						minWidth: 120, //最小列宽
+					},
+					form: {
+						rules: [
+							{
+								max: 20,
+								message: '请输入正确的手机号码',
+								trigger: 'blur',
+							},
+							{
+								pattern: /^1[3-9]\d{9}$/,
+								message: '请输入正确的手机号码',
+							},
+						],
+						component: {
+							placeholder: '请输入手机号码',
+						},
+					},
+				},
+				email: {
+					title: '邮箱',
+					column: {
+						width: 260,
+					},
+					form: {
+						rules: [
+							{
+								type: 'email',
+								message: '请输入正确的邮箱地址',
+								trigger: ['blur', 'change'],
+							},
+						],
+						component: {
+							placeholder: '请输入邮箱',
+						},
+					},
+				},
+				gender: {
+					title: '性别',
+					type: 'dict-select',
+					dict: dict({
+						data: dictionary('gender'),
+					}),
+					form: {
+						value: 1,
+						component: {
+							span: 12,
+						},
+					},
+					component: { props: { color: 'auto' } }, // 自动染色
+				},
+				user_type: {
+					title: '用户类型',
+					search: {
+						show: true,
+					},
+					type: 'dict-select',
+					dict: dict({
+						data: dictionary('user_type'),
+					}),
+					column: {
+						minWidth: 100, //最小列宽
+					},
+					form: {
+						show: false,
+						value: 0,
+						component: {
+							span: 12,
+						},
+					},
+				},
+				is_active: {
+					title: '锁定',
+					search: {
+						show: true,
+					},
+					type: 'dict-radio',
+					column: {
+						component: {
+							name: 'fs-dict-switch',
+							activeText: '',
+							inactiveText: '',
+							style: '--el-switch-on-color: var(--el-color-primary); --el-switch-off-color: #dcdfe6',
+							onChange: compute((context) => {
+								return () => {
+									api.UpdateObj(context.row).then((res: APIResponseData) => {
+										successMessage(res.msg as string);
+									});
+								};
+							}),
+						},
+					},
+					dict: dict({
+						data: dictionary('button_status_bool'),
+					}),
+				},
+				avatar: {
+					title: '头像',
+					type: 'avatar-cropper',
+					form: {
+						show: false,
+					},
+				},
+			},
+		},
+	};
+};

web/src/views/system/dept/components/DeptUserCom/index.vue

@@ -0,0 +1,61 @@
+<template>
+  <fs-crud ref="crudRef" v-bind="crudBinding">
+    <template #actionbar-right>
+      <importExcel api="api/system/user/">导入 </importExcel>
+    </template>
+  </fs-crud>
+</template>
+
+<script lang="ts" setup name="user">
+import { ref, onMounted } from 'vue';
+import { useExpose, useCrud } from '@fast-crud/fast-crud';
+import { createCrudOptions } from './crud';
+import importExcel from '/@/components/importExcel/index.vue'
+
+// crud组件的ref
+const crudRef = ref();
+// crud 配置的ref
+const crudBinding = ref();
+// 暴露的方法
+const { crudExpose } = useExpose({ crudRef, crudBinding });
+// 你的crud配置
+const { crudOptions } = createCrudOptions({ crudExpose });
+// 初始化crud配置
+const { resetCrudOptions } = useCrud({
+  crudExpose, crudOptions,
+  context: {}
+});
+
+/**
+ * 部门切换刷新用户列表
+ */
+const handleDoRefreshUser = (id: string) => {
+  crudExpose.doSearch({ form: { dept: id } });
+}
+
+onMounted(() => {
+  crudExpose.doRefresh();
+});
+
+defineExpose({
+  handleDoRefreshUser
+})
+</script>
+
+<style lang="scss" scoped>
+.el-row {
+  height: 100%;
+
+  .el-col {
+    height: 100%;
+  }
+}
+
+.el-card {
+  height: 100%;
+}
+
+.font-normal {
+  font-family: Helvetica Neue, Helvetica, PingFang SC, Hiragino Sans GB, Microsoft YaHei, SimSun, sans-serif;
+}
+</style>

web/src/views/system/dept/components/TreeCom.vue

@@ -67,7 +67,7 @@ import { ElTree } from 'element-plus';
 import { getElementLabelLine } from "element-tree-line";
 import { Search } from '@element-plus/icons-vue';
 import { lazyLoadDept } from '../api';
-import { warningMessage } from '../../../../utils/message';
+import { warningNotification } from '../../../../utils/message';
 import { TreeItemType, APIResponseData } from '../types';
 import type Node from 'element-plus/es/components/tree/src/model/node';
 
@@ -85,7 +85,7 @@ const treeProps = {
 withDefaults(defineProps<IProps>(), {
   treeData: () => [],
 })
-const emit = defineEmits(['setFormInitData', 'deleteDept', 'updateDept'])
+const emit = defineEmits(['treeClick', 'deleteDept', 'updateDept'])
 
 let filterVal = ref('');
 let showTotalNum = ref(false)
@@ -96,11 +96,17 @@ watch(filterVal, (val) => {
   treeRef.value!.filter(val);
 });
 
+/**
+ * 部门树的搜索事件
+ */
 const handleFilterTreeNode = (value: string, data: TreeItemType) => {
   if (!value) return true;
   return toRaw(data).name?.indexOf(value) !== -1;
 };
 
+/**
+ * 部门树的懒加载
+ */
 const handleLoadNode = (node: Node, resolve: Function) => {
   if (node.level !== 0) {
     lazyLoadDept({ parent: node.data.id }).then((res: APIResponseData) => {
@@ -109,9 +115,12 @@ const handleLoadNode = (node: Node, resolve: Function) => {
   }
 };
 
+/**
+ * 部门的点击事件
+ */
 const handleNodeClick = (data: TreeItemType) => {
   treeSelectDept.value = data
-  emit('setFormInitData', data)
+  emit('treeClick', data.id)
 };
 
 /**
@@ -120,7 +129,7 @@ const handleNodeClick = (data: TreeItemType) => {
 const handleUpdateMenu = (type: string) => {
   if (type === 'update') {
     if (!treeSelectDept.value.id) {
-      warningMessage('请选择菜单！')
+      warningNotification('请选择菜单！')
       return
     }
     emit('updateDept', type, treeSelectDept.value)
@@ -134,7 +143,7 @@ const handleUpdateMenu = (type: string) => {
  */
 const handleDeleteDept = () => {
   if (!treeSelectDept.value.id) {
-    warningMessage('请选择菜单！')
+    warningNotification('请选择菜单！')
     return
   }
   emit('deleteDept', treeSelectDept.value.id, () => {

web/src/views/system/dept/crud.tsx

@@ -1,251 +0,0 @@
-import * as api from './api';
-import { dict, UserPageQuery, AddReq, DelReq, EditReq, compute, CreateCrudOptionsProps, CreateCrudOptionsRet } from '@fast-crud/fast-crud';
-import { verifyPhone } from '/@/utils/toolsValidate';
-import { dictionary } from '/@/utils/dictionary';
-import { successMessage } from '/@/utils/message';
-
-export const createCrudOptions = function ({ crudExpose }: CreateCrudOptionsProps): CreateCrudOptionsRet {
-	const pageRequest = async (query: UserPageQuery) => {
-		return await api.GetList(query);
-	};
-	const editRequest = async ({ form, row }: EditReq) => {
-		form.id = row.id;
-		return await api.UpdateObj(form);
-	};
-	const delRequest = async ({ row }: DelReq) => {
-		return await api.DelObj(row.id);
-	};
-	const addRequest = async ({ form }: AddReq) => {
-		return await api.AddObj(form);
-	};
-
-	const validatePhone = async (rule: any, value: any, callback: any) => {
-		if (value === '') {
-			throw new Error('请输入手机号码');
-		}
-		if (verifyPhone(value)) {
-			callback();
-		} else {
-			throw new Error('手机号码格式有误');
-		}
-	};
-
-	/**
-	 * 懒加载
-	 * @param row
-	 * @returns {Promise<unknown>}
-	 */
-	const loadContentMethod = (tree: any, treeNode: any, resolve: any) => {
-		api.GetList({ parent: tree.id }).then((res: any) => {
-			resolve(res.data);
-		});
-	};
-
-	return {
-		crudOptions: {
-			request: {
-				pageRequest,
-				addRequest,
-				editRequest,
-				delRequest,
-			},
-			pagination: {
-				show: false,
-			},
-			table: {
-				rowKey: 'id',
-				lazy: true,
-				load: loadContentMethod,
-				treeProps: { children: 'children', hasChildren: 'hasChild' },
-			},
-			rowHandle: {
-				fiexd: 'right',
-				fixed: 'right',
-				width: 200,
-				buttons: {
-					view: {
-						show: false,
-					},
-					edit: {
-						iconRight: 'Edit',
-						type: 'text',
-					},
-					remove: {
-						iconRight: 'Delete',
-						type: 'text',
-					},
-					addChildren: {
-						text: '添加子级',
-						type: 'text',
-						click(context) {
-							const rowId = context.row.id;
-							crudExpose!.openAdd({ row: { parent: rowId } });
-						},
-					},
-				},
-			},
-			columns: {
-				_index: {
-					title: '序号',
-					form: { show: false },
-					column: {
-						type: 'index',
-						align: 'center',
-						width: '70px',
-						columnSetDisabled: true, //禁止在列设置中选择
-					},
-				},
-				search: {
-					title: '关键词',
-					column: {
-						show: false,
-					},
-					search: {
-						show: true,
-						component: {
-							props: {
-								clearable: true,
-							},
-							placeholder: '请输入关键词',
-						},
-					},
-					form: {
-						show: false,
-						component: {
-							props: {
-								clearable: true,
-							},
-						},
-					},
-				},
-				name: {
-					title: '部门名称',
-					sortable: true,
-					treeNode: true, // 设置为树形列
-					search: {
-						disabled: false,
-						component: {
-							props: {
-								clearable: true,
-							},
-						},
-					},
-					width: 180,
-					type: 'input',
-					form: {
-						rules: [
-							// 表单校验规则
-							{ required: true, message: '部门名称必填项' },
-						],
-						component: {
-							span: 12,
-							props: {
-								clearable: true,
-							},
-							placeholder: '请输入部门名称',
-						},
-					},
-				},
-				key: {
-					title: '部门标识',
-					sortable: true,
-					form: {
-						component: {
-							props: {
-								clearable: true,
-							},
-							placeholder: '请输入标识字符',
-						},
-					},
-				},
-				owner: {
-					title: '负责人',
-					sortable: true,
-					form: {
-						component: {
-							span: 12,
-							props: {
-								clearable: true,
-							},
-							placeholder: '请输入负责人',
-						},
-					},
-				},
-				phone: {
-					title: '联系电话',
-					sortable: true,
-					form: {
-						rules: [{ validator: validatePhone, trigger: 'blur' }],
-						component: {
-							span: 12,
-							props: {
-								clearable: true,
-							},
-							placeholder: '请输入联系电话',
-						},
-					},
-				},
-				email: {
-					title: '邮箱',
-					sortable: true,
-					form: {
-						component: {
-							span: 12,
-							props: {
-								clearable: true,
-							},
-							placeholder: '请输入邮箱',
-						},
-						rules: [
-							{
-								type: 'email',
-								message: '请输入正确的邮箱地址',
-								// @ts-ignore
-								trigger: ['blur', 'change'],
-							},
-						],
-					},
-				},
-				sort: {
-					title: '排序',
-					sortable: true,
-					width: 80,
-					type: 'number',
-					form: {
-						value: 1,
-						component: {
-							span: 12,
-							placeholder: '请选择序号',
-						},
-					},
-				},
-				status: {
-					title: '状态',
-					sortable: true,
-					search: {
-						disabled: false,
-					},
-					type: 'dict-radio',
-					column: {
-						component: {
-							name: 'fs-dict-switch',
-							activeText: '',
-							inactiveText: '',
-							style: '--el-switch-on-color: #409eff; --el-switch-off-color: #dcdfe6',
-							onChange: compute((context) => {
-								return () => {
-									api.UpdateObj(context.row).then((res: APIResponseData) => {
-										successMessage(res.msg as string);
-									});
-								};
-							}),
-						},
-					},
-					dict: dict({
-						data: dictionary('button_status_bool'),
-					}),
-				},
-			},
-		},
-	};
-};

web/src/views/system/dept/index.vue

@@ -3,113 +3,40 @@
 		<el-row class="dept-el-row">
 			<el-col :span="6">
 				<div class="dept-box dept-left">
-					<TreeCom :treeData="treeData" @setFormInitData="setFormInitData" @updateDept="handleUpdateMenu"
+					<TreeCom :treeData="deptTreeData" @treeClick="handleTreeClick" @updateDept="handleUpdateMenu"
 						@deleteDept="handleDeleteMenu" />
 				</div>
 			</el-col>
 
 			<el-col :span="18">
-				<div class="dept-box dept-form">
-					<el-form ref="formRef" :rules="rules" :model="deptFormData" label-width="120px" label-position="right">
-						<el-divider>
-							<strong>部门配置</strong>
-						</el-divider>
-						<el-row>
-							<el-col :span="10">
-								<el-form-item label="部门ID" prop="id">
-									<el-input v-model="deptFormData.id" disabled />
-								</el-form-item>
-							</el-col>
-							<el-col :span="10">
-								<el-form-item label="父级部门ID" prop="parent">
-									<el-input v-model="deptFormData.parent" />
-								</el-form-item>
-							</el-col>
-							<el-col :span="10">
-								<el-form-item required label="部门名称" prop="name">
-									<el-input v-model="deptFormData.name" />
-								</el-form-item>
-							</el-col>
-							<el-col :span="10">
-								<el-form-item required label="部门标识" prop="key">
-									<el-input v-model="deptFormData.key" />
-								</el-form-item>
-							</el-col>
-							<el-col :span="10">
-								<el-form-item label="负责人" prop="owner">
-									<el-input v-model="deptFormData.owner" />
-								</el-form-item>
-							</el-col>
-							<el-col :span="10">
-								<el-form-item label="联系电话" prop="phone">
-									<el-input v-model="deptFormData.phone" />
-								</el-form-item>
-							</el-col>
-							<el-col :span="10">
-								<el-form-item label="邮箱" prop="email">
-									<el-input v-model="deptFormData.email" />
-								</el-form-item>
-							</el-col>
-							<el-col :span="10">
-								<el-form-item label="排序" prop="sort">
-									<el-input-number v-model="deptFormData.sort" controls-position="right" />
-								</el-form-item>
-							</el-col>
-
-							<el-col class="center">
-								<el-divider>
-									<el-button @click="handleUpdateMenu('update')" type="primary" round
-										:disabled="!deptFormData.id || deptBtnLoading">保存</el-button>
-									<el-button @click="handleUpdateMenu('create')" type="primary" round :disabled="deptBtnLoading">新建
-									</el-button>
-									<el-button @click="handleDeleteMenu" type="primary" round>删除部门
-									</el-button>
-								</el-divider>
-							</el-col>
-						</el-row>
-					</el-form>
+				<div class="dept-box dept-table">
+					<DeptUserCom ref="deptUserRef" />
 				</div>
 			</el-col>
 		</el-row>
 
 		<el-drawer v-model="drawerVisible" title="部门配置" direction="rtl" size="500px" :close-on-click-modal="false"
 			:before-close="handleDrawerClose">
-			<FormCom v-if="drawerVisible" :initFormData="drawerFormData" @drawerClose="handleDrawerClose" />
+			<DeptFormCom v-if="drawerVisible" :initFormData="drawerFormData" @drawerClose="handleDrawerClose" />
 		</el-drawer>
 	</fs-page>
 </template>
 
 <script lang="ts" setup name="dept">
-import { ref, onMounted, reactive } from 'vue';
+import { ref, onMounted } from 'vue';
 import XEUtils from 'xe-utils';
-import { ElForm, ElMessageBox, FormRules } from 'element-plus';
-import TreeCom from './components/TreeCom.vue'
-import FormCom from './components/FormCom.vue'
-import { GetList, AddObj, UpdateObj, DelObj } from './api';
-import { successMessage } from '../../../utils/message';
-import { APIResponseData, DeptFormDataType, TreeItemType } from './types';
+import { ElMessageBox } from 'element-plus';
+import TreeCom from './components/TreeCom.vue';
+import DeptFormCom from './components/DeptFormCom.vue';
+import DeptUserCom from './components/DeptUserCom/index.vue';
+import { GetList, DelObj } from './api';
+import { successNotification } from '../../../utils/message';
+import { APIResponseData, TreeItemType } from './types';
 
-let treeData = ref([]);
-let deptFormData = reactive<DeptFormDataType>({
-	id: '',
-	key: '',
-	parent: '',
-	name: '',
-	owner: '',
-	phone: '',
-	email: '',
-	sort: 0,
-	is_catalog: true,
-})
-let deptBtnLoading = ref(false)
+let deptTreeData = ref([]);
 let drawerVisible = ref(false)
 let drawerFormData = ref<Partial<TreeItemType>>({})
-const formRef = ref<InstanceType<typeof ElForm>>();
-
-const rules = reactive<FormRules>({
-	name: [{ required: true, message: '部门名称必填', trigger: 'blur' }],
-	key: [{ required: true, message: '部门标识必填', trigger: 'blur' }],
-});
+let deptUserRef = ref<InstanceType<typeof DeptUserCom> | null>(null)
 
 const getData = async () => {
 	let res: APIResponseData = await GetList({});
@@ -121,21 +48,20 @@ const getData = async () => {
 			strict: true,
 		});
 
-		treeData.value = result;
+		deptTreeData.value = result;
 	}
 };
 
-const setFormInitData = (data: DeptFormDataType) => {
-	deptFormData.id = data.id;
-	deptFormData.key = data.key;
-	deptFormData.name = data.name;
-	deptFormData.parent = data.parent;
-	deptFormData.owner = data.owner;
-	deptFormData.phone = data.phone;
-	deptFormData.email = data.email;
-	deptFormData.sort = data.sort;
-};
+/**
+ * 部门的点击事件
+ */
+const handleTreeClick = (id: string) => {
+	deptUserRef.value?.handleDoRefreshUser(id)
+}
 
+/**
+ * 部门的删除事件
+ */
 const handleDeleteMenu = (id: string, callback: Function) => {
 	ElMessageBox.confirm(
 		'您确认删除该部门吗?',
@@ -149,40 +75,27 @@ const handleDeleteMenu = (id: string, callback: Function) => {
 		const res: APIResponseData = await DelObj(id)
 		callback()
 		if (res?.code === 2000) {
-			successMessage(res.msg as string);
+			successNotification(res.msg as string);
 			getData();
+			deptUserRef.value?.handleDoRefreshUser('')
 		}
 	})
 };
 
+/**
+ * 部门的 新增 or 编辑 事件
+ */
 const handleUpdateMenu = (type: string, record?: TreeItemType) => {
 	if (type === 'update' && record) {
 		drawerFormData.value = record
 	}
 	drawerVisible.value = true
-	//form.component == '' ? (form.is_catalog = true) : (form.is_catalog = false);
-	/* formRef.value?.validate(async (valid) => {
-		if (!valid) return
-		try {
-			let res;
-			deptBtnLoading.value = true
-			if (type === 'update') {
-				res = await UpdateObj(deptFormData);
-			} else if (type === 'create') {
-				res = await AddObj(deptFormData)
-			}
-			if (res?.code === 2000) {
-				successMessage(res.msg as string);
-				getData();
-			}
-		} finally {
-			type === 'create' && formRef.value?.resetFields();
-			deptBtnLoading.value = false
-		}
-	}); */
 
 };
-const handleDrawerClose = () => {
+const handleDrawerClose = (type?: string) => {
+	if (type === 'submit') {
+		getData()
+	}
 	drawerVisible.value = false
 	drawerFormData.value = {}
 }
@@ -220,12 +133,8 @@ onMounted(() => {
 	}
 }
 
-.dept-form {
+.dept-table {
 	border-radius: 8px 0 0 8px;
 	margin-left: 10px;
 }
-
-.font-normal {
-	font-family: Helvetica Neue, Helvetica, PingFang SC, Hiragino Sans GB, Microsoft YaHei, SimSun, sans-serif;
-}
 </style>

web/src/views/system/dept/types.ts

@@ -40,9 +40,9 @@ export interface TreeItemType {
 }
 
 export interface DeptFormDataType {
-  id: string;
+  id: string | number;
   key: string;
-  parent: string;
+  parent: string | number;
   name: string;
   owner: string;
   phone: string;
@@ -50,3 +50,9 @@ export interface DeptFormDataType {
   sort: number;
   is_catalog?: boolean;
 }
+
+export interface DeptListType {
+  id: number;
+  name: string;
+  parent: number;
+}