From 591003290867725b35a4559995587b56dab39ea0 Mon Sep 17 00:00:00 2001
From: LiuHao <liuhaoai545@gmail.com>
Date: 星期四, 11 一月 2024 14:27:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
src/views/system/user/index.vue | 15 ++++-----------
1 files changed, 4 insertions(+), 11 deletions(-)
diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index a952954..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">
@@ -298,15 +291,15 @@
<script setup name="User" lang="ts">
import api from '@/api/system/user';
import { UserForm, UserQuery, UserVO } from '@/api/system/user/types';
-import { treeselect } from '@/api/system/dept';
import { DeptVO } from '@/api/system/dept/types';
import { RoleVO } from '@/api/system/role/types';
import { PostVO } from '@/api/system/post/types';
-import { to } from 'await-to-js';
+import { treeselect } from '@/api/system/dept';
import { globalHeaders } from '@/utils/request';
+import { to } from 'await-to-js';
const router = useRouter();
-const { proxy } = getCurrentInstance();
+const { proxy } = getCurrentInstance() as ComponentInternalInstance;
const { sys_normal_disable, sys_user_sex } = toRefs<any>(proxy?.useDict('sys_normal_disable', 'sys_user_sex'));
const userList = ref<UserVO[]>();
const loading = ref(true);
--
Gitblit v1.9.3