diff --git a/src/api/util/mapDrawing.js b/src/api/util/mapDrawing.js index 3bd013a..cc9e1f3 100644 --- a/src/api/util/mapDrawing.js +++ b/src/api/util/mapDrawing.js @@ -127,7 +127,11 @@ class MapDrawing extends EventEmitter { this.property.renderer.setSize(this.property.width, this.property.height - 180) document.getElementById('mapContainer').appendChild(this.property.renderer.domElement) // 设置背景色 - this.property.renderer.setClearColor(0x000000, 1.0) + this.property.renderer.setClearColor( '#808e9b', 1)//淡灰 + // this.property.renderer.setClearColor( '#686de0', 1) + // this.property.renderer.setClearColor( '#dff9fb', 1)//淡 + // this.property.renderer.setClearColor( '#487eb0', 1)//淡 + // this.property.renderer.setClearColor( '#6a85cf', 1)//淡蓝 } /** @@ -756,7 +760,6 @@ class MapDrawing extends EventEmitter { let stateDictionary = this.property.config.tileStateDictionary[this.property.config.tileStateDictionary.hasOwnProperty(storageRack.state) ? storageRack.state : '0'] //疑似仓库地图 点位`1 // console.log('仓库',this.property.layer.levels.nowLevel); - let storageRackInfo = { id: storageRack.id, type: 'storageRack', @@ -780,7 +783,6 @@ class MapDrawing extends EventEmitter { // console.log('你好,Mr.sun',storageRackInfo); storageRack.childNodes = self.drawRactangleInParentWithLevel(storageRackInfo, freightSpaces, dictionary) } else { - console.log(2222); storageRack.childNodes = self.drawRactangleInParent(storageRackInfo, freightSpaces, dictionary) } })) diff --git a/src/api/wms/busFunctions/storeManager/sysStock.js b/src/api/wms/busFunctions/storeManager/sysStock.js index 909c28b..3963974 100644 --- a/src/api/wms/busFunctions/storeManager/sysStock.js +++ b/src/api/wms/busFunctions/storeManager/sysStock.js @@ -33,4 +33,11 @@ export function queryStockDetailListExport(query) { params: query }) } - +// 查询货位地图 +export function getBaseLocationForMap(query) { + return request({ + url: '/wms/location/getBaseLocationForMap', + method: 'get', + params: query + }) +} diff --git a/src/views/libraryManage/inventoryLock/examine/extract.vue b/src/views/libraryManage/inventoryLock/examine/extract.vue index b816fe9..b62d390 100644 --- a/src/views/libraryManage/inventoryLock/examine/extract.vue +++ b/src/views/libraryManage/inventoryLock/examine/extract.vue @@ -73,6 +73,13 @@ export default { istrue: true, 'min-width': 120, 'show-overflow-tooltip': true + }, + { + label: '单据状态', + prop: 'orderStatus', + istrue: true, + 'min-width': 120, + 'show-overflow-tooltip': true } ] }, @@ -125,7 +132,6 @@ export default { listLock(obj) .then((res) => { if (res.code === 200) { - console.log(res.rows) this.tableData = res.rows.filter((item) => { return item.orderStatus !== 'out' }) diff --git a/src/views/libraryManage/warehouseMap/index.vue b/src/views/libraryManage/warehouseMap/index.vue index afe5e08..ddf334f 100644 --- a/src/views/libraryManage/warehouseMap/index.vue +++ b/src/views/libraryManage/warehouseMap/index.vue @@ -1,7 +1,8 @@