diff --git a/klp-ui/src/views/wms/print/scaner.vue b/klp-ui/src/views/wms/print/scaner.vue index 69cb3a23..a1d1e0f3 100644 --- a/klp-ui/src/views/wms/print/scaner.vue +++ b/klp-ui/src/views/wms/print/scaner.vue @@ -22,12 +22,12 @@
- + - + - + - + - - - - - - - + - + 批量确认 @@ -60,7 +54,7 @@
- + - + @@ -332,13 +326,6 @@ export default { flex-direction: column; } -.main-panel { - display: flex; - flex-direction: column; - height: calc(100vh - 40px); - padding: 0 !important; -} - .panel-header { padding: 15px 20px; border-bottom: 1px solid #ebeef5; @@ -434,6 +421,8 @@ export default { box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1); padding: 15px 20px; margin-bottom: 20px; + display: flex; + flex-wrap: wrap; } .filter-form { diff --git a/klp-ui/src/views/wms/stock/index.vue b/klp-ui/src/views/wms/stock/index.vue index 4b405771..b7c6c444 100644 --- a/klp-ui/src/views/wms/stock/index.vue +++ b/klp-ui/src/views/wms/stock/index.vue @@ -11,19 +11,7 @@
- - - - - - - - - - + @@ -148,6 +136,7 @@ import ProductInfo from "@/components/KLPService/Renderer/ProductInfo"; import BomInfoMini from "@/components/KLPService/Renderer/BomInfoMini"; import StockIo from './panels/stockIo.vue'; import WarehouseTree from "@/components/KLPService/WarehouseTree/index.vue"; +import MaterialSelect from "@/components/KLPService/MaterialSelect"; export default { name: "Stock", @@ -161,7 +150,8 @@ export default { ProductInfo, BomInfoMini, StockIo, - WarehouseTree + WarehouseTree, + MaterialSelect }, data() { return {