Commit 4433fd167f70aba65bb42ed69bcb5bc1e6e38f0b
1 parent
04de9dfb
接口日志添加接口名称动态筛选功能,优化若干页面按钮显示(2)
Signed-off-by: TanYibin <5491541@qq.com>
Showing
2 changed files
with
16 additions
and
25 deletions
ant-design-vue-jeecg/src/views/system/UserList.vue
... | ... | @@ -230,19 +230,16 @@ export default { |
230 | 230 | { |
231 | 231 | title: '用户账号', |
232 | 232 | align: "center", |
233 | - dataIndex: 'username', | |
234 | - width: 120 | |
233 | + dataIndex: 'username' | |
235 | 234 | }, |
236 | 235 | { |
237 | 236 | title: '用户姓名', |
238 | 237 | align: "center", |
239 | - width: 100, | |
240 | 238 | dataIndex: 'realname', |
241 | 239 | }, |
242 | 240 | { |
243 | 241 | title: '工号', |
244 | 242 | align: "center", |
245 | - width: 100, | |
246 | 243 | dataIndex: 'workNo', |
247 | 244 | }, |
248 | 245 | // { |
... | ... | @@ -256,13 +253,11 @@ export default { |
256 | 253 | { |
257 | 254 | title: '性别', |
258 | 255 | align: "center", |
259 | - width: 80, | |
260 | 256 | dataIndex: 'sex_dictText' |
261 | 257 | }, |
262 | 258 | { |
263 | 259 | title: '角色', |
264 | 260 | align: "center", |
265 | - width: 200, | |
266 | 261 | dataIndex: 'selectedRoles', |
267 | 262 | key: 'selectedRoles', |
268 | 263 | scopedSlots: {customRender: 'selectedRoles'} |
... | ... | @@ -276,19 +271,18 @@ export default { |
276 | 271 | { |
277 | 272 | title: '手机号码', |
278 | 273 | align: "center", |
279 | - width: 100, | |
280 | 274 | dataIndex: 'phone' |
281 | 275 | }, |
282 | 276 | { |
283 | 277 | title: '邮箱', |
284 | 278 | align: "center", |
285 | - width: 200, | |
286 | 279 | dataIndex: 'email' |
287 | 280 | }, |
288 | 281 | { |
289 | 282 | title: '所属仓库', |
290 | 283 | align: "center", |
291 | 284 | dataIndex: 'selectedWarehouses', |
285 | + width: 300, | |
292 | 286 | key: 'selectedWarehouses', |
293 | 287 | scopedSlots: {customRender: 'selectedWarehouses'} |
294 | 288 | }, |
... | ... | @@ -306,11 +300,8 @@ export default { |
306 | 300 | { |
307 | 301 | title: '状态', |
308 | 302 | align: "center", |
309 | - width: 80, | |
310 | 303 | dataIndex: 'status_dictText' |
311 | 304 | }, |
312 | - | |
313 | - | |
314 | 305 | { |
315 | 306 | title: '操作', |
316 | 307 | dataIndex: 'action', |
... | ... |
ant-design-vue-jeecg/src/views/system/config/LocationList.vue
... | ... | @@ -19,22 +19,22 @@ |
19 | 19 | <j-dict-select-tag placeholder="请选择状态" v-model="queryParam.status" dictCode="location_status" /> |
20 | 20 | </a-form-item> |
21 | 21 | </a-col> |
22 | - <a-col :xl="6" :lg="7" :md="8" :sm="24"> | |
23 | - <a-form-item label="库位类型"> | |
24 | - <a-select | |
25 | - show-search | |
26 | - placeholder="请选择库位类型" | |
27 | - option-filter-prop="children" | |
28 | - v-model="queryParam.locationTypeCode" | |
29 | - > | |
30 | - <a-select-option v-for="item in locationTypeList" :key="item.name" :value="item.code"> | |
31 | - {{ item.name }} | |
32 | - </a-select-option> | |
33 | - </a-select> | |
34 | - </a-form-item> | |
35 | - </a-col> | |
36 | 22 | <template v-if="toggleSearchStatus"> |
37 | 23 | <a-col :xl="6" :lg="7" :md="8" :sm="24"> |
24 | + <a-form-item label="库位类型"> | |
25 | + <a-select | |
26 | + show-search | |
27 | + placeholder="请选择库位类型" | |
28 | + option-filter-prop="children" | |
29 | + v-model="queryParam.locationTypeCode" | |
30 | + > | |
31 | + <a-select-option v-for="item in locationTypeList" :key="item.name" :value="item.code"> | |
32 | + {{ item.name }} | |
33 | + </a-select-option> | |
34 | + </a-select> | |
35 | + </a-form-item> | |
36 | + </a-col> | |
37 | + <a-col :xl="6" :lg="7" :md="8" :sm="24"> | |
38 | 38 | <a-form-item label="库区"> |
39 | 39 | <a-select |
40 | 40 | show-search |
... | ... |