From 9003bd663cfeea9225a37e653afca4e8c698c990 Mon Sep 17 00:00:00 2001
From: zhuo <2089219845@qq.com>
Date: 星期六, 15 三月 2025 13:58:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
src/views/system/user/index.vue | 18 ++++++------------
1 files changed, 6 insertions(+), 12 deletions(-)
diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index 95dc281..469b8a2 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -8,8 +8,8 @@
<div class="head-container addButton">
<el-input v-model="deptName" placeholder="閮ㄩ棬鍚嶇О" clearable size="small" prefix-icon="el-icon-search"
style="margin-bottom: 20px" />
- <el-button style="margin-left: 4px" type="primary" plain icon="el-icon-plus" size="mini" circle
- @click="addSchema"></el-button>
+ <!-- <el-button style="margin-left: 4px" type="primary" plain icon="el-icon-plus" size="mini" circle
+ @click="addSchema"></el-button> -->
</div>
<div class="head-container">
<el-tree :data="deptOptions" :props="defaultProps" :expand-on-click-node="false"
@@ -47,7 +47,7 @@
</div>
</div>
<el-col>
- <el-table v-loading="loading" :data="userList">
+ <el-table v-loading="loading" :data="userList" :header-cell-style="{ background: '#f8f8f9', color: '#515a6e' }" border>
<el-table-column label="搴忓彿" align="center" type="index" />
<el-table-column label="濮撳悕" align="center" key="nickName" prop="nickName" :show-overflow-tooltip="true" />
<el-table-column label="璐﹀彿" align="center" key="userName" prop="userName" :show-overflow-tooltip="true" />
@@ -149,7 +149,8 @@
</el-col>
<el-col :span="12">
<el-form-item label="褰掑睘閮ㄩ棬" prop="deptId">
- <treeselect v-model="form.deptId" :options="enabledDeptOptions" :show-count="true" placeholder="璇烽�夋嫨褰掑睘閮ㄩ棬" />
+ <treeselect v-model="form.deptId" :options="enabledDeptOptions" :show-count="true"
+ placeholder="璇烽�夋嫨褰掑睘閮ㄩ棬" />
</el-form-item>
</el-col>
</el-row>
@@ -223,6 +224,7 @@
style="width: 50%" @keyup.enter.native="searchPerson()"></el-input>
</div>
<el-table height="67vh" stripe :data="personList" v-loading="personLoad" ref="personTable"
+ :header-cell-style="{ background: '#f8f8f9', color: '#515a6e' }" border
@selection-change="handleSelectionChange">
<el-table-column type="selection" width="50">
</el-table-column>
@@ -447,10 +449,6 @@
}
this.addLoad = true
addDepartment(this.addOb).then(res => {
- if (res.code === 201) {
- this.addLoad = false
- return
- }
this.$message.success('娣诲姞鎴愬姛')
this.addDia = false
this.getList()
@@ -655,10 +653,6 @@
person: this.multipleSelection,
roleId: this.componentData.entity.roleId
}).then(res => {
- if (res.code === 201) {
- this.addLoad = false
- return
- }
this.$message.success('鎿嶄綔鎴愬姛')
this.multipleSelection = []
this.$refs.personTable.clearSelection()
--
Gitblit v1.9.3