From 075c02b8c380ce3b565837358d1b2f32cfa6ef94 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期六, 06 一月 2024 20:58:54 +0800
Subject: [PATCH] update 优化 使用翻译注解简化用户查询 调整用户查询逻辑
---
src/views/system/user/index.vue | 9 +--------
src/api/system/user/types.ts | 3 +--
src/views/system/user/profile/index.vue | 2 +-
3 files changed, 3 insertions(+), 11 deletions(-)
diff --git a/src/api/system/user/types.ts b/src/api/system/user/types.ts
index 77e9c32..3488e9f 100644
--- a/src/api/system/user/types.ts
+++ b/src/api/system/user/types.ts
@@ -1,4 +1,3 @@
-import { DeptVO } from './../dept/types';
import { RoleVO } from '@/api/system/role/types';
import { PostVO } from '@/api/system/post/types';
@@ -40,7 +39,7 @@
loginIp: string;
loginDate: string;
remark: string;
- dept: DeptVO;
+ deptName: string;
roles: RoleVO[];
roleIds: any;
postIds: any;
diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index df8b192..3ea2864 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -101,14 +101,7 @@
<el-table-column v-if="columns[0].visible" key="userId" label="鐢ㄦ埛缂栧彿" align="center" prop="userId" />
<el-table-column v-if="columns[1].visible" key="userName" label="鐢ㄦ埛鍚嶇О" align="center" prop="userName" :show-overflow-tooltip="true" />
<el-table-column v-if="columns[2].visible" key="nickName" label="鐢ㄦ埛鏄电О" align="center" prop="nickName" :show-overflow-tooltip="true" />
- <el-table-column
- v-if="columns[3].visible"
- key="deptName"
- label="閮ㄩ棬"
- align="center"
- prop="dept.deptName"
- :show-overflow-tooltip="true"
- />
+ <el-table-column v-if="columns[3].visible" key="deptName" label="閮ㄩ棬" align="center" prop="deptName" :show-overflow-tooltip="true" />
<el-table-column v-if="columns[4].visible" key="phonenumber" label="鎵嬫満鍙风爜" align="center" prop="phonenumber" width="120" />
<el-table-column v-if="columns[5].visible" key="status" label="鐘舵��" align="center">
<template #default="scope">
diff --git a/src/views/system/user/profile/index.vue b/src/views/system/user/profile/index.vue
index ae8fa0f..0c8b527 100644
--- a/src/views/system/user/profile/index.vue
+++ b/src/views/system/user/profile/index.vue
@@ -27,7 +27,7 @@
</li>
<li class="list-group-item">
<svg-icon icon-class="tree" />鎵�灞為儴闂�
- <div v-if="state.user.dept" class="pull-right">{{ state.user.dept?.deptName }} / {{ state.postGroup }}</div>
+ <div v-if="state.user.deptName" class="pull-right">{{ state.user.deptName }} / {{ state.postGroup }}</div>
</li>
<li class="list-group-item">
<svg-icon icon-class="peoples" />鎵�灞炶鑹�
--
Gitblit v1.9.3