From 153404ffa0a9c6d23d2c2732b46fa6929e86294f Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期三, 18 六月 2025 13:56:18 +0800
Subject: [PATCH] 111
---
admin/src/views/system/user.vue | 44 ++++++++++----------------------------------
1 files changed, 10 insertions(+), 34 deletions(-)
diff --git a/admin/src/views/system/user.vue b/admin/src/views/system/user.vue
index ee79e9f..6e4d01b 100644
--- a/admin/src/views/system/user.vue
+++ b/admin/src/views/system/user.vue
@@ -11,15 +11,6 @@
<el-form-item label="鎵嬫満鍙风爜" prop="mobile">
<el-input v-model="searchForm.mobile" v-trim placeholder="璇疯緭鍏ユ墜鏈哄彿鐮�" @keypress.enter.native="search"/>
</el-form-item>
- <el-form-item label="缁勭粐" prop="companyName">
- <el-input v-model="searchForm.companyName" v-trim placeholder="璇疯緭鍏ョ粍缁�" @keypress.enter.native="search"/>
- </el-form-item>
-<!-- <el-form-item label="鎵�灞為儴闂�" prop="rootDeptId">-->
-<!-- <DepartmentSelect v-model="searchForm.rootDeptId" placeholder="璇烽�夋嫨鎵�灞為儴闂�" clearable/>-->
-<!-- </el-form-item>-->
-<!-- <el-form-item label="宀椾綅" prop="positionId">-->
-<!-- <PositionSelect v-model="searchForm.positionId" placeholder="璇烽�夋嫨宀椾綅" clearable/>-->
-<!-- </el-form-item>-->
<section>
<el-button type="primary" icon="el-icon-search" @click="search">鎼滅储</el-button>
<el-button @click="reset">閲嶇疆</el-button>
@@ -28,10 +19,11 @@
<!-- 琛ㄦ牸鍜屽垎椤� -->
<template v-slot:table-wrap>
<ul class="toolbar" v-permissions="['system:user:create', 'system:user:delete']">
- <!-- <li v-permissions="['system:user:create']"><el-button icon="el-icon-plus" type="primary" @click="$refs.operaUserWindow.open('鏂板缓鐢ㄦ埛')">鏂板缓</el-button></li> -->
+ <li v-permissions="['system:user:create']"><el-button icon="el-icon-plus" type="primary" @click="$refs.operaUserWindow.open('鏂板缓鐢ㄦ埛')">鏂板缓</el-button></li>
<li v-permissions="['system:user:delete']"><el-button icon="el-icon-delete" @click="deleteByIdInBatch">鍒犻櫎</el-button></li>
</ul>
<el-table
+ :height="tableHeightNew"
v-loading="isWorking.search"
:data="tableData.list"
:default-sort = "{prop: 'createTime', order: 'descending'}"
@@ -40,33 +32,22 @@
@sort-change="handleSortChange"
>
<el-table-column type="selection" width="55"></el-table-column>
-<!-- <el-table-column prop="avatar" label="澶村儚" width="80px" class-name="table-column-avatar" fixed="left">-->
-<!-- <template slot-scope="{row}">-->
-<!-- <img :src="row.avatar == null ? '/static/avatar/man.png' : row.avatar">-->
-<!-- </template>-->
-<!-- </el-table-column>-->
+ <el-table-column prop="avatar" label="澶村儚" width="80px" class-name="table-column-avatar" fixed="left">
+ <template slot-scope="{row}">
+ <img :src="row.avatar == null ? '/avatar/man.png' : row.avatar">
+ </template>
+ </el-table-column>
<el-table-column prop="realname" label="濮撳悕" min-width="100px" fixed="left"></el-table-column>
<el-table-column prop="username" label="鐢ㄦ埛鍚�" min-width="120px"></el-table-column>
<el-table-column prop="empNo" label="宸ュ彿" sortable="custom" sort-by="EMP_NO" min-width="80px"></el-table-column>
- <el-table-column prop="companyName" label="鎵�灞炵粍缁�" min-width="250px"></el-table-column>
-<!-- <el-table-column prop="department" label="閮ㄩ棬" min-width="120px">-->
-<!-- <template slot-scope="{row}">{{row.department == null ? '' : row.department.name}}</template>-->
-<!-- </el-table-column>-->
-<!-- <el-table-column prop="position" label="宀椾綅" min-width="160px" class-name="table-column-strings">-->
-<!-- <template slot-scope="{row}">-->
-<!-- <ul>-->
-<!-- <li v-for="position in row.positions" :key="position.id">{{position.name}}</li>-->
-<!-- </ul>-->
-<!-- </template>-->
-<!-- </el-table-column>-->
<el-table-column prop="sex" label="鎬у埆" sortable="custom" sort-by="SEX" min-width="80px">
<template slot-scope="{row}">
{{row.sex | sex}}
</template>
</el-table-column>
<el-table-column prop="mobile" label="鎵嬫満鍙风爜" min-width="100px"></el-table-column>
-<!-- <el-table-column prop="email" label="閭" min-width="180px"></el-table-column>-->
-<!-- <el-table-column prop="birthday" label="鐢熸棩" sortable="custom" sort-by="BIRTHDAY" min-width="100px"></el-table-column>-->
+ <el-table-column prop="email" label="閭" min-width="180px"></el-table-column>
+ <el-table-column prop="birthday" label="鐢熸棩" sortable="custom" sort-by="BIRTHDAY" min-width="100px"></el-table-column>
<el-table-column prop="roles" label="瑙掕壊" min-width="160px" class-name="table-column-strings">
<template slot-scope="{row}">
<ul>
@@ -118,22 +99,17 @@
import OperaUserWindow from '@/components/system/user/OperaUserWindow'
import RoleConfigWindow from '@/components/system/user/RoleConfigWindow'
import ResetPwdWindow from '@/components/system/user/ResetPwdWindow'
-import DepartmentSelect from '@/components/common/DepartmentSelect'
-import PositionSelect from '@/components/common/PositionSelect'
export default {
name: 'SystemUser',
extends: BaseTable,
- components: { PositionSelect, DepartmentSelect, ResetPwdWindow, RoleConfigWindow, OperaUserWindow, TableLayout, Pagination },
+ components: { ResetPwdWindow, RoleConfigWindow, OperaUserWindow, TableLayout, Pagination },
data () {
return {
// 鎼滅储
searchForm: {
username: '', // 鍚嶅瓧
realname: '', // 濮撳悕
- rootDeptId: null, // 閮ㄩ棬ID
- positionId: null, // 宀椾綅ID
- companyName: null, // 浼佷笟鍚嶇О
mobile: '' // 鎵嬫満鍙风爜
}
}
--
Gitblit v1.9.3