diff --git a/klp-ui/src/components/CoilSelector/index.vue b/klp-ui/src/components/CoilSelector/index.vue index 5acd7105..34fb5399 100644 --- a/klp-ui/src/components/CoilSelector/index.vue +++ b/klp-ui/src/components/CoilSelector/index.vue @@ -39,6 +39,9 @@ + + + 搜索 @@ -86,12 +89,14 @@ import { listMaterialCoil } from '@/api/wms/coil'; import MemoInput from '@/components/MemoInput/index.vue'; import MutiSelect from '@/components/MutiSelect/index.vue'; import { defaultColumns } from './data'; +import ActualWarehouseSelect from '@/components/KLPService/ActualWarehouseSelect/index.vue'; export default { name: 'CoilSelector', components: { MemoInput, - MutiSelect + MutiSelect, + ActualWarehouseSelect }, dicts: ['coil_itemname', 'coil_material', 'coil_manufacturer'], props: { @@ -102,7 +107,7 @@ export default { }, dialogWidth: { type: String, - default: '900px' + default: '1000px' }, // 过滤条件(可以预设一些查询条件) filters: { @@ -146,6 +151,11 @@ export default { type: Boolean, default: false }, + // 是否根据实际库区查询钢卷 + orderBy: { + type: Boolean, + default: false + }, }, data() { return { @@ -161,6 +171,7 @@ export default { pageSize: 10, currentCoilNo: null, grade: null, + actualWarehouseId: null, selectType: 'product', status: 0, // 不包含已发货的钢卷 dataType: 1 // 只查询当前数据,不查询历史数据 diff --git a/klp-ui/src/views/wms/delivery/components/detailTable.vue b/klp-ui/src/views/wms/delivery/components/detailTable.vue index ae0bd304..14ba0d00 100644 --- a/klp-ui/src/views/wms/delivery/components/detailTable.vue +++ b/klp-ui/src/views/wms/delivery/components/detailTable.vue @@ -48,7 +48,9 @@
- +