diff --git a/klp-ui/src/views/wms/warehouse/components/WarehouseBird.vue b/klp-ui/src/views/wms/warehouse/components/WarehouseBird.vue index 8a938e2c..7542b94b 100644 --- a/klp-ui/src/views/wms/warehouse/components/WarehouseBird.vue +++ b/klp-ui/src/views/wms/warehouse/components/WarehouseBird.vue @@ -53,7 +53,8 @@ 初始化库位 + :canToggle="canToggle" :canRelease="canRelease" + @split-warehouse="handleSplitWarehouse" @merge-warehouse="handleMergeWarehouse" @release-warehouse="handleReleaseWarehouse"/> @@ -73,6 +74,14 @@ export default { id: { type: String, default: '' + }, + canToggle: { + default: true, + type: Boolean + }, + canRelease: { + default: false, + type: Boolean } }, data() { @@ -84,7 +93,7 @@ export default { total: 0, columnCount: 0, columnDetail: {} - } + }, }; }, watch: { @@ -104,6 +113,10 @@ export default { handleMergeWarehouse(warehouse) { this.$emit('merge-warehouse', warehouse); }, + + handleReleaseWarehouse(warehouse) { + this.$emit('release-warehouse', warehouse); + }, /** * 解析第三级库位编码 * 新规则: diff --git a/klp-ui/src/views/wms/warehouse/components/WarehouseGrid.vue b/klp-ui/src/views/wms/warehouse/components/WarehouseGrid.vue deleted file mode 100644 index d68259e4..00000000 --- a/klp-ui/src/views/wms/warehouse/components/WarehouseGrid.vue +++ /dev/null @@ -1,367 +0,0 @@ - - - - - \ No newline at end of file diff --git a/klp-ui/src/views/wms/warehouse/components/WarehouseInterlaced.vue b/klp-ui/src/views/wms/warehouse/components/WarehouseInterlaced.vue index 80ec8ae5..bdc2f232 100644 --- a/klp-ui/src/views/wms/warehouse/components/WarehouseInterlaced.vue +++ b/klp-ui/src/views/wms/warehouse/components/WarehouseInterlaced.vue @@ -11,7 +11,7 @@ {{ col }}