From 1c20c8231980a8d4b91688ff8641a06d3b2f68ab Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期二, 14 十月 2025 16:34:22 +0800
Subject: [PATCH] 改bug
---
admin/src/views/system/user.vue | 77 ++++++++++++++++++++++++--------------
1 files changed, 49 insertions(+), 28 deletions(-)
diff --git a/admin/src/views/system/user.vue b/admin/src/views/system/user.vue
index 1209412..1e69dc9 100644
--- a/admin/src/views/system/user.vue
+++ b/admin/src/views/system/user.vue
@@ -11,12 +11,20 @@
<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="rootDeptId">
- <DepartmentSelect v-model="searchForm.rootDeptId" placeholder="璇烽�夋嫨鎵�灞為儴闂�" clearable/>
+ <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="positionId">
- <PositionSelect v-model="searchForm.positionId" placeholder="璇烽�夋嫨宀椾綅" clearable/>
+ <el-form-item label="瑙掕壊" prop="roleId">
+ <el-select v-model="searchForm.roleId" placeholder="璇烽�夋嫨瑙掕壊" @change="search">
+ <el-option :label="item.name" :value="item.id" v-for="(item, index) in rolesList" :key="index"></el-option>
+ </el-select>
</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>
@@ -29,40 +37,43 @@
<li v-permissions="['system:user:delete']"><el-button icon="el-icon-delete" @click="deleteByIdInBatch">鍒犻櫎</el-button></li>
</ul>
<el-table
- v-loading="isWorking.search"
- :data="tableData.list"
- :default-sort = "{prop: 'createTime', order: 'descending'}"
- stripe
- @selection-change="handleSelectionChange"
- @sort-change="handleSortChange"
- >
+ :height="tableHeightNew"
+ v-loading="isWorking.search"
+ :data="tableData.list"
+ :default-sort = "{prop: 'createTime', order: 'descending'}"
+ stripe
+ @selection-change="handleSelectionChange"
+ @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="realname" label="濮撳悕" min-width="100px" fixed="left"></el-table-column>
+ <el-table-column prop="realname" label="濮撳悕" width="80px" 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="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="companyName" label="鎵�灞炵粍缁�" show-overflow-tooltip 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="openid" label="寰俊openid" show-overflow-tooltip 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>
@@ -73,11 +84,11 @@
<el-table-column prop="createUser" label="鍒涘缓浜�" min-width="100px">
<template slot-scope="{row}">{{row.createUserInfo == null ? '' : row.createUserInfo.username}}</template>
</el-table-column>
- <el-table-column prop="createTime" label="鍒涘缓鏃堕棿" sortable="custom" sort-by="CREATE_TIME" min-width="140px"></el-table-column>
+ <el-table-column prop="createTime" label="鍒涘缓鏃堕棿" sortable="custom" sort-by="CREATE_TIME" min-width="150px"></el-table-column>
<el-table-column prop="updateUser" label="鏇存柊浜�" min-width="100px">
<template slot-scope="{row}">{{row.updateUserInfo == null ? '' : row.updateUserInfo.username}}</template>
</el-table-column>
- <el-table-column prop="updateTime" label="鏇存柊鏃堕棿" sortable="custom" sort-by="UPDATE_TIME" min-width="140px"></el-table-column>
+ <el-table-column prop="updateTime" label="鏇存柊鏃堕棿" sortable="custom" sort-by="UPDATE_TIME" min-width="150px"></el-table-column>
<el-table-column
v-if="containPermissions(['system:user:update', 'system:user:createUserRole', 'system:user:resetPwd', 'system:user:delete'])"
label="鎿嶄綔"
@@ -116,7 +127,7 @@
import ResetPwdWindow from '@/components/system/user/ResetPwdWindow'
import DepartmentSelect from '@/components/common/DepartmentSelect'
import PositionSelect from '@/components/common/PositionSelect'
-
+import { fetchAll as fetchAllRoles, fetchAll } from '@/api/system/role'
export default {
name: 'SystemUser',
extends: BaseTable,
@@ -129,8 +140,11 @@
realname: '', // 濮撳悕
rootDeptId: null, // 閮ㄩ棬ID
positionId: null, // 宀椾綅ID
+ companyName: null, // 浼佷笟鍚嶇О
+ roleId: null, // 瑙掕壊
mobile: '' // 鎵嬫満鍙风爜
- }
+ },
+ rolesList: []
}
},
created () {
@@ -144,6 +158,13 @@
}]
})
this.search()
+ fetchAllRoles()
+ .then(records => {
+ this.rolesList = records
+ })
+ .catch(e => {
+ this.$tip.apiFailed(e)
+ })
}
}
</script>
--
Gitblit v1.9.3