diff --git a/klp-ui/src/components/CoilSelector/index.vue b/klp-ui/src/components/CoilSelector/index.vue index afa9803b..20fe5010 100644 --- a/klp-ui/src/components/CoilSelector/index.vue +++ b/klp-ui/src/components/CoilSelector/index.vue @@ -15,7 +15,7 @@ - @@ -46,14 +46,15 @@ - - - - - - - - + + @@ -85,6 +86,10 @@ export default { type: Boolean, default: false }, + dialogWidth: { + type: String, + default: '900px' + }, // 过滤条件(可以预设一些查询条件) filters: { type: Object, @@ -116,6 +121,11 @@ export default { rangeData: { type: Array, default: () => [] + }, + // 自定义钢卷列的配置 + coilColumn: { + type: Array, + default: () => [] } }, data() { @@ -134,7 +144,59 @@ export default { grade: null, selectType: 'raw_material', dataType: 1 // 只查询当前数据,不查询历史数据 - } + }, + columns: [ + { + label: '卷号', + align: 'center', + prop: 'currentCoilNo', + showOverflowTooltip: true + }, + { + label: '存储位置', + align: 'center', + prop: 'actualWarehouseName', + width: '120', + showOverflowTooltip: true + }, + { + label: '物料', + align: 'center', + prop: 'itemName', + width: '100' + }, + { + label: '规格', + align: 'center', + prop: 'specification', + width: '100' + }, + { + label: '材质', + align: 'center', + prop: 'material', + width: '100' + }, + { + label: '厂家', + align: 'center', + prop: 'manufacturer', + width: '100' + }, + { + label: '重量(t)', + align: 'center', + prop: 'netWeight', + width: '100' + }, + { + label: '库区', + align: 'center', + prop: 'warehouseName', + width: '120', + showOverflowTooltip: true + }, + ] }; }, computed: { @@ -157,6 +219,10 @@ export default { this.$emit('update:visible', val); } } + }, + renderColumns() { + // 如果有自定义列配置,使用它;否则使用默认列 + return this.coilColumn.length > 0 ? this.coilColumn : this.columns; } }, watch: { diff --git a/klp-ui/src/views/wms/delivery/components/detailTable.vue b/klp-ui/src/views/wms/delivery/components/detailTable.vue index 3209b2a7..02ee1a9d 100644 --- a/klp-ui/src/views/wms/delivery/components/detailTable.vue +++ b/klp-ui/src/views/wms/delivery/components/detailTable.vue @@ -200,8 +200,8 @@ export default { this.form = { ...this.form, productName: coil.itemName, - edgeType: coil.surfaceTreatmentDesc, - packaging: coil.packagingId, + edgeType: coil.edgeRequirement, + packaging: coil.packagingRequirement, rawMaterialFactory: coil.manufacturer, coilNo: coil.currentCoilNo, specification: coil.specification, diff --git a/klp-ui/src/views/wms/delivery/plan/index.vue b/klp-ui/src/views/wms/delivery/plan/index.vue index 7cc1c8de..b247cfa7 100644 --- a/klp-ui/src/views/wms/delivery/plan/index.vue +++ b/klp-ui/src/views/wms/delivery/plan/index.vue @@ -27,7 +27,7 @@ - + @@ -61,7 +61,7 @@ - +
@@ -76,27 +76,36 @@ + :filters="coilFilters" :coil-column="coilColumn" dialog-width="1200px">
- + + + + + + - + - - + +