From c34bbfed91c3fa746d9bd60f5902e820d6376af7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A0=82=E7=B3=96?= <qq2178503051@163.com>
Date: Sat, 10 Jan 2026 11:38:55 +0800
Subject: [PATCH 1/2] =?UTF-8?q?feat(wms=E6=8A=A5=E8=A1=A8):=20=E5=9C=A8?=
 =?UTF-8?q?=E6=8A=A5=E8=A1=A8=E9=A1=B5=E9=9D=A2=E6=B7=BB=E5=8A=A0=E6=9B=B4?=
 =?UTF-8?q?=E6=96=B0=E6=97=B6=E9=97=B4=E5=88=97=E5=B9=B6=E8=B0=83=E6=95=B4?=
 =?UTF-8?q?=E7=BC=96=E8=BE=91=E6=8C=89=E9=92=AE=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在delivery.vue、receive.vue和zha.vue报表页面添加更新时间列
- 在warehousing.vue中调整编辑按钮的显示条件
- 在zha.vue中调整列顺序并添加重量列
---
 klp-ui/src/views/wms/coil/do/warehousing.vue | 2 +-
 klp-ui/src/views/wms/report/delivery.vue     | 1 +
 klp-ui/src/views/wms/report/receive.vue      | 1 +
 klp-ui/src/views/wms/report/zha.vue          | 3 ++-
 4 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/klp-ui/src/views/wms/coil/do/warehousing.vue b/klp-ui/src/views/wms/coil/do/warehousing.vue
index fe67c0b1..981e8e04 100644
--- a/klp-ui/src/views/wms/coil/do/warehousing.vue
+++ b/klp-ui/src/views/wms/coil/do/warehousing.vue
@@ -194,7 +194,7 @@
                 <el-button size="mini" type="text" icon="el-icon-view" @click="handlePreviewLabel(scope.row)">
                   打印
                 </el-button>
-                <el-button size="mini" type="text" icon="el-icon-edit" @click="handleEdit(scope.row)">
+                <el-button v-if="scope.row.actionStatus == 0 || scope.row.actionStatus == 1" size="mini" type="text" icon="el-icon-edit" @click="handleEdit(scope.row)">
                   编辑
                 </el-button>
                 <el-button v-if="scope.row.actionStatus == 0 || scope.row.actionStatus == 1" type="primary"
diff --git a/klp-ui/src/views/wms/report/delivery.vue b/klp-ui/src/views/wms/report/delivery.vue
index 0c036583..a6055d15 100644
--- a/klp-ui/src/views/wms/report/delivery.vue
+++ b/klp-ui/src/views/wms/report/delivery.vue
@@ -84,6 +84,7 @@
       </el-table-column>
 
       <el-table-column label="更新人" align="center" prop="updateByName" />
+      <el-table-column label="更新时间" align="center" prop="updateTime" />
     </el-table>
   </div>
 </template>
diff --git a/klp-ui/src/views/wms/report/receive.vue b/klp-ui/src/views/wms/report/receive.vue
index 8eeeaaa3..77002746 100644
--- a/klp-ui/src/views/wms/report/receive.vue
+++ b/klp-ui/src/views/wms/report/receive.vue
@@ -82,6 +82,7 @@
         </template>
       </el-table-column>
       <el-table-column label="更新人" align="center" prop="updateByName" />
+      <el-table-column label="更新时间" align="center" prop="updateTime" />
     </el-table>
   </div>
 </template>
diff --git a/klp-ui/src/views/wms/report/zha.vue b/klp-ui/src/views/wms/report/zha.vue
index aa12c723..8a5680a1 100644
--- a/klp-ui/src/views/wms/report/zha.vue
+++ b/klp-ui/src/views/wms/report/zha.vue
@@ -72,9 +72,9 @@
           <RawMaterialInfo v-else-if="scope.row.itemType === 'raw_material'" :material="scope.row.rawMaterial" />
         </template>
       </el-table-column>
+      <el-table-column label="重量 (吨)" align="center" prop="netWeight" />
       <el-table-column label="长度 (米)" align="center" prop="length" />
       <el-table-column label="备注" align="center" prop="remark" show-overflow-tooltip />
-
       <el-table-column label="出库状态" align="center" prop="status">
         <!-- 0在库，1已出库 -->
         <template slot-scope="scope">
@@ -82,6 +82,7 @@
         </template>
       </el-table-column>
       <el-table-column label="更新人" align="center" prop="updateByName" />
+      <el-table-column label="更新时间" align="center" prop="updateTime" />
     </el-table>
   </div>
 </template>

From 407d4e0955dc2a5beadf3b73e36fbab83c27c70f Mon Sep 17 00:00:00 2001
From: 86156 <823267011@qq.com>
Date: Sat, 10 Jan 2026 11:47:47 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=8E=9F=E6=96=99=E7=A0=81=E6=94=BE?=
 =?UTF-8?q?=E5=A4=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../LabelRender/ProductionTagPreview.vue      |  8 ++---
 .../wms/coil/panels/LabelRender/index.vue     | 32 +++++++------------
 2 files changed, 16 insertions(+), 24 deletions(-)

diff --git a/klp-ui/src/views/wms/coil/panels/LabelRender/ProductionTagPreview.vue b/klp-ui/src/views/wms/coil/panels/LabelRender/ProductionTagPreview.vue
index 162f61fb..20e1d29f 100644
--- a/klp-ui/src/views/wms/coil/panels/LabelRender/ProductionTagPreview.vue
+++ b/klp-ui/src/views/wms/coil/panels/LabelRender/ProductionTagPreview.vue
@@ -121,7 +121,7 @@ export default {
     },
     paperWidthMm: {
       type: Number,
-      default: 100 // 原料码：100mm x 80mm
+      default: 100 // 原料码：100mm x 80mm（宽100，高80）
     },
     paperHeightMm: {
       type: Number,
@@ -233,7 +233,7 @@ export default {
 <style scoped>
 .label-container {
   width: 25em;
-  height: 15em;
+  height: 20em;
   padding: 0px;
   display: flex; /* 启用Flex布局 */
   flex-direction: column; /* 子元素垂直排列 */
@@ -286,10 +286,10 @@ export default {
   white-space: normal;
 }
 
-/* 打印样式 - 强制单页，适配180mm x 100mm纸张，保持原有样式不变 */
+/* 打印样式 - 强制单页，适配100mm x 80mm纸张，保持原有样式不变 */
 @media print {
   @page {
-    size: 180mm 100mm;
+    size: 100mm 80mm;
     margin: 0 !important;
     padding: 0 !important;
   }
diff --git a/klp-ui/src/views/wms/coil/panels/LabelRender/index.vue b/klp-ui/src/views/wms/coil/panels/LabelRender/index.vue
index a781cbd9..c13e0763 100644
--- a/klp-ui/src/views/wms/coil/panels/LabelRender/index.vue
+++ b/klp-ui/src/views/wms/coil/panels/LabelRender/index.vue
@@ -102,7 +102,7 @@ export default {
         Message.info('正在准备打印内容，请稍等...');
         
         // 2. 计算纸张尺寸（与批量导出保持一致）
-        // 根据 labelType 判断：'2' 是材料标签（100x80），'3' 是外标（180x100）
+        // 根据 labelType 判断：'2' 是材料标签（100x80，宽100高80），'3' 是外标（180x100）
         const isMaterial = this.labelType === '2';
         const paperWidthMm = isMaterial ? 100 : 180;
         const paperHeightMm = isMaterial ? 80 : 100;
@@ -126,12 +126,13 @@ export default {
         
         // 根据标签类型设置不同的布局方式
         if (isMaterial) {
-          // 材料标签：填充 wrapper
+          // 材料标签：设置固定尺寸，确保100mm x 80mm的比例
           wrapper.style.display = 'flex';
           wrapper.style.alignItems = 'center';
           wrapper.style.justifyContent = 'center';
-          labelContainer.style.width = '100%';
-          labelContainer.style.height = '100%';
+          // 直接设置labelContainer的尺寸为mm单位，确保正确的物理尺寸比例
+          labelContainer.style.width = `${paperWidthMm}mm`;
+          labelContainer.style.height = `${paperHeightMm}mm`;
         } else {
           // 成品标签：直接放在 wrapper 中，保持原始布局（与批量打印一致）
           wrapper.style.display = 'block';
@@ -162,20 +163,10 @@ export default {
           windowHeight: labelContainer.scrollHeight,
         });
 
-        // 5. 使用 pdf-lib 生成单页 PDF（与批量导出完全一致）
+        // 5. 使用 pdf-lib 生成单页 PDF（占满整张纸，无边距）
         const mmToPt = 72 / 25.4;
         const pageWidthPt = paperWidthMm * mmToPt;
         const pageHeightPt = paperHeightMm * mmToPt;
-        
-        // 边距：与批量导出保持一致
-        // 材料标签（100x80）：左右2mm，上下0.5mm
-        // 成品标签（180x100）：左右4mm，上下0.5mm
-        const marginXmm = isMaterial ? 2 : 4;
-        const marginYmm = 0.5; // 上下对称边距（不裁切前提下尽量贴边）
-        const marginXPt = marginXmm * mmToPt;
-        const marginYPt = marginYmm * mmToPt;
-        const contentWidthPt = pageWidthPt - marginXPt * 2;
-        const contentHeightPt = pageHeightPt - marginYPt * 2;
 
         const pdfDoc = await PDFDocument.create();
         const imgPng = await pdfDoc.embedPng(canvas.toDataURL('image/png'));
@@ -183,14 +174,15 @@ export default {
 
         const imgW = imgPng.width;
         const imgH = imgPng.height;
-        // 标准适配：确保完整显示且不变形（在内容区域内等比缩放，与批量导出完全一致）
-        const scale = Math.min(contentWidthPt / imgW, contentHeightPt / imgH);
+        // 直接占满整个PDF页面，不留边距
+        // 确保图片按页面尺寸等比缩放，占满整张纸
+        const scale = Math.min(pageWidthPt / imgW, pageHeightPt / imgH);
         const drawW = imgW * scale;
         const drawH = imgH * scale;
 
-        // 内容区域内居中 + 外层边距（上下对称，与批量导出完全一致）
-        const x = marginXPt + (contentWidthPt - drawW) / 2;
-        const y = marginYPt + (contentHeightPt - drawH) / 2;
+        // 居中放置（如果图片比例与页面不完全一致）
+        const x = (pageWidthPt - drawW) / 2;
+        const y = (pageHeightPt - drawH) / 2;
 
         page.drawImage(imgPng, { x, y, width: drawW, height: drawH });