From 0cfffc3adb5eab811ee76c5b14e3740fe535ebdb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A0=82=E7=B3=96?= <2178503051@qq.com>
Date: Sat, 25 Apr 2026 15:59:14 +0800
Subject: [PATCH] =?UTF-8?q?feat(wms):=20=E6=B7=BB=E5=8A=A0leftWarehouseQue?=
=?UTF-8?q?ry=E5=B1=9E=E6=80=A7=E5=B9=B6=E4=BC=98=E5=8C=96=E8=A1=A8?=
=?UTF-8?q?=E6=A0=BC=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
优化线圈信息显示格式，移除单位后缀
调整移库记录表格列宽和显示内容
修改批量调拨和技术部改判的前后状态显示格式
---
.../views/wms/coil/components/CoilInfo.vue | 15 ++++++++----
klp-ui/src/views/wms/coil/info.vue | 24 +++++++++----------
klp-ui/src/views/wms/coil/panels/base.vue | 5 +++-
.../src/views/wms/delivery/canuse/index.vue | 2 ++
4 files changed, 28 insertions(+), 18 deletions(-)
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 @@
移库记录
-
-
+
+
收货
加工
@@ -680,17 +680,17 @@
发货
-
+
{{ scope.row.inOutType === 1 ? '入库' : '出库' }}
-
+
{{ scope.row.warehouse.actualWarehouseName || '-' }}
-
+
@@ -701,17 +701,17 @@
-
+
{{ scope.row.before }}
-
+
{{ scope.row.after }}
-
+
@@ -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
}
}
}