wms / wms4 · Commits

Commit fc118dc62a9d25c6dc3522509a6398858b6cdf7c

Authored by 谭毅彬
1 parent 4e9fcefb

用户管理所属库区页面显示优化 

Signed-off-by: TanYibin <5491541@qq.com>
Inline Side-by-side
Showing 2 changed files with 15 additions and 14 deletions
ant-design-vue-jeecg/src/views/system/UserList.vue
  View file @fc118dc
... ... @@ -298,6 +298,7 @@ export default {
298 298 title: '所属库区',
299 299 align: "center",
300 300 dataIndex: 'zoneCodes',
  301 + width: 300,
301 302 key: 'zoneCodes',
302 303 scopedSlots: {customRender: 'zoneCodes'}
303 304 },
... ...
ant-design-vue-jeecg/src/views/system/modules/UserModal.vue
  View file @fc118dc
... ... @@ -70,12 +70,12 @@
70 70 </j-multi-select-tag>
71 71 </a-form-model-item>
72 72  
73   - <a-form-model-item label="库区分配" :labelCol="labelCol" :wrapperCol="wrapperCol" v-show="!warehouseDisable" prop="selectedZoneCode">
  73 + <a-form-model-item label="库区分配" :labelCol="labelCol" :wrapperCol="wrapperCol" v-show="!warehouseDisable" prop="zoneCode">
74 74 <j-multi-select-tag
75 75 :disabled="disableSubmit"
76   - v-model="model.selectedZoneCode"
  76 + v-model="model.zoneCode"
77 77 :options="zoneOptions"
78   - placeholder="请选择仓库">
  78 + placeholder="请选择库区">
79 79 </j-multi-select-tag>
80 80 </a-form-model-item>
81 81  
... ... @@ -162,7 +162,7 @@ import moment from &#39;moment&#39;
162 162 import Vue from 'vue'
163 163 import {ACCESS_TOKEN} from "@/store/mutation-types"
164 164 import {getAction} from '@/api/manage'
165   -import {addUser, editUser, queryUserRole, queryall, queryWarehouse, getAllWarehouseList, getAllZoneList} from '@/api/api'
  165 +import {addUser, editUser, queryUserRole, queryall, queryWarehouse, getAllWarehouseList, getZoneList} from '@/api/api'
166 166 import {disabledAuthFilter} from "@/utils/authFilter"
167 167 import {duplicateCheck} from '@/api/api'
168 168  
... ... @@ -255,7 +255,7 @@ export default {
255 255 //根据屏幕宽度自适应抽屉宽度
256 256 this.resetScreenSize();
257 257 that.userId = record.id;
258   - that.model = Object.assign({}, {selectedRoles: '', selectedWarehouse: '',selecteddeparts: '', selectedZoneCode: ''}, record);
  258 + that.model = Object.assign({}, {selectedRoles: '', selectedWarehouse: '',selecteddeparts: '', zoneCode: ''}, record);
259 259 //身份为上级显示负责部门，否则不显示
260 260 if (this.model.userIdentity == 2) {
261 261 this.departIdShow = true;
... ... @@ -327,7 +327,7 @@ export default {
327 327 });
328 328 },
329 329 initZoneList() {
330   - getAllZoneList().then((res) => {
  330 + getZoneList().then((res) => {
331 331 if (res.success) {
332 332 this.zoneOptions = res.result.map((item, index, arr) => {
333 333 let c = {label: item.name, value: item.code}
... ... @@ -337,14 +337,14 @@ export default {
337 337 }
338 338 });
339 339 },
340   - getWarehouse(userid) {
341   - queryWarehouse({userid: userid}).then((res) => {
342   - if (res.success) {
343   - this.model.selectedWarehouse = res.result.join(",");
344   - console.log('that.model.selectedWarehouse=', this.model.selectedWarehouse)
345   - }
346   - });
347   - },
  340 + // getWarehouse(userid) {
  341 + // queryWarehouse({userid: userid}).then((res) => {
  342 + // if (res.success) {
  343 + // this.model.selectedWarehouse = res.result.join(",");
  344 + // console.log('that.model.selectedWarehouse=', this.model.selectedWarehouse)
  345 + // }
  346 + // });
  347 + // },
348 348 getUserRoles(userid) {
349 349 queryUserRole({userid: userid}).then((res) => {
350 350 if (res.success) {
... ...