diff --git a/klp-ui/src/views/wms/coil/components/CoilInfo.vue b/klp-ui/src/views/wms/coil/components/CoilInfo.vue index dd36ca1a..3f78fb7f 100644 --- a/klp-ui/src/views/wms/coil/components/CoilInfo.vue +++ b/klp-ui/src/views/wms/coil/components/CoilInfo.vue @@ -26,12 +26,12 @@ {{ coilInfo.packingStatus || '-' }} {{ coilInfo.packagingRequirement || '-' }} - {{ coilInfo.actualThickness ? `${coilInfo.actualThickness} m` : '-' }} - {{ coilInfo.actualWidth ? `${coilInfo.actualWidth} m` : '-' }} - {{ coilInfo.length ? `${coilInfo.length} m` : '-' }} + {{ coilInfo.actualThickness || '-' }} + {{ coilInfo.actualWidth || '-' }} + {{ coilInfo.length || '-' }} - {{ coilInfo.grossWeight ? `${coilInfo.grossWeight} t` : '-' }} - {{ coilInfo.netWeight ? `${coilInfo.netWeight} t` : '-' }} + {{ coilInfo.grossWeight || '-' }} + {{ coilInfo.netWeight || '-' }} {{ coilInfo.productionStartTime || '-' }} {{ coilInfo.productionEndTime || '-' }} {{ coilInfo.temperGrade || '-' }} @@ -53,6 +53,11 @@ export default { column: { type: Number, default: 5 + }, + // 只显示有值的字段 + showOnlyValue: { + type: Boolean, + default: false } }, methods: { diff --git a/klp-ui/src/views/wms/coil/info.vue b/klp-ui/src/views/wms/coil/info.vue index f9b52a9b..0e9c69be 100644 --- a/klp-ui/src/views/wms/coil/info.vue +++ b/klp-ui/src/views/wms/coil/info.vue @@ -671,8 +671,8 @@
移库记录
- - + + - + - + - +
@@ -701,17 +701,17 @@
- + - + - +
@@ -845,8 +845,8 @@ export default { this.transferOrderItemList.forEach(item => { list.push({ type: '批量调拨', - before: item.warehouseNameBefore || '-', - after: item.warehouseNameAfter || '-', + before: '逻辑库:' + (item.warehouseNameBefore || '-'), + after: '逻辑库:' + (item.warehouseNameAfter || '-'), createTime: item.createTime || '-', ...item }); @@ -855,8 +855,8 @@ export default { this.coilQualityRejudgeList.forEach(item => { list.push({ type: '技术部改判', - before: item.qualityBefore || '-', - after: item.qualityAfter || '-', + before: '质量状态:' + (item.beforeQuality || '-'), + after: '质量状态:' + (item.afterQuality || '-'), createTime: item.createTime || '-', ...item }); diff --git a/klp-ui/src/views/wms/coil/panels/base.vue b/klp-ui/src/views/wms/coil/panels/base.vue index bc2a382f..3973c856 100644 --- a/klp-ui/src/views/wms/coil/panels/base.vue +++ b/klp-ui/src/views/wms/coil/panels/base.vue @@ -1222,6 +1222,8 @@ export default { if (this.useWarehouseIds) { query.warehouseIds = this.warehouseIds; } + + const { orderBy, ...statisticQuery } = query; if (this.showWaybill) { const { shipmentTime, ...query } = { ...this.queryParams, @@ -1243,6 +1245,7 @@ export default { listBoundCoil({ ...query, status: 1 }).then(res => { this.shippedCount = res.total; }) + getCoilStatisticsList(query).then(res => { this.statistics = res.data || []; }) @@ -1253,7 +1256,7 @@ export default { this.total = response.total; this.loading = false; }); - getCoilStatisticsList(query).then(res => { + getCoilStatisticsList(statisticQuery).then(res => { this.statistics = res.data || []; }) }, diff --git a/klp-ui/src/views/wms/delivery/canuse/index.vue b/klp-ui/src/views/wms/delivery/canuse/index.vue index d8731031..312396da 100644 --- a/klp-ui/src/views/wms/delivery/canuse/index.vue +++ b/klp-ui/src/views/wms/delivery/canuse/index.vue @@ -6,6 +6,7 @@ :hideType="hideType" :showLength="showLength" :canExportAll="canExportAll" + :leftWarehouseQuery="leftWarehouseQuery" /> @@ -32,6 +33,7 @@ export default { showLength: true, canExportAll: true, showOrderBy: false, + leftWarehouseQuery: true } } }