新增：部门管理对接用户信息（新增所属部门），并完善查看部门详情（增加上级部门显示）

continew-admin-ui/src/api/monitor/log.ts

@@ -65,7 +65,7 @@ export interface OperationLogParam extends Partial<OperationLogRecord> {
   page: number;
   size: number;
   sort: Array<string>;
-  uid?: string;
+  uid?: number;
 }
 
 export interface OperationLogListRes {

continew-admin-ui/src/api/system/dept.ts

@@ -14,7 +14,8 @@ export interface DeptRecord {
   createTime?: string;
   updateUserString?: string;
   updateTime?: string;
-  children?: Array<DeptRecord>,
+  children?: Array<DeptRecord>;
+  parentName?: string;
 }
 
 export interface DeptParam {

continew-admin-ui/src/assets/style/global.less

@@ -67,7 +67,7 @@ body {
   .header {
     margin-bottom: 16px;
     &-query {
-      margin-bottom: 8px;
+      margin-bottom: 10px;
     }
     &-operation {
       &-right {

continew-admin-ui/src/store/modules/login/index.ts

@@ -13,7 +13,7 @@ import useAppStore from '../app';
 
 const useLoginStore = defineStore('user', {
   state: (): UserState => ({
-    userId: '',
+    userId: 0,
     username: '',
     nickname: '',
     gender: 0,
@@ -23,11 +23,11 @@ const useLoginStore = defineStore('user', {
     description: undefined,
     pwdResetTime: undefined,
     registrationDate: undefined,
+    deptId: 0,
+    deptName: '',
 
     job: 'backend',
     jobName: '后端艺术家',
-    organization: 'Backend',
-    organizationName: '后端',
     location: 'beijing',
     locationName: '北京',
     introduction: '低调星人',

continew-admin-ui/src/store/modules/login/types.ts

@@ -1,6 +1,6 @@
 export type RoleType = '' | '*' | 'admin' | 'user';
 export interface UserState {
-  userId: string;
+  userId: number;
   username: string;
   nickname: string;
   gender: number;
@@ -10,11 +10,11 @@ export interface UserState {
   description?: string;
   pwdResetTime?: string;
   registrationDate?: string;
+  deptId?: number;
+  deptName?: string;
 
   job?: string;
   jobName?: string;
-  organization?: string;
-  organizationName?: string;
   location?: string;
   locationName?: string;
   introduction?: string;

continew-admin-ui/src/views/system/dept/index.vue

@@ -5,8 +5,8 @@
       <!-- 头部区域 -->
       <div class="header">
         <!-- 搜索栏 -->
-        <div class="header-query">
-          <a-form ref="queryRef" :model="queryParams" layout="inline" v-show="showQuery">
+        <div class="header-query" v-if="showQuery">
+          <a-form ref="queryRef" :model="queryParams" layout="inline">
             <a-form-item field="deptName" hide-label>
               <a-input
                 v-model="queryParams.deptName"
@@ -190,6 +190,12 @@
             </a-skeleton>
             <span v-else>{{ dept.deptName }}</span>
           </a-descriptions-item>
+          <a-descriptions-item label="上级部门">
+            <a-skeleton v-if="detailLoading" :animation="true">
+              <a-skeleton-line :rows="1" />
+            </a-skeleton>
+            <span v-else>{{ dept.parentName || '无' }}</span>
+          </a-descriptions-item>
           <a-descriptions-item label="状态">
             <a-skeleton v-if="detailLoading" :animation="true">
               <a-skeleton-line :rows="1" />
@@ -199,6 +205,12 @@
               <a-tag v-else color="red"><span class="circle fail"></span>禁用</a-tag>
             </span>
           </a-descriptions-item>
+          <a-descriptions-item label="部门排序">
+            <a-skeleton v-if="detailLoading" :animation="true">
+              <a-skeleton-line :rows="1" />
+            </a-skeleton>
+            <span v-else>{{ dept.deptSort }}</span>
+          </a-descriptions-item>
           <a-descriptions-item label="创建人">
             <a-skeleton v-if="detailLoading" :animation="true">
               <a-skeleton-line :rows="1" />
@@ -262,6 +274,7 @@
     createTime: '',
     updateUserString: '',
     updateTime: '',
+    parentName: '',
   });
   const ids = ref<Array<number>>([]);
   const title = ref('');

continew-admin-ui/src/views/system/user/center/components/user-panel.vue

@@ -46,6 +46,7 @@
         </a-descriptions-item>
         <a-descriptions-item :label="$t('userCenter.panel.label.phone')">{{ loginStore.phone }}</a-descriptions-item>
         <a-descriptions-item :label="$t('userCenter.panel.label.email')">{{ loginStore.email }}</a-descriptions-item>
+        <a-descriptions-item :label="$t('userCenter.panel.label.deptName')">{{ loginStore.deptName }}</a-descriptions-item>
         <a-descriptions-item :label="$t('userCenter.panel.label.registrationDate')">{{ loginStore.registrationDate }}</a-descriptions-item>
       </a-descriptions>
     </a-space>

continew-admin-ui/src/views/system/user/center/locale/en-US.ts

@@ -10,6 +10,7 @@ export default {
   'userCenter.panel.label.gender': 'Gender :',
   'userCenter.panel.label.phone': 'Phone :',
   'userCenter.panel.label.email': 'Email :',
+  'userCenter.panel.label.deptName': 'Dept Name :',
   'userCenter.panel.label.registrationDate': 'Registration Date :',
   'userCenter.panel.male': 'male',
   'userCenter.panel.female': 'female',

continew-admin-ui/src/views/system/user/center/locale/zh-CN.ts

@@ -10,6 +10,7 @@ export default {
   'userCenter.panel.label.gender': '性别 :',
   'userCenter.panel.label.phone': '手机号码 :',
   'userCenter.panel.label.email': '邮箱 :',
+  'userCenter.panel.label.deptName': '所属部门 :',
   'userCenter.panel.label.registrationDate': '注册日期 :',
   'userCenter.panel.male': '男',
   'userCenter.panel.female': '女',