Commit 24657a47b2c57be8829df91296a7989c2cc79279

Authored by 谭毅彬
1 parent 6c6c7aa8

优化用户管理页面设计

Signed-off-by: TanYibin <5491541@qq.com>
ant-design-vue-jeecg/src/views/system/LogList.vue
... ... @@ -64,7 +64,7 @@
64 64 <div style="margin: 0">
65 65 <div style="margin-bottom: 5px">
66 66 <a-badge status="success" style="vertical-align: middle;"/>
67   - <span style="vertical-align: middle;">请求方法:{{ record.method }}</span></div>
  67 + <span style="vertical-align: middle;">请求方法: {{ record.method }}</span></div>
68 68 <div>
69 69 <a-badge status="processing" style="vertical-align: middle;"/>
70 70 <span style="vertical-align: middle;">请求参数:{{ record.requestParam }}</span></div>
... ... @@ -72,7 +72,7 @@
72 72 </template>
73 73  
74 74 <!-- 字符串超长截取省略号显示-->
75   - <span slot="logContent" slot-scope="text, record">
  75 + <span slot="logContent" slot-scope="text">
76 76 <j-ellipsis :value="text" :length="40"/>
77 77 </span>
78 78 </a-table>
... ...
ant-design-vue-jeecg/src/views/system/UserList.vue
... ... @@ -24,8 +24,8 @@
24 24 </a-col>
25 25 <template v-if="toggleSearchStatus">
26 26 <a-col :md="6" :sm="8">
27   - <a-form-item label="真实名字">
28   - <a-input placeholder="请输入真实名字" v-model="queryParam.realname"></a-input>
  27 + <a-form-item label="用户姓名">
  28 + <a-input placeholder="请输入用户姓名" v-model="queryParam.realname"></a-input>
29 29 </a-form-item>
30 30 </a-col>
31 31  
... ... @@ -74,22 +74,13 @@
74 74 <a-dropdown v-if="selectedRowKeys.length > 0">
75 75 <a-menu slot="overlay" @click="handleMenuClick">
76 76 <a-menu-item key="1">
77   - <a-icon type="delete" v-has="'user:deleteBatch'" @click="batchDel"/>
78   - 删除
79   - </a-menu-item>
  77 + <a-icon type="delete" v-has="'user:deleteBatch'" @click="batchDel"/>删除</a-menu-item>
80 78 <a-menu-item key="2">
81   - <a-icon type="lock" v-has="'user:frozenBatch'" @click="batchFrozen('2')"/>
82   - 冻结
83   - </a-menu-item>
  79 + <a-icon type="lock" v-has="'user:frozenBatch'" @click="batchFrozen('2')"/>冻结</a-menu-item>
84 80 <a-menu-item key="3">
85   - <a-icon v-has="'user:thawBatch'" type="unlock" @click="batchFrozen('1')"/>
86   - 解冻
87   - </a-menu-item>
  81 + <a-icon v-has="'user:thawBatch'" type="unlock" @click="batchFrozen('1')"/>解冻</a-menu-item>
88 82 </a-menu>
89   - <a-button style="margin-left: 8px">
90   - 批量操作
91   - <a-icon type="down"/>
92   - </a-button>
  83 + <a-button style="margin-left: 8px">批量操作<a-icon type="down"/></a-button>
93 84 </a-dropdown>
94 85 <j-super-query :fieldList="superQueryFieldList" @handleSuperQuery="handleSuperQuery"/>
95 86 </div>
... ... @@ -121,6 +112,12 @@
121 112 </a-tag>
122 113 </span>
123 114  
  115 + <span slot="selectedRoles" slot-scope="selectedRoles" >
  116 + <a-tag v-for="selectedRole in selectedRoles" :key="selectedRole" color=pink>
  117 + {{ solutionRole(selectedRole) }}
  118 + </a-tag>
  119 + </span>
  120 +
124 121 <template slot="avatarslot" slot-scope="text, record">
125 122 <div class="anty-img-wrap">
126 123 <a-avatar shape="square" :src="getAvatarView(record.avatar)" icon="user"/>
... ... @@ -192,7 +189,7 @@
192 189 import UserModal from './modules/UserModal'
193 190 import PasswordModal from './modules/PasswordModal'
194 191 import {putAction, getFileAccessHttpUrl} from '@/api/manage';
195   -import {frozenBatch, getAllWarehouseList} from '@/api/api'
  192 +import {frozenBatch, getAllWarehouseList, queryall} from '@/api/api'
196 193 import {JeecgListMixin} from '@/mixins/JeecgListMixin'
197 194 import SysUserAgentModal from "./modules/SysUserAgentModal";
198 195 import JInput from '@/components/jeecg/JInput'
... ... @@ -218,6 +215,7 @@ export default {
218 215 queryParam: {},
219 216 recycleBinVisible: false,
220 217 allWarehouseList: [],
  218 + rolesOptions: [],
221 219 columns: [
222 220 /*{
223 221 title: '#',
... ... @@ -233,8 +231,7 @@ export default {
233 231 title: '用户账号',
234 232 align: "center",
235 233 dataIndex: 'username',
236   - width: 120,
237   - sorter: true,
  234 + width: 120
238 235 },
239 236 {
240 237 title: '用户姓名',
... ... @@ -243,26 +240,39 @@ export default {
243 240 dataIndex: 'realname',
244 241 },
245 242 {
246   - title: '头像',
  243 + title: '工号',
247 244 align: "center",
248 245 width: 100,
249   - dataIndex: 'avatar',
250   - scopedSlots: {customRender: "avatarslot"}
  246 + dataIndex: 'workNo',
251 247 },
  248 + // {
  249 + // title: '头像',
  250 + // align: "center",
  251 + // width: 100,
  252 + // dataIndex: 'avatar',
  253 + // scopedSlots: {customRender: "avatarslot"}
  254 + // },
252 255  
253 256 {
254 257 title: '性别',
255 258 align: "center",
256 259 width: 80,
257   - dataIndex: 'sex_dictText',
258   - sorter: true
  260 + dataIndex: 'sex_dictText'
259 261 },
260 262 {
261   - title: '生日',
  263 + title: '角色',
262 264 align: "center",
263   - width: 100,
264   - dataIndex: 'birthday'
  265 + width: 200,
  266 + dataIndex: 'selectedRoles',
  267 + key: 'selectedRoles',
  268 + scopedSlots: {customRender: 'selectedRoles'}
265 269 },
  270 + // {
  271 + // title: '生日',
  272 + // align: "center",
  273 + // width: 100,
  274 + // dataIndex: 'birthday'
  275 + // },
266 276 {
267 277 title: '手机号码',
268 278 align: "center",
... ... @@ -270,9 +280,14 @@ export default {
270 280 dataIndex: 'phone'
271 281 },
272 282 {
273   - title: '所属仓库',
  283 + title: '邮箱',
274 284 align: "center",
275 285 width: 200,
  286 + dataIndex: 'email'
  287 + },
  288 + {
  289 + title: '所属仓库',
  290 + align: "center",
276 291 dataIndex: 'selectedWarehouses',
277 292 key: 'selectedWarehouses',
278 293 scopedSlots: {customRender: 'selectedWarehouses'}
... ... @@ -294,13 +309,15 @@ export default {
294 309 width: 80,
295 310 dataIndex: 'status_dictText'
296 311 },
  312 +
  313 +
297 314 {
298 315 title: '操作',
299 316 dataIndex: 'action',
300 317 fixed: 'right',
301 318 scopedSlots: {customRender: 'action'},
302 319 align: "center",
303   - width: 150
  320 + width: 147
304 321 }
305 322  
306 323 ],
... ... @@ -334,6 +351,15 @@ export default {
334 351 this.allWarehouseList = res.result
335 352 }
336 353 });
  354 + queryall().then((res) => {
  355 + if (res.success) {
  356 + debugger
  357 + this.rolesOptions = res.result.map((item, index, arr) => {
  358 + return {label: item.id + "", value: item.roleName}
  359 + })
  360 + console.info(this.rolesOptions);
  361 + }
  362 + });
337 363 },
338 364 solutionWarehouse(value) {
339 365 var actions = []
... ... @@ -345,6 +371,16 @@ export default {
345 371 })
346 372 return actions.join('')
347 373 },
  374 + solutionRole(value) {
  375 + var actions = []
  376 + Object.keys(this.rolesOptions).some((key) => {
  377 + if (this.rolesOptions[key].label == ('' + value)) {
  378 + actions.push(this.rolesOptions[key].value)
  379 + return true
  380 + }
  381 + })
  382 + return actions.join('')
  383 + },
348 384 getAvatarView: function (avatar) {
349 385 return getFileAccessHttpUrl(avatar)
350 386 },
... ...
ant-design-vue-jeecg/src/views/system/modules/UserModal.vue
... ... @@ -48,9 +48,9 @@
48 48 <a-input placeholder="请输入手机号码" v-model="model.phone"/>
49 49 </a-form-model-item>
50 50  
51   - <a-form-model-item label="职务" :labelCol="labelCol" :wrapperCol="wrapperCol">
  51 + <!-- <a-form-model-item label="职务" :labelCol="labelCol" :wrapperCol="wrapperCol">
52 52 <j-select-position placeholder="请选择职务" :multiple="false" v-model="model.post"/>
53   - </a-form-model-item>
  53 + </a-form-model-item> -->
54 54  
55 55 <a-form-model-item label="角色分配" :labelCol="labelCol" :wrapperCol="wrapperCol" v-show="!roleDisabled" prop="selectedRoles">
56 56 <j-multi-select-tag
... ... @@ -71,48 +71,49 @@
71 71 </a-form-model-item>
72 72  
73 73 <!--部门分配-->
74   - <a-form-model-item label="部门分配" :labelCol="labelCol" :wrapperCol="wrapperCol" v-show="!departDisabled">
  74 + <!-- <a-form-model-item label="部门分配" :labelCol="labelCol" :wrapperCol="wrapperCol" v-show="!departDisabled">
75 75 <j-select-depart v-model="model.selecteddeparts" :multi="true" @back="backDepartInfo" :backDepart="true" :treeOpera="true">
76 76 </j-select-depart>
77   - </a-form-model-item>
  77 + </a-form-model-item> -->
78 78  
79 79 <!--租户分配-->
80   - <a-form-model-item label="租户分配" :labelCol="labelCol" :wrapperCol="wrapperCol" v-show="!departDisabled">
  80 + <!-- <a-form-model-item label="租户分配" :labelCol="labelCol" :wrapperCol="wrapperCol" v-show="!departDisabled">
81 81 <j-multi-select-tag
82 82 :disabled="disableSubmit"
83 83 v-model="model.relTenantIds"
84 84 :options="tenantsOptions"
85 85 placeholder="请选择租户">
86 86 </j-multi-select-tag>
87   - </a-form-model-item>
  87 + </a-form-model-item> -->
88 88  
89   - <a-form-model-item label="身份" :labelCol="labelCol" :wrapperCol="wrapperCol">
  89 + <!-- <a-form-model-item label="身份" :labelCol="labelCol" :wrapperCol="wrapperCol">
90 90 <a-radio-group v-model="model.userIdentity" @change="identityChange">
91 91 <a-radio :value="1">普通用户</a-radio>
92 92 <a-radio :value="2">上级</a-radio>
93 93 </a-radio-group>
94   - </a-form-model-item>
95   - <a-form-model-item label="负责部门" :labelCol="labelCol" :wrapperCol="wrapperCol" v-if="departIdShow==true">
  94 + </a-form-model-item> -->
  95 +
  96 + <!-- <a-form-model-item label="负责部门" :labelCol="labelCol" :wrapperCol="wrapperCol" v-if="departIdShow==true">
96 97 <j-multi-select-tag
97 98 :disabled="disableSubmit"
98 99 v-model="model.departIds"
99 100 :options="nextDepartOptions"
100 101 placeholder="请选择负责部门">
101 102 </j-multi-select-tag>
102   - </a-form-model-item>
  103 + </a-form-model-item> -->
103 104  
104   - <a-form-model-item label="头像" :labelCol="labelCol" :wrapperCol="wrapperCol">
  105 + <!-- <a-form-model-item label="头像" :labelCol="labelCol" :wrapperCol="wrapperCol">
105 106 <j-image-upload class="avatar-uploader" text="上传" v-model="model.avatar"></j-image-upload>
106   - </a-form-model-item>
  107 + </a-form-model-item> -->
107 108  
108   - <a-form-model-item label="生日" :labelCol="labelCol" :wrapperCol="wrapperCol">
  109 + <!-- <a-form-model-item label="生日" :labelCol="labelCol" :wrapperCol="wrapperCol">
109 110 <a-date-picker
110 111 style="width: 100%"
111 112 placeholder="请选择生日"
112 113 v-model="model.birthday"
113 114 :format="dateFormat"
114 115 :getCalendarContainer="node => node.parentNode"/>
115   - </a-form-model-item>
  116 + </a-form-model-item> -->
116 117  
117 118 <a-form-model-item label="性别" :labelCol="labelCol" :wrapperCol="wrapperCol">
118 119 <a-select v-model="model.sex" placeholder="请选择性别" :getPopupContainer="(target) => target.parentNode">
... ... @@ -125,14 +126,14 @@
125 126 <a-input placeholder="请输入邮箱" v-model="model.email"/>
126 127 </a-form-model-item>
127 128  
128   - <a-form-model-item label="座机" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="telephone">
  129 + <!-- <a-form-model-item label="座机" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="telephone">
129 130 <a-input placeholder="请输入座机" v-model="model.telephone"/>
130   - </a-form-model-item>
  131 + </a-form-model-item> -->
131 132  
132   - <a-form-model-item label="工作流引擎" :labelCol="labelCol" :wrapperCol="wrapperCol">
  133 + <!-- <a-form-model-item label="工作流引擎" :labelCol="labelCol" :wrapperCol="wrapperCol">
133 134 <j-dict-select-tag v-model="model.activitiSync" placeholder="请选择是否同步工作流引擎" :type="'radio'"
134 135 dictCode="activiti_sync"/>
135   - </a-form-model-item>
  136 + </a-form-model-item> -->
136 137  
137 138 </a-form-model>
138 139 </a-spin>
... ...