From 66cd9e0cfb03f5aafea6908ee5cd38de9669c294 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=A0=82=E7=B3=96?= Date: Tue, 13 Jan 2026 15:37:40 +0800 Subject: [PATCH 1/3] =?UTF-8?q?fix(wms):=20=E4=BF=AE=E6=AD=A3=E5=A4=96?= =?UTF-8?q?=E6=A0=87=E7=AD=BE=E9=A2=84=E8=A7=88=E4=B8=AD=E7=9A=84=E5=9C=B0?= =?UTF-8?q?=E5=9D=80=E5=92=8C=E7=94=B5=E8=AF=9D=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 更新外标签预览中的英文地址格式并增加联系电话 调整地址栏宽度以适应新内容 --- .../views/wms/coil/panels/LabelRender/OuterTagPreview.vue | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/klp-ui/src/views/wms/coil/panels/LabelRender/OuterTagPreview.vue b/klp-ui/src/views/wms/coil/panels/LabelRender/OuterTagPreview.vue index 46da3885..dafc9b97 100644 --- a/klp-ui/src/views/wms/coil/panels/LabelRender/OuterTagPreview.vue +++ b/klp-ui/src/views/wms/coil/panels/LabelRender/OuterTagPreview.vue @@ -97,9 +97,11 @@
地址：山东省济宁市嘉祥县开发区生物产业园区新民路北
- Address: Donghai special steel, ciyutuo Industrial Zone, Luanzhou, Tangshan, Hebei province, China. + Address: North Extension of Xinmin Road,Bio-Industrial Park,Development Zone,
+ Jiaxiang County,Jining City,Shandong Province +
- TEL：0537-6625068 + TEL：0537-6625068 0537-6625067
@@ -373,7 +375,7 @@ export default { .address { line-height: 1.25; - width: 65%; + width: 80%; font-size: 1.3em; } From 396b3de4c4d183deb113921d3cccb74689e86c42 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=A0=82=E7=B3=96?= Date: Tue, 13 Jan 2026 15:44:21 +0800 Subject: [PATCH 2/3] =?UTF-8?q?fix(wms):=20=E4=BF=AE=E5=A4=8D=E6=A0=87?= =?UTF-8?q?=E7=AD=BE=E9=A2=84=E8=A7=88=E4=B8=ADlabelType=E6=9C=AA=E6=AD=A3?= =?UTF-8?q?=E7=A1=AE=E8=AE=BE=E7=BD=AE=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 将labelType从组件属性改为使用labelRender.type，确保标签类型根据物料类型正确设置 --- klp-ui/src/views/wms/coil/panels/base.vue | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/klp-ui/src/views/wms/coil/panels/base.vue b/klp-ui/src/views/wms/coil/panels/base.vue index 3fc4b54a..ae6fe9a3 100644 --- a/klp-ui/src/views/wms/coil/panels/base.vue +++ b/klp-ui/src/views/wms/coil/panels/base.vue @@ -251,10 +251,10 @@ - + - + @@ -582,15 +582,13 @@ export default { const item = row.itemType === 'product' ? row.product : row.rawMaterial; const itemName = row.itemType === 'product' ? item?.productName || '' : item?.rawMaterialName || ''; + this.labelRender.type = row.itemType === 'product' ? '3' : '2'; this.labelRender.data = { ...row, itemName: itemName, updateTime: row.updateTime?.split(' ')[0] || '', }; this.$refs.labelRender.printLabel(); - // this.labelRender.visible = true; - // this.labelRender.data = row; - // this.labelRender.type = '2'; }, // 处理材料类型变化 handleMaterialTypeChange(value) { @@ -661,6 +659,7 @@ export default { const item = row.itemType === 'product' ? row.product : row.rawMaterial; const itemName = row.itemType === 'product' ? item?.productName || '' : item?.rawMaterialName || ''; + this.labelRender.type = row.itemType === 'product' ? '3' : '2'; this.labelRender.data = { ...row, itemName: itemName, From 57134e1359a3393ed5f71d8b0d71699ba0167640 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=A0=82=E7=B3=96?= Date: Tue, 13 Jan 2026 17:59:42 +0800 Subject: [PATCH 3/3] =?UTF-8?q?feat(wms):=20=E6=96=B0=E5=A2=9E=E5=8F=91?= =?UTF-8?q?=E8=B4=A7=E6=8A=A5=E8=A1=A8=E9=A1=B5=E9=9D=A2=E5=8F=8A=E5=9B=BE?= =?UTF-8?q?=E8=A1=A8=E7=BB=84=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 新增发货报表页面，包含时间趋势折线图和维度汇总柱状图 添加报表数据统计展示和明细表格功能 优化库存汇总页面，增加冷硬卷、冷轧卷等分类统计 重构发货报表页面布局和交互逻辑 --- .../views/wms/coil/Inventory/itemSummary.vue | 152 +++++- klp-ui/src/views/wms/coil/box2.vue | 492 ------------------ .../views/wms/delivery/report/charts/bar.vue | 219 ++++++++ .../views/wms/delivery/report/charts/line.vue | 204 ++++++++ .../src/views/wms/delivery/report/index.vue | 376 +++++++------ .../views/wms/delivery/report/index_snap.vue | 220 ++++++++ 6 files changed, 963 insertions(+), 700 deletions(-) delete mode 100644 klp-ui/src/views/wms/coil/box2.vue create mode 100644 klp-ui/src/views/wms/delivery/report/charts/bar.vue create mode 100644 klp-ui/src/views/wms/delivery/report/charts/line.vue create mode 100644 klp-ui/src/views/wms/delivery/report/index_snap.vue diff --git a/klp-ui/src/views/wms/coil/Inventory/itemSummary.vue b/klp-ui/src/views/wms/coil/Inventory/itemSummary.vue index 885326ff..c8b2a135 100644 --- a/klp-ui/src/views/wms/coil/Inventory/itemSummary.vue +++ b/klp-ui/src/views/wms/coil/Inventory/itemSummary.vue @@ -5,31 +5,48 @@ - + - +

数据汇总

- - {{ summaryData.totalCoilCount }} 卷 + + {{ summaryData.totalCoilCount }} 卷 {{ summaryData.productCoilCount }} 卷 {{ summaryData.rawMaterialCoilCount }} 卷 - {{ summaryData.totalNetWeight }} / {{ summaryData.totalGrossWeight }} - {{ summaryData.productTotalNetWeight }} / {{ summaryData.productTotalGrossWeight }} - {{ summaryData.rawMaterialTotalNetWeight }} / {{ summaryData.rawMaterialTotalGrossWeight }} + {{ summaryData.totalNetWeight }} / {{ summaryData.totalGrossWeight + }} + {{ summaryData.productTotalNetWeight }} / {{ + summaryData.productTotalGrossWeight }} + {{ summaryData.rawMaterialTotalNetWeight }} / {{ + summaryData.rawMaterialTotalGrossWeight }} + + {{ summaryData.lowHardCoilCount }} 卷 + {{ summaryData.coldRollCoilCount }} 卷 + {{ summaryData.zincCoilCount }} 卷 + {{ summaryData.hotRollCoilCount }} 卷 + + {{ summaryData.lowHardTotalNetWeight }} / {{ + summaryData.lowHardTotalGrossWeight }} + {{ summaryData.coldRollTotalNetWeight }} / {{ + summaryData.coldRollTotalGrossWeight }} + {{ summaryData.zincTotalNetWeight }} / {{ summaryData.zincTotalGrossWeight + }} + {{ summaryData.hotRollTotalNetWeight }} / {{ + summaryData.hotRollTotalGrossWeight }}
@@ -54,6 +71,68 @@ + + + +
+ +
+ + {{ drillDownParams.itemType === 'product' ? '成品' : '原材料' }} + + + {{ drillDownParams.itemName }} + + + {{ drillDownParams.warehouseName }} + +
+ + + + + + + + + + + + + + + + + + + + + + + + +
+ +
+
+
@@ -89,7 +168,22 @@ export default { productTotalGrossWeight: 0, // 成品总毛重(t) productTotalNetWeight: 0, // 成品总净重(t) rawMaterialTotalGrossWeight: 0, // 原料总毛重(t) - rawMaterialTotalNetWeight: 0 // 原料总净重(t) + rawMaterialTotalNetWeight: 0, // 原料总净重(t) + + lowHardCoilCount: 0, // 冷硬卷数 + coldRollCoilCount: 0, // 冷轧卷数 + zincCoilCount: 0, // 镀锌卷数 + hotRollCoilCount: 0, // 热轧卷数 + + lowHardTotalNetWeight: 0, // 冷硬卷总净重(t) + coldRollTotalNetWeight: 0, // 冷轧卷总净重(t) + zincTotalNetWeight: 0, // 镀锌卷总净重(t) + hotRollTotalNetWeight: 0, // 热轧卷总净重(t) + + lowHardTotalGrossWeight: 0, // 冷硬卷总毛重(t) + coldRollTotalGrossWeight: 0, // 冷轧卷总毛重(t) + zincTotalGrossWeight: 0, // 镀锌卷总毛重(t) + hotRollTotalGrossWeight: 0, // 热轧卷总毛重(t) } } }, @@ -161,7 +255,22 @@ export default { productTotalGrossWeight: 0, productTotalNetWeight: 0, rawMaterialTotalGrossWeight: 0, - rawMaterialTotalNetWeight: 0 + rawMaterialTotalNetWeight: 0, + + lowHardCoilCount: 0, // 冷硬卷数 + coldRollCoilCount: 0, // 冷轧卷数 + zincCoilCount: 0, // 镀锌卷数 + hotRollCoilCount: 0, // 热轧卷数 + + lowHardTotalNetWeight: 0, // 冷硬卷总净重(t) + coldRollTotalNetWeight: 0, // 冷轧卷总净重(t) + zincTotalNetWeight: 0, // 镀锌卷总净重(t) + hotRollTotalNetWeight: 0, // 热轧卷总净重(t) + + lowHardTotalGrossWeight: 0, // 冷硬卷总毛重(t) + coldRollTotalGrossWeight: 0, // 冷轧卷总毛重(t) + zincTotalGrossWeight: 0, // 镀锌卷总毛重(t) + hotRollTotalGrossWeight: 0, // 热轧卷总毛重(t) }; // 遍历列表数据累加计算 @@ -180,13 +289,32 @@ export default { summary.totalGrossWeight += grossWeight; summary.totalNetWeight += netWeight; - + let itemName = ''; if (item.itemType === 'product') { summary.productTotalGrossWeight += grossWeight; summary.productTotalNetWeight += netWeight; + itemName = item.product.productName; } else if (item.itemType === 'raw_material') { summary.rawMaterialTotalGrossWeight += grossWeight; summary.rawMaterialTotalNetWeight += netWeight; + itemName = item.rawMaterial.rawMaterialName; + } + if (itemName == '冷轧卷') { + summary.coldRollCoilCount += item.coilCount || 0; + summary.coldRollTotalNetWeight += netWeight; + summary.coldRollTotalGrossWeight += grossWeight; + } else if (itemName == '镀锌卷') { + summary.zincCoilCount += item.coilCount || 0; + summary.zincTotalNetWeight += netWeight; + summary.zincTotalGrossWeight += grossWeight; + } else if (itemName == '热轧卷板') { + summary.hotRollCoilCount += item.coilCount || 0; + summary.hotRollTotalNetWeight += netWeight; + summary.hotRollTotalGrossWeight += grossWeight; + } else if (itemName == '冷硬卷') { + summary.lowHardCoilCount += item.coilCount || 0; + summary.lowHardTotalNetWeight += netWeight; + summary.lowHardTotalGrossWeight += grossWeight; } }); diff --git a/klp-ui/src/views/wms/coil/box2.vue b/klp-ui/src/views/wms/coil/box2.vue deleted file mode 100644 index ce914309..00000000 --- a/klp-ui/src/views/wms/coil/box2.vue +++ /dev/null @@ -1,492 +0,0 @@ - - - - - diff --git a/klp-ui/src/views/wms/delivery/report/charts/bar.vue b/klp-ui/src/views/wms/delivery/report/charts/bar.vue new file mode 100644 index 00000000..37c5a54c --- /dev/null +++ b/klp-ui/src/views/wms/delivery/report/charts/bar.vue @@ -0,0 +1,219 @@ + + + + + \ No newline at end of file diff --git a/klp-ui/src/views/wms/delivery/report/charts/line.vue b/klp-ui/src/views/wms/delivery/report/charts/line.vue new file mode 100644 index 00000000..a771246b --- /dev/null +++ b/klp-ui/src/views/wms/delivery/report/charts/line.vue @@ -0,0 +1,204 @@ + + + + + \ No newline at end of file diff --git a/klp-ui/src/views/wms/delivery/report/index.vue b/klp-ui/src/views/wms/delivery/report/index.vue index b247e723..4ce8fd1d 100644 --- a/klp-ui/src/views/wms/delivery/report/index.vue +++ b/klp-ui/src/views/wms/delivery/report/index.vue @@ -1,220 +1,204 @@ - \ No newline at end of file + diff --git a/klp-ui/src/views/wms/delivery/report/index_snap.vue b/klp-ui/src/views/wms/delivery/report/index_snap.vue new file mode 100644 index 00000000..b247e723 --- /dev/null +++ b/klp-ui/src/views/wms/delivery/report/index_snap.vue @@ -0,0 +1,220 @@ + + + + + \ No newline at end of file