From f14697559483fd5b31e3c738ae907570df2c203f Mon Sep 17 00:00:00 2001
From: 86156 <823267011@qq.com>
Date: Fri, 9 Jan 2026 19:04:03 +0800
Subject: [PATCH 1/5] =?UTF-8?q?=E6=9B=B4=E6=AD=A3=E5=89=8D=E7=AB=AF?=
 =?UTF-8?q?=E5=86=85=E5=AE=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../panels/LabelRender/OuterTagPreview.vue    |  39 ++-
 .../LabelRender/ProductionTagPreview.vue      |   7 +-
 .../wms/coil/panels/LabelRender/index.vue     | 255 +++++++++---------
 klp-ui/src/views/wms/coil/panels/base.vue     |  50 ++--
 4 files changed, 179 insertions(+), 172 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 cadf6ae6..111aced8 100644
--- a/klp-ui/src/views/wms/coil/panels/LabelRender/OuterTagPreview.vue
+++ b/klp-ui/src/views/wms/coil/panels/LabelRender/OuterTagPreview.vue
@@ -103,7 +103,8 @@
         </span>
       </div>
       <div class="contact-timestamp">
-        <QRCode :content="content.qrcodeRecordId || ''" :size="60" />
+        <!-- 放大二维码，占用更多下方空间，弱化底部留白感 -->
+        <QRCode :content="content.qrcodeRecordId || ''" :size="90" />
       </div>
     </div>
   </div>
@@ -275,7 +276,8 @@ export default {
   /* height: 377.953px; */
   width: fit-content;
   height: fit-content;
-  padding: 0.5em;
+  /* 减少内边距，避免生成PDF时上下留白不一致 */
+  padding: 0.1em;
   font-size: 12px;
   border: 1px solid #000;
   box-sizing: border-box;
@@ -287,31 +289,36 @@ export default {
   display: flex;
   align-items: center;
   margin-bottom: 0.3em;
+  position: relative; /* 为绝对定位的 title 提供定位上下文 */
 }
 
 .company-logo {
-  width: 4em;
-  height: 4em;
+  width: 5em;
+  height: 5em;
   margin-right: 0.5em;
 }
 
 .company-name {
-  font-size: 1em;
+  font-size: 1.2em;
   font-weight: bold;
   line-height: 1.1;
 }
 
 .title {
-  flex: 1;
+  position: absolute; /* 绝对定位，脱离 flex 流 */
+  left: 50%; /* 从左边50%开始 */
+  transform: translateX(-50%); /* 向左移动自身宽度的50%，实现居中 */
   font-size: 2em;
   font-weight: bold;
   text-align: center;
+  white-space: nowrap; /* 防止文字换行 */
 }
 
 .english-name {
   width: 100%;
-  font-size: 0.6em;
-  opacity: 0.8;
+  font-size: 1em;
+  opacity: 0.9;
+  letter-spacing: 0.08em;
 }
 
 .product-title {
@@ -354,23 +361,27 @@ export default {
   display: flex;
   justify-content: space-between;
   align-items: flex-start;
-  font-size: 0.7em;
-  margin-top: 0.3em;
+  font-size: 0.85em;
+  margin-top: 0.2em;
 }
 
 .address {
-  line-height: 1.2;
+  line-height: 1.25;
   width: 65%;
+  font-size: 1.3em;
 }
 
 .english-address {
-  opacity: 0.8;
-  font-size: 0.9em;
+  opacity: 0.9;
+  font-size: 1.1em;
+  line-height: 1.15;
+  word-break: normal; /* 正常换行，只在单词边界（空格）处换行 */
+  overflow-wrap: normal; /* 不在单词内部断行，保持单词完整 */
 }
 
 .contact-timestamp {
   text-align: right;
-  line-height: 1.4;
+  line-height: 1.2;
 }
 
 .nob {
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 6cd4c598..8ed52f20 100644
--- a/klp-ui/src/views/wms/coil/panels/LabelRender/ProductionTagPreview.vue
+++ b/klp-ui/src/views/wms/coil/panels/LabelRender/ProductionTagPreview.vue
@@ -170,7 +170,7 @@ export default {
         const container = this.$el;
         if (!container) return;
         
-        // 纸张尺寸：180mm x 100mm
+        // 纸张尺寸：100mm x 80mm
         const dpi = 96; // 标准 DPI
         const mmToPx = dpi / 25.4; // 1mm = 3.779527559px
         
@@ -231,6 +231,7 @@ export default {
   flex-direction: column; /* 子元素垂直排列 */
   font-family: "SimSun", serif;
   box-sizing: border-box; /* 确保内边距/边框不影响总尺寸 */
+  overflow: visible; /* 确保所有内容可见，不被裁剪 */
 }
 
 .material-label-table {
@@ -269,10 +270,10 @@ export default {
   text-align: center;
 }
 
-/* 打印样式 - 强制单页，适配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 2b4639a8..a781cbd9 100644
--- a/klp-ui/src/views/wms/coil/panels/LabelRender/index.vue
+++ b/klp-ui/src/views/wms/coil/panels/LabelRender/index.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="label-render-container">
     <!-- 标签预览容器 -->
-    <div class="preview-container" id="label-preview-container" ref="labelRef">
+    <div class="preview-container" :id="hideActions ? undefined : 'label-preview-container'" ref="labelRef">
       <ProductionTagPreview
         v-if="labelType === '2'"
         :content="content"
@@ -18,7 +18,7 @@
       <ForgeTagPreview v-if="labelType === '5'" :content="content" />
       <SaltSprayTagPreview v-if="labelType === '6'" :content="content" />
     </div>
-    <div class="action-buttons">
+    <div class="action-buttons" v-if="!hideActions">
       <el-button type="primary" @click="downloadLabelAsImage">下载标签图片</el-button>
       <el-button type="primary" @click="printLabel" style="margin-left: 10px;">打印标签</el-button>
     </div>
@@ -27,9 +27,9 @@
 
 <script>
 import domToImage from 'dom-to-image';
-// import printJS from 'print-js'; // 改为自建 iframe 打印，避免多余空白页
-import html2canvas from 'html2canvas'; // 新增：引入高清渲染库
+import html2canvas from 'html2canvas'; // 高清渲染
 import { Message } from 'element-ui';
+import { PDFDocument } from 'pdf-lib';
 
 import ProductionTagPreview from './ProductionTagPreview.vue';
 import OuterTagPreview from './OuterTagPreview.vue';
@@ -55,11 +55,15 @@ export default {
       type: Object,
       required: true,
     },
+    hideActions: {
+      type: Boolean,
+      default: false,
+    },
   },
   methods: {
     // -------- 图片下载方法（保留，可按需替换为html2canvas） --------
     async downloadLabelAsImage() {
-      const labelContainer = document.getElementById('label-preview-container');
+      const labelContainer = this.$refs.labelRef;
       if (!labelContainer) {
         Message.error('未找到标签容器，无法下载');
         return;
@@ -83,11 +87,12 @@ export default {
       }
     },
 
-    // -------- 重构后的打印方法（核心优化） --------
+    // -------- 单张打印：先生成 PDF，再让浏览器打印 --------
     async printLabel() {
       // 1. 获取标签容器DOM
-      const labelContainer = document.querySelector('.label-container') || 
-                            document.querySelector('.material-label-container');
+      // 只在当前组件作用域内查找，避免页面上存在多个标签时选错
+      const labelContainer = this.$refs.labelRef?.querySelector('.label-container') ||
+        this.$refs.labelRef?.querySelector('.material-label-container');
       if (!labelContainer) {
         Message.error('未找到标签容器，无法打印');
         return;
@@ -96,137 +101,128 @@ export default {
       try {
         Message.info('正在准备打印内容，请稍等...');
         
-        // 2. 等待二维码/字体等资源加载完成（复用之前的等待逻辑）
-        await this.waitForAllResources(labelContainer);
-
-        // 3. 计算纸张尺寸和缩放比例
-        // 根据标签类型设置纸张尺寸：
-        // 产品码：100mm x 180mm（横向，原先180x100）
-        // 原料码：80mm x 100mm（竖向）
-        const isMaterial = labelContainer.classList.contains('material-label-container');
+        // 2. 计算纸张尺寸（与批量导出保持一致）
+        // 根据 labelType 判断：'2' 是材料标签（100x80），'3' 是外标（180x100）
+        const isMaterial = this.labelType === '2';
         const paperWidthMm = isMaterial ? 100 : 180;
         const paperHeightMm = isMaterial ? 80 : 100;
-        const dpi = 96;
-        const mmToPx = dpi / 25.4;
-        const paperWidthPx = paperWidthMm * mmToPx;
-        const paperHeightPx = paperHeightMm * mmToPx;
-
-        // 获取标签容器的实际尺寸
-        const containerRect = labelContainer.getBoundingClientRect();
-        const containerWidth = containerRect.width;
-        const containerHeight = containerRect.height;
-
-        // 计算缩放比例，确保内容适配到纸张（留出2mm边距）
-        const marginMm = 2;
-        const marginPx = marginMm * mmToPx;
-        const availableWidth = paperWidthPx - marginPx * 2;
-        const availableHeight = paperHeightPx - marginPx * 2;
-        
-        const scaleX = containerWidth > 0 ? availableWidth / containerWidth : 1;
-        const scaleY = containerHeight > 0 ? availableHeight / containerHeight : 1;
-        const printScale = Math.min(scaleX, scaleY, 1); // 不超过1，不放大
-
-        // 计算最终Canvas尺寸（适配纸张）
-        const finalCanvasWidth = containerWidth * printScale;
-        const finalCanvasHeight = containerHeight * printScale;
         
         // 使用合适的scale值生成高清Canvas（但不超过纸张尺寸）
-        const canvasScale = Math.min(2, printScale * 2); // 适当提高清晰度
+        const canvasScale = 3; // 提高清晰度（单张打印）
 
-        // 4. 用html2canvas生成高清Canvas（解决文字模糊+二维码丢失）
-        // 注意：不再强制指定 width/height，避免裁掉最右/最下边框
+        // 3. 为单张打印临时创建一个与批量打印完全一致的隐藏容器
+        //    完全模拟批量打印的 .batch-pdf-page 容器
+        const originalParent = labelContainer.parentNode;
+        const originalNext = labelContainer.nextSibling;
+        const wrapper = document.createElement('div');
+        wrapper.style.position = 'fixed';
+        wrapper.style.left = '-100000px'; // 与批量打印一致
+        wrapper.style.top = '0';
+        wrapper.style.width = `${paperWidthMm}mm`; // 固定尺寸，与批量打印的 .batch-pdf-page 一致
+        wrapper.style.height = `${paperHeightMm}mm`;
+        wrapper.style.boxSizing = 'border-box';
+        wrapper.style.backgroundColor = '#ffffff';
+        wrapper.style.overflow = 'hidden'; // 与批量打印的 .batch-pdf-page 一致
+        
+        // 根据标签类型设置不同的布局方式
+        if (isMaterial) {
+          // 材料标签：填充 wrapper
+          wrapper.style.display = 'flex';
+          wrapper.style.alignItems = 'center';
+          wrapper.style.justifyContent = 'center';
+          labelContainer.style.width = '100%';
+          labelContainer.style.height = '100%';
+        } else {
+          // 成品标签：直接放在 wrapper 中，保持原始布局（与批量打印一致）
+          wrapper.style.display = 'block';
+          wrapper.style.padding = '0';
+          // 不修改 labelContainer 的样式，保持 fit-content（与批量打印一致）
+        }
+        wrapper.appendChild(labelContainer);
+        document.body.appendChild(wrapper);
+
+        // 4. 等待二维码/字体等资源加载完成（与批量打印一致）
+        await this.waitForAllResources(labelContainer);
+        
+        // 等待布局稳定（与批量打印一致）
+        await new Promise(resolve => setTimeout(resolve, 100));
+
+        // 5. 用html2canvas生成高清Canvas（与批量导出完全一致）
+        // 关键：直接截图 labelContainer，与批量打印完全一致
         const canvas = await html2canvas(labelContainer, {
-          scale: canvasScale,
-          backgroundColor: '#ffffff', // 强制白色背景，避免打印时背景透明
-          useCORS: true, // 支持跨域图片
-          allowTaint: true, // 允许渲染canvas（二维码）
-          taintTest: false, // 关闭canvas污染检测
-          logging: false,
+          backgroundColor: '#ffffff',
+          scale: 3,
+          useCORS: true,
+          // 让 html2canvas 为频繁读回优化 Canvas（与批量导出一致）
+          willReadFrequently: true,
+          // 确保按元素尺寸截图（与批量导出完全一致）
+          width: labelContainer.offsetWidth,
+          height: labelContainer.offsetHeight,
+          windowWidth: labelContainer.scrollWidth,
+          windowHeight: labelContainer.scrollHeight,
         });
 
-        // 5. 如果Canvas尺寸超出纸张，需要缩放Canvas
-        let finalCanvas = canvas;
-        if (canvas.width > paperWidthPx || canvas.height > paperHeightPx) {
-          // 创建新的Canvas，尺寸适配纸张
-          const scaledCanvas = document.createElement('canvas');
-          scaledCanvas.width = Math.min(canvas.width, paperWidthPx);
-          scaledCanvas.height = Math.min(canvas.height, paperHeightPx);
-          const ctx = scaledCanvas.getContext('2d');
-          ctx.drawImage(canvas, 0, 0, scaledCanvas.width, scaledCanvas.height);
-          finalCanvas = scaledCanvas;
+        // 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'));
+        const page = pdfDoc.addPage([pageWidthPt, pageHeightPt]);
+
+        const imgW = imgPng.width;
+        const imgH = imgPng.height;
+        // 标准适配：确保完整显示且不变形（在内容区域内等比缩放，与批量导出完全一致）
+        const scale = Math.min(contentWidthPt / imgW, contentHeightPt / imgH);
+        const drawW = imgW * scale;
+        const drawH = imgH * scale;
+
+        // 内容区域内居中 + 外层边距（上下对称，与批量导出完全一致）
+        const x = marginXPt + (contentWidthPt - drawW) / 2;
+        const y = marginYPt + (contentHeightPt - drawH) / 2;
+
+        page.drawImage(imgPng, { x, y, width: drawW, height: drawH });
+
+        const pdfBytes = await pdfDoc.save();
+        const blob = new Blob([pdfBytes], { type: 'application/pdf' });
+        const url = URL.createObjectURL(blob);
+
+        const win = window.open(url, '_blank');
+        if (!win) {
+          const a = document.createElement('a');
+          a.href = url;
+          a.download = `标签_${new Date().getTime()}.pdf`;
+          document.body.appendChild(a);
+          a.click();
+          document.body.removeChild(a);
         }
 
-        // 6. 生成 DataURL，使用 printJS 的 image 模式（单图），并减少额外样式以避免隐藏内容
-        const dataUrl = finalCanvas.toDataURL('image/png');
-
-        // 6. 创建隐藏 iframe 进行打印，避免 printJS 的分页行为
-        const iframe = document.createElement('iframe');
-        iframe.style.position = 'fixed';
-        iframe.style.right = '0';
-        iframe.style.bottom = '0';
-        iframe.style.width = '0';
-        iframe.style.height = '0';
-        iframe.style.border = '0';
-        document.body.appendChild(iframe);
-
-        const doc = iframe.contentWindow.document;
-        doc.open();
-        doc.write(`
-          <!doctype html>
-          <html>
-            <head>
-              <style>
-                @page {
-                  size: ${paperWidthMm}mm ${paperHeightMm}mm;
-                  margin: 2mm;
-                }
-                * {
-                  -webkit-print-color-adjust: exact;
-                  print-color-adjust: exact;
-                  box-sizing: border-box;
-                }
-                html, body {
-                  margin: 0;
-                  padding: 0;
-                  width: 100%;
-                  height: 100%;
-                  overflow: hidden;
-                }
-                body {
-                  display: flex;
-                  align-items: center;
-                  justify-content: center;
-                  background: #ffffff;
-                }
-                img {
-                  /* 稍微缩小一点，避免被打印机物理不可打印区域裁掉边框 */
-                  width: 94%;
-                  height: auto;
-                  max-height: 94%;
-                  object-fit: contain;
-                  display: block;
-                  page-break-after: avoid;
-                  page-break-before: avoid;
-                  page-break-inside: avoid;
-                }
-              </style>
-            </head>
-            <body>
-              <img src="${dataUrl}" />
-            </body>
-          </html>
-        `);
-        doc.close();
-
-        iframe.onload = () => {
-          setTimeout(() => {
-            iframe.contentWindow.focus();
-            iframe.contentWindow.print();
-            setTimeout(() => {
-              document.body.removeChild(iframe);
-            }, 1000);
-          }, 300);
-        };
+        // 还原 DOM 结构
+        // 恢复 labelContainer 的原始样式（如果之前修改过）
+        if (isMaterial) {
+          labelContainer.style.width = '';
+          labelContainer.style.height = '';
+        }
+        // 成品标签不需要恢复，因为没有修改样式
+        if (originalParent) {
+          if (originalNext) {
+            originalParent.insertBefore(labelContainer, originalNext);
+          } else {
+            originalParent.appendChild(labelContainer);
+          }
+        }
+        document.body.removeChild(wrapper);
       } catch (error) {
         console.error('打印准备失败:', error);
         Message.error('打印内容准备失败，请重试');
@@ -285,6 +281,7 @@ export default {
 </script>
 
 <style scoped>
+
 .label-render-container {
   width: 100%;
   display: flex;
diff --git a/klp-ui/src/views/wms/coil/panels/base.vue b/klp-ui/src/views/wms/coil/panels/base.vue
index 2ba68c64..e34a3455 100644
--- a/klp-ui/src/views/wms/coil/panels/base.vue
+++ b/klp-ui/src/views/wms/coil/panels/base.vue
@@ -63,7 +63,7 @@
       <el-col :span="1.5">
         <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExportAll">导出</el-button>
       </el-col>
-      <el-col :span="2" v-if="canExportAll">
+      <el-col :span="2">
         <el-button type="info" plain icon="el-icon-printer" size="mini" :disabled="multiple" @click="handleBatchPrintLabel">批量打印标签</el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
@@ -246,7 +246,7 @@
       <!-- 渲染容器：屏幕隐藏，仅用于截图生成PDF -->
       <div ref="batchPdfContainer" class="batch-pdf-root" aria-hidden="true">
         <div v-for="(item, idx) in batchPrint.list" :key="item.coilId || idx" class="batch-pdf-page">
-          <OuterTagPreview :content="item" :paperWidthMm="180" :paperHeightMm="100" />
+          <label-render :content="item" :labelType="labelType" :hideActions="true" />
         </div>
       </div>
     </el-dialog>
@@ -345,10 +345,6 @@ export default {
       type: Boolean,
       default: false,
     },
-    canExportAll: {
-      type: Boolean,
-      default: false,
-    }
   },
   data() {
     return {
@@ -824,40 +820,44 @@ export default {
         // 纸张尺寸
         const paperWidthMm = 180;
         const paperHeightMm = 100;
-        // 留白：左右约 4mm；上下更小一些，避免底部空得太多
+        // 边距：左右 4mm，上下对称 2mm，确保垂直居中
         const marginXmm = 4;
-        const marginTopMm = 0;
-        const marginBottomMm = 0;
+        const marginYmm = 0.5; // 上下对称边距（不裁切前提下尽量贴边）
 
         const pageWidthPt = paperWidthMm * mmToPt;
         const pageHeightPt = paperHeightMm * mmToPt;
         const marginXPt = marginXmm * mmToPt;
-        const marginTopPt = marginTopMm * mmToPt;
-        const marginBottomPt = marginBottomMm * mmToPt;
+        const marginYPt = marginYmm * mmToPt;
 
         const contentWidthPt = pageWidthPt - marginXPt * 2;
-        const contentHeightPt = pageHeightPt - marginTopPt - marginBottomPt;
+        const contentHeightPt = pageHeightPt - marginYPt * 2;
 
         const pdfDoc = await PDFDocument.create();
 
-        // 关键：只截取标签自身（OuterTagPreview），不要把页面菜单/弹窗带进去
+        // 关键：只截取标签本身（.label-container），不要把外层容器/按钮高度算进去
         const pageEls = container.querySelectorAll('.batch-pdf-page');
 
         for (let i = 0; i < pageEls.length; i++) {
           const el = pageEls[i];
 
-          // 强制用标签的mm尺寸作为截图基准，避免被外层布局影响
-          const canvas = await html2canvas(el, {
+          // 在每一页内部优先查找标签根节点
+          const labelEl =
+            el.querySelector('.label-container') ||
+            el.querySelector('.material-label-container') ||
+            el; // 兜底：找不到时退回整页
+
+          // 强制用标签的实际尺寸作为截图基准，避免被外层布局影响
+          const canvas = await html2canvas(labelEl, {
             backgroundColor: '#ffffff',
-            scale: 2,
+            scale: 3,
             useCORS: true,
             // 让 html2canvas 为频繁读回优化 Canvas（浏览器会提示 willReadFrequently）
             willReadFrequently: true,
             // 确保按元素尺寸截图
-            width: el.offsetWidth,
-            height: el.offsetHeight,
-            windowWidth: el.scrollWidth,
-            windowHeight: el.scrollHeight,
+            width: labelEl.offsetWidth,
+            height: labelEl.offsetHeight,
+            windowWidth: labelEl.scrollWidth,
+            windowHeight: labelEl.scrollHeight,
           });
 
           const imgDataUrl = canvas.toDataURL('image/png');
@@ -868,18 +868,16 @@ export default {
           // 图片铺满页面（保持比例，居中）
           const imgW = pngImage.width;
           const imgH = pngImage.height;
-          // 按“内容区域（去掉边距）”计算缩放，让四周留下约 4mm 空白
+          // 标准适配：确保完整显示且不变形（在内容区域内等比缩放）
           const scale = Math.min(contentWidthPt / imgW, contentHeightPt / imgH);
           const drawW = imgW * scale;
           const drawH = imgH * scale;
 
-          // 内容区域内居中 + 外层边距
+          // 内容区域内居中 + 外层边距（上下对称）
           const x = marginXPt + (contentWidthPt - drawW) / 2;
-          const y = marginBottomPt + (contentHeightPt - drawH) / 2;
+          const y = marginYPt + (contentHeightPt - drawH) / 2;
 
-          console.log(pngImage)
-
-          page.drawImage(pngImage, { x, y: y - 20, width: drawW, height: drawH + 20 });
+          page.drawImage(pngImage, { x, y, width: drawW, height: drawH });
         }
 
         const pdfBytes = await pdfDoc.save();

From 90c81fbee087bc9bf770eaa1f46e1e771ebd484d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A0=82=E7=B3=96?= <qq2178503051@163.com>
Date: Fri, 9 Jan 2026 19:06:21 +0800
Subject: [PATCH 2/5] =?UTF-8?q?feat(wms):=20=E6=96=B0=E5=A2=9E=E9=92=A2?=
 =?UTF-8?q?=E5=8D=B7=E6=8A=A5=E8=A1=A8=E5=8A=9F=E8=83=BD=E5=B9=B6=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E5=AF=BC=E5=87=BA=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 新增三个报表页面：发货报表、收货报表和ZHA报表
- 添加钢卷数据导出API接口
- 在钢卷拆分页面添加备注字段
- 清理base.vue中的多余空行
---
 klp-ui/src/api/wms/coil.js                |  11 ++
 klp-ui/src/views/wms/coil/panels/base.vue |   2 -
 klp-ui/src/views/wms/coil/split.vue       |   3 +
 klp-ui/src/views/wms/report/delivery.vue  | 113 ++++++++++++++++++
 klp-ui/src/views/wms/report/receive.vue   | 135 ++++++++++++++++++++++
 klp-ui/src/views/wms/report/zha.vue       | 135 ++++++++++++++++++++++
 6 files changed, 397 insertions(+), 2 deletions(-)
 create mode 100644 klp-ui/src/views/wms/report/delivery.vue
 create mode 100644 klp-ui/src/views/wms/report/receive.vue
 create mode 100644 klp-ui/src/views/wms/report/zha.vue

diff --git a/klp-ui/src/api/wms/coil.js b/klp-ui/src/api/wms/coil.js
index 0b80eeff..0afc1959 100644
--- a/klp-ui/src/api/wms/coil.js
+++ b/klp-ui/src/api/wms/coil.js
@@ -163,4 +163,15 @@ export function listCoilOperation({coilIds, planId}) {
       pageSize: 1000
     }
   })
+}
+
+// 钢卷导出
+export function exportCoilData(coilIds) {
+  return request({
+    url: '/wms/materialCoil/export',
+    method: 'post',
+    data: {
+      coilIds
+    }
+  })
 }
\ No newline at end of file
diff --git a/klp-ui/src/views/wms/coil/panels/base.vue b/klp-ui/src/views/wms/coil/panels/base.vue
index 2ba68c64..e991f7d8 100644
--- a/klp-ui/src/views/wms/coil/panels/base.vue
+++ b/klp-ui/src/views/wms/coil/panels/base.vue
@@ -278,8 +278,6 @@ import MutiSelect from "@/components/MutiSelect";
 import html2canvas from 'html2canvas';
 import { PDFDocument } from 'pdf-lib';
 
-
-
 export default {
   name: "MaterialCoil",
   components: {
diff --git a/klp-ui/src/views/wms/coil/split.vue b/klp-ui/src/views/wms/coil/split.vue
index 997ee41b..d1bf06d7 100644
--- a/klp-ui/src/views/wms/coil/split.vue
+++ b/klp-ui/src/views/wms/coil/split.vue
@@ -199,6 +199,9 @@
                   <ActualWarehouseSelect v-model="item.actualWarehouseId" placeholder="请选择真实库区" block
                     :disabled="readonly" />
                 </el-form-item>
+                 <el-form-item label="备注">
+                  <el-input v-model="item.remark" placeholder="请输入备注" :disabled="readonly"/>
+                </el-form-item>
               </el-form>
             </div>
           </div>
diff --git a/klp-ui/src/views/wms/report/delivery.vue b/klp-ui/src/views/wms/report/delivery.vue
new file mode 100644
index 00000000..2647cf36
--- /dev/null
+++ b/klp-ui/src/views/wms/report/delivery.vue
@@ -0,0 +1,113 @@
+<template>
+  <div class="app-container" v-loading="loading">
+    <el-row>
+      <!-- 筛选区 -->
+      开始时间：<el-date-picker v-model="queryParams.startTime" type="datetime" value-format="yyyy-MM-dd HH:mm:ss"
+        placeholder="选择开始时间"></el-date-picker>
+      结束时间：<el-date-picker v-model="queryParams.endTime" type="datetime" value-format="yyyy-MM-dd HH:mm:ss"
+        placeholder="选择结束时间"></el-date-picker>
+      <el-button type="primary" style="margin-left: 10px;" @click="getList">查询</el-button>
+      <el-button type="primary" @click="exportData">导出</el-button>
+    </el-row>
+
+    <el-descriptions title="统计信息" :column="3" border>
+      <el-descriptions-item label="总钢卷数量">{{ summary.totalCount }}</el-descriptions-item>
+      <el-descriptions-item label="总重">{{ summary.totalWeight }}t</el-descriptions-item>
+      <el-descriptions-item label="均重">{{ summary.avgWeight }}t</el-descriptions-item>
+    </el-descriptions>
+
+    <el-descriptions title="明细信息" :column="3" border>
+    </el-descriptions>
+    <el-table :data="list" border  height="calc(100vh - 320px)">
+      <el-table-column label="入场钢卷号" align="center" prop="enterCoilNo">
+        <template slot-scope="scope">
+          <coil-no :coil-no="scope.row.enterCoilNo"></coil-no>
+        </template>
+      </el-table-column>
+      <el-table-column label="当前钢卷号" align="center" prop="currentCoilNo">
+        <template slot-scope="scope">
+          <coil-no :coil-no="scope.row.currentCoilNo"></coil-no>
+        </template>
+      </el-table-column>
+      <el-table-column label="逻辑库位" align="center" prop="warehouseName" />
+      <el-table-column label="实际库区" align="center" prop="actualWarehouseName" />
+      <el-table-column label="产品类型" align="center" width="250">
+        <template slot-scope="scope">
+          <ProductInfo v-if="scope.row.itemType == 'product'" :product="scope.row.product" />
+          <RawMaterialInfo v-else-if="scope.row.itemType === 'raw_material'" :material="scope.row.rawMaterial" />
+        </template>
+      </el-table-column>
+      <el-table-column label="长度 (米)" align="center" prop="length" />
+      <el-table-column label="发货时间" align="center" prop="exportTime" />
+      <el-table-column label="更新人" align="center" prop="updateByName" />
+    </el-table>
+  </div>
+</template>
+
+<script>
+import { listMaterialCoil } from "@/api/wms/coil";
+import ProductInfo from "@/components/KLPService/Renderer/ProductInfo";
+import RawMaterialInfo from "@/components/KLPService/Renderer/RawMaterialInfo";
+import CoilNo from "@/components/KLPService/Renderer/CoilNo.vue";
+
+export default {
+  components: {
+    ProductInfo,
+    RawMaterialInfo,
+    CoilNo,
+  },
+  data() {
+    // 获取昨天0点到今天0点的时间范围
+    const now = new Date()
+    const yesterday = new Date(now.getTime() - 24 * 60 * 60 * 1000)
+    const startTime = yesterday.toISOString().slice(0, 10) + ' 00:00:00'
+    const endTime = now.toISOString().slice(0, 10) + ' 00:00:00'
+    return {
+      list: [],
+      queryParams: {
+        pageNum: 1,
+        pageSize: 9999,
+        status: 1,
+        startTime: startTime,
+        endTime: endTime,
+      },
+      loading: false,
+    }
+  },
+  computed: {
+    summary() {
+      // 总钢卷数量、总重、均重
+      const totalCount = this.list.length
+      const totalWeight = this.list.reduce((acc, cur) => acc + parseFloat(cur.netWeight), 0)
+      const avgWeight = totalCount > 0 ? (totalWeight / totalCount).toFixed(2) : 0
+      return {
+        totalCount,
+        totalWeight,
+        avgWeight,
+      }
+    }
+  },
+  methods: {
+    getList() {
+      this.loading = true
+      listMaterialCoil({
+        ...this.queryParams
+      }).then(res => {
+        this.list = res.rows
+        this.loading = false
+      })
+    },
+    // 导出
+    exportData() {
+      this.download('wms/materialCoil/export', {
+        coilIds: this.list.map(item => item.coilId).join(',')
+      }, `materialCoil_${new Date().getTime()}.xlsx`)
+    },
+  },
+  mounted() {
+    this.getList()
+  }
+}
+</script>
+
+<style scoped></style>
diff --git a/klp-ui/src/views/wms/report/receive.vue b/klp-ui/src/views/wms/report/receive.vue
new file mode 100644
index 00000000..b9a9c422
--- /dev/null
+++ b/klp-ui/src/views/wms/report/receive.vue
@@ -0,0 +1,135 @@
+<template>
+  <div class="app-container" v-loading="loading">
+    <el-row>
+      <!-- 筛选区 -->
+      开始时间：<el-date-picker v-model="queryParams.startTime" type="datetime" value-format="yyyy-MM-dd HH:mm:ss"
+        placeholder="选择开始时间"></el-date-picker>
+      结束时间：<el-date-picker v-model="queryParams.endTime" type="datetime" value-format="yyyy-MM-dd HH:mm:ss"
+        placeholder="选择结束时间"></el-date-picker>
+      <el-button type="primary"  style="margin-left: 10px;" @click="getList">查询</el-button>
+      <el-button type="primary" @click="exportData">导出</el-button>
+    </el-row>
+
+    <el-descriptions title="统计信息" :column="3" border>
+      <el-descriptions-item label="总钢卷数量">{{ summary.totalCount }}</el-descriptions-item>
+      <el-descriptions-item label="总重">{{ summary.totalWeight.toFixed(2) }}t</el-descriptions-item>
+      <el-descriptions-item label="均重">{{ summary.avgWeight }}t</el-descriptions-item>
+    </el-descriptions>
+
+    <el-descriptions title="明细信息" :column="3" border>
+    </el-descriptions>
+    <el-table :data="list" border height="calc(100vh - 320px)">
+      <el-table-column label="入场钢卷号" align="center" prop="enterCoilNo">
+        <template slot-scope="scope">
+          <coil-no :coil-no="scope.row.enterCoilNo"></coil-no>
+        </template>
+      </el-table-column>
+      <el-table-column label="当前钢卷号" align="center" prop="currentCoilNo">
+        <template slot-scope="scope">
+          <coil-no :coil-no="scope.row.currentCoilNo"></coil-no>
+        </template>
+      </el-table-column>
+      <el-table-column label="逻辑库位" align="center" prop="warehouseName" />
+      <el-table-column label="实际库区" align="center" prop="actualWarehouseName" />
+      <el-table-column label="产品类型" align="center" width="250">
+        <template slot-scope="scope">
+          <ProductInfo v-if="scope.row.itemType == 'product'" :product="scope.row.product" />
+          <RawMaterialInfo v-else-if="scope.row.itemType === 'raw_material'" :material="scope.row.rawMaterial" />
+        </template>
+      </el-table-column>
+      <el-table-column label="长度 (米)" align="center" prop="length" />
+      <el-table-column label="更新人" align="center" prop="updateByName" />
+    </el-table>
+  </div>
+</template>
+
+<script>
+import { listMaterialCoil } from "@/api/wms/coil";
+import {
+  listPendingAction,
+} from '@/api/wms/pendingAction';
+import ProductInfo from "@/components/KLPService/Renderer/ProductInfo";
+import RawMaterialInfo from "@/components/KLPService/Renderer/RawMaterialInfo";
+import CoilNo from "@/components/KLPService/Renderer/CoilNo.vue";
+
+export default {
+  components: {
+    ProductInfo,
+    RawMaterialInfo,
+    CoilNo,
+  },
+  data() {
+    // 获取昨天0点到今天0点的时间范围
+    const now = new Date()
+    const yesterday = new Date(now.getTime() - 24 * 60 * 60 * 1000)
+    const startTime = yesterday.toISOString().slice(0, 10) + ' 00:00:00'
+    const endTime = yesterday.toISOString().slice(0, 10) + ' 23:59:59'
+    return {
+      list: [],
+      queryParams: {
+        pageNum: 1,
+        pageSize: 9999,
+        status: 1,
+        startTime: startTime,
+        endTime: endTime,
+      },
+      loading: false,
+    }
+  },
+  computed: {
+    summary() {
+      // 总钢卷数量、总重、均重
+      const totalCount = this.list.length
+      const totalWeight = this.list.reduce((acc, cur) => acc + parseFloat(cur.netWeight), 0)
+      const avgWeight = totalCount > 0 ? (totalWeight / totalCount).toFixed(2) : 0
+      return {
+        totalCount,
+        totalWeight,
+        avgWeight,
+      }
+    }
+  },
+  methods: {
+    getList() {
+      this.loading = true
+      listPendingAction({
+        // actionStatus: 2,
+        actionType: 401,
+        pageSize: 999,
+        pageNum: 1,
+        startTime: this.queryParams.startTime,
+        endTime: this.queryParams.endTime,
+      }).then(res => {
+        const actions = res.rows
+        const coilIds = actions.map(item => item.coilId).join(',')
+        console.log(coilIds)
+        if (!coilIds) {
+          this.$message({
+            message: '暂无数据',
+            type: 'warning',
+          })
+          this.loading = false
+          return
+        }
+        listMaterialCoil({
+          coilIds: coilIds,
+        }).then(res => {
+          this.list = res.rows
+          this.loading = false
+        })
+      })
+    },
+    // 导出
+    exportData() {
+      this.download('wms/materialCoil/export', {
+        coilIds: this.list.map(item => item.coilId).join(',')
+      }, `materialCoil_${new Date().getTime()}.xlsx`)
+    },
+  },
+  mounted() {
+    this.getList()
+  }
+}
+</script>
+
+<style scoped></style>
diff --git a/klp-ui/src/views/wms/report/zha.vue b/klp-ui/src/views/wms/report/zha.vue
new file mode 100644
index 00000000..0674a6f8
--- /dev/null
+++ b/klp-ui/src/views/wms/report/zha.vue
@@ -0,0 +1,135 @@
+<template>
+  <div class="app-container" v-loading="loading">
+    <el-row>
+      <!-- 筛选区 -->
+      开始时间：<el-date-picker v-model="queryParams.startTime" type="datetime" value-format="yyyy-MM-dd HH:mm:ss"
+        placeholder="选择开始时间"></el-date-picker>
+      结束时间：<el-date-picker v-model="queryParams.endTime" type="datetime" value-format="yyyy-MM-dd HH:mm:ss"
+        placeholder="选择结束时间"></el-date-picker>
+      <el-button type="primary"  style="margin-left: 10px;" @click="getList">查询</el-button>
+      <el-button type="primary" @click="exportData">导出</el-button>
+    </el-row>
+
+    <el-descriptions title="统计信息" :column="3" border>
+      <el-descriptions-item label="总钢卷数量">{{ summary.totalCount }}</el-descriptions-item>
+      <el-descriptions-item label="总重">{{ summary.totalWeight.toFixed(2) }}t</el-descriptions-item>
+      <el-descriptions-item label="均重">{{ summary.avgWeight }}t</el-descriptions-item>
+    </el-descriptions>
+
+    <el-descriptions title="明细信息" :column="3" border>
+    </el-descriptions>
+    <el-table :data="list" border height="calc(100vh - 320px)">
+      <el-table-column label="入场钢卷号" align="center" prop="enterCoilNo">
+        <template slot-scope="scope">
+          <coil-no :coil-no="scope.row.enterCoilNo"></coil-no>
+        </template>
+      </el-table-column>
+      <el-table-column label="当前钢卷号" align="center" prop="currentCoilNo">
+        <template slot-scope="scope">
+          <coil-no :coil-no="scope.row.currentCoilNo"></coil-no>
+        </template>
+      </el-table-column>
+      <el-table-column label="逻辑库位" align="center" prop="warehouseName" />
+      <el-table-column label="实际库区" align="center" prop="actualWarehouseName" />
+      <el-table-column label="产品类型" align="center" width="250">
+        <template slot-scope="scope">
+          <ProductInfo v-if="scope.row.itemType == 'product'" :product="scope.row.product" />
+          <RawMaterialInfo v-else-if="scope.row.itemType === 'raw_material'" :material="scope.row.rawMaterial" />
+        </template>
+      </el-table-column>
+      <el-table-column label="长度 (米)" align="center" prop="length" />
+      <el-table-column label="更新人" align="center" prop="updateByName" />
+    </el-table>
+  </div>
+</template>
+
+<script>
+import { listMaterialCoil } from "@/api/wms/coil";
+import {
+  listPendingAction,
+} from '@/api/wms/pendingAction';
+import ProductInfo from "@/components/KLPService/Renderer/ProductInfo";
+import RawMaterialInfo from "@/components/KLPService/Renderer/RawMaterialInfo";
+import CoilNo from "@/components/KLPService/Renderer/CoilNo.vue";
+
+export default {
+  components: {
+    ProductInfo,
+    RawMaterialInfo,
+    CoilNo,
+  },
+  data() {
+    // 获取昨天0点到今天0点的时间范围
+    const now = new Date()
+    const yesterday = new Date(now.getTime() - 24 * 60 * 60 * 1000)
+    const startTime = yesterday.toISOString().slice(0, 10) + ' 00:00:00'
+    const endTime = yesterday.toISOString().slice(0, 10) + ' 23:59:59'
+    return {
+      list: [],
+      queryParams: {
+        pageNum: 1,
+        pageSize: 9999,
+        status: 1,
+        startTime: startTime,
+        endTime: endTime,
+      },
+      loading: false,
+    }
+  },
+  computed: {
+    summary() {
+      // 总钢卷数量、总重、均重
+      const totalCount = this.list.length
+      const totalWeight = this.list.reduce((acc, cur) => acc + parseFloat(cur.netWeight), 0)
+      const avgWeight = totalCount > 0 ? (totalWeight / totalCount).toFixed(2) : 0
+      return {
+        totalCount,
+        totalWeight,
+        avgWeight,
+      }
+    }
+  },
+  methods: {
+    getList() {
+      this.loading = true
+      listPendingAction({
+        // actionStatus: 2,
+        actionType: 11,
+        pageSize: 999,
+        pageNum: 1,
+        startTime: this.queryParams.startTime,
+        endTime: this.queryParams.endTime,
+      }).then(res => {
+        const actions = res.rows
+        const coilIds = actions.map(item => item.coilId).join(',')
+        console.log(coilIds)
+        if (!coilIds) {
+          this.$message({
+            message: '暂无数据',
+            type: 'warning',
+          })
+          this.loading = false
+          return
+        }
+        listMaterialCoil({
+          coilIds: coilIds,
+        }).then(res => {
+          this.list = res.rows
+          this.loading = false
+        })
+      })
+    },
+    // 导出
+    exportData() {
+      this.download('wms/materialCoil/export', {
+        coilIds: this.list.map(item => item.coilId).join(',')
+      }, `materialCoil_${new Date().getTime()}.xlsx`)
+    },
+  },
+  mounted() {
+    this.getList()
+  }
+}
+</script>
+
+<style scoped></style>

From b474b250b54f08745037d8975163699a653405a3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A0=82=E7=B3=96?= <qq2178503051@163.com>
Date: Fri, 9 Jan 2026 19:37:18 +0800
Subject: [PATCH 3/5] =?UTF-8?q?feat(wms):=20=E5=A2=9E=E5=8A=A0=E9=87=8D?=
 =?UTF-8?q?=E9=87=8F=E5=88=97=E5=B9=B6=E4=BC=98=E5=8C=96=E6=8A=A5=E8=A1=A8?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在delivery.vue和receive.vue中增加重量(吨)列
- 修改所有报表页面的时间范围默认为当天00:00:00至23:59:59
- 优化zha.vue的查询逻辑，改为从三个仓库并行获取数据
- 调整QR码尺寸从60增加到80
---
 .../LabelRender/ProductionTagPreview.vue      |  2 +-
 klp-ui/src/views/wms/report/delivery.vue      |  7 +-
 klp-ui/src/views/wms/report/receive.vue       |  9 +-
 klp-ui/src/views/wms/report/zha.vue           | 94 +++++++++++++------
 4 files changed, 75 insertions(+), 37 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 8ed52f20..aee47a08 100644
--- a/klp-ui/src/views/wms/coil/panels/LabelRender/ProductionTagPreview.vue
+++ b/klp-ui/src/views/wms/coil/panels/LabelRender/ProductionTagPreview.vue
@@ -40,7 +40,7 @@
           </div>
         </td>
         <td class="value-cell" colspan="1">
-          <QRCode :content="content.qrcodeRecordId || ' '" :size="60" />
+          <QRCode :content="content.qrcodeRecordId || ' '" :size="80" />
         </td>
       </tr>
        <!-- <tr>
diff --git a/klp-ui/src/views/wms/report/delivery.vue b/klp-ui/src/views/wms/report/delivery.vue
index 2647cf36..0131fca0 100644
--- a/klp-ui/src/views/wms/report/delivery.vue
+++ b/klp-ui/src/views/wms/report/delivery.vue
@@ -37,6 +37,7 @@
           <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="exportTime" />
       <el-table-column label="更新人" align="center" prop="updateByName" />
@@ -60,8 +61,8 @@ export default {
     // 获取昨天0点到今天0点的时间范围
     const now = new Date()
     const yesterday = new Date(now.getTime() - 24 * 60 * 60 * 1000)
-    const startTime = yesterday.toISOString().slice(0, 10) + ' 00:00:00'
-    const endTime = now.toISOString().slice(0, 10) + ' 00:00:00'
+    const startTime = now.toISOString().slice(0, 10) + ' 00:00:00'
+    const endTime = now.toISOString().slice(0, 10) + ' 23:59:59'
     return {
       list: [],
       queryParams: {
@@ -82,7 +83,7 @@ export default {
       const avgWeight = totalCount > 0 ? (totalWeight / totalCount).toFixed(2) : 0
       return {
         totalCount,
-        totalWeight,
+        totalWeight: totalWeight.toFixed(2),
         avgWeight,
       }
     }
diff --git a/klp-ui/src/views/wms/report/receive.vue b/klp-ui/src/views/wms/report/receive.vue
index b9a9c422..28bb1daa 100644
--- a/klp-ui/src/views/wms/report/receive.vue
+++ b/klp-ui/src/views/wms/report/receive.vue
@@ -12,7 +12,7 @@
 
     <el-descriptions title="统计信息" :column="3" border>
       <el-descriptions-item label="总钢卷数量">{{ summary.totalCount }}</el-descriptions-item>
-      <el-descriptions-item label="总重">{{ summary.totalWeight.toFixed(2) }}t</el-descriptions-item>
+      <el-descriptions-item label="总重">{{ summary.totalWeight }}t</el-descriptions-item>
       <el-descriptions-item label="均重">{{ summary.avgWeight }}t</el-descriptions-item>
     </el-descriptions>
 
@@ -37,6 +37,7 @@
           <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="updateByName" />
     </el-table>
@@ -62,8 +63,8 @@ export default {
     // 获取昨天0点到今天0点的时间范围
     const now = new Date()
     const yesterday = new Date(now.getTime() - 24 * 60 * 60 * 1000)
-    const startTime = yesterday.toISOString().slice(0, 10) + ' 00:00:00'
-    const endTime = yesterday.toISOString().slice(0, 10) + ' 23:59:59'
+    const startTime = now.toISOString().slice(0, 10) + ' 00:00:00'
+    const endTime = now.toISOString().slice(0, 10) + ' 23:59:59'
     return {
       list: [],
       queryParams: {
@@ -84,7 +85,7 @@ export default {
       const avgWeight = totalCount > 0 ? (totalWeight / totalCount).toFixed(2) : 0
       return {
         totalCount,
-        totalWeight,
+        totalWeight: totalWeight.toFixed(2),
         avgWeight,
       }
     }
diff --git a/klp-ui/src/views/wms/report/zha.vue b/klp-ui/src/views/wms/report/zha.vue
index 0674a6f8..26218005 100644
--- a/klp-ui/src/views/wms/report/zha.vue
+++ b/klp-ui/src/views/wms/report/zha.vue
@@ -6,13 +6,13 @@
         placeholder="选择开始时间"></el-date-picker>
       结束时间：<el-date-picker v-model="queryParams.endTime" type="datetime" value-format="yyyy-MM-dd HH:mm:ss"
         placeholder="选择结束时间"></el-date-picker>
-      <el-button type="primary"  style="margin-left: 10px;" @click="getList">查询</el-button>
+      <el-button type="primary" style="margin-left: 10px;" @click="getList">查询</el-button>
       <el-button type="primary" @click="exportData">导出</el-button>
     </el-row>
 
     <el-descriptions title="统计信息" :column="3" border>
       <el-descriptions-item label="总钢卷数量">{{ summary.totalCount }}</el-descriptions-item>
-      <el-descriptions-item label="总重">{{ summary.totalWeight.toFixed(2) }}t</el-descriptions-item>
+      <el-descriptions-item label="总重">{{ summary.totalWeight }}t</el-descriptions-item>
       <el-descriptions-item label="均重">{{ summary.avgWeight }}t</el-descriptions-item>
     </el-descriptions>
 
@@ -62,8 +62,8 @@ export default {
     // 获取昨天0点到今天0点的时间范围
     const now = new Date()
     const yesterday = new Date(now.getTime() - 24 * 60 * 60 * 1000)
-    const startTime = yesterday.toISOString().slice(0, 10) + ' 00:00:00'
-    const endTime = yesterday.toISOString().slice(0, 10) + ' 23:59:59'
+    const startTime = now.toISOString().slice(0, 10) + ' 00:00:00'
+    const endTime = now.toISOString().slice(0, 10) + ' 23:59:59'
     return {
       list: [],
       queryParams: {
@@ -84,7 +84,7 @@ export default {
       const avgWeight = totalCount > 0 ? (totalWeight / totalCount).toFixed(2) : 0
       return {
         totalCount,
-        totalWeight,
+        totalWeight: totalWeight.toFixed(2),
         avgWeight,
       }
     }
@@ -92,32 +92,68 @@ export default {
   methods: {
     getList() {
       this.loading = true
-      listPendingAction({
-        // actionStatus: 2,
-        actionType: 11,
-        pageSize: 999,
-        pageNum: 1,
-        startTime: this.queryParams.startTime,
-        endTime: this.queryParams.endTime,
-      }).then(res => {
-        const actions = res.rows
-        const coilIds = actions.map(item => item.coilId).join(',')
-        console.log(coilIds)
-        if (!coilIds) {
-          this.$message({
-            message: '暂无数据',
-            type: 'warning',
-          })
-          this.loading = false
-          return
-        }
+      Promise.all([
+        // 酸连轧成品库
         listMaterialCoil({
-          coilIds: coilIds,
-        }).then(res => {
-          this.list = res.rows
-          this.loading = false
-        })
+          startTime: this.queryParams.startTime,
+          endTime: this.queryParams.endTime,
+          pageSize: 9999,
+          pageNum: 1,
+          dataType: 1,
+          createBy: 'suanzhakuguan',
+          warehouseId: '1988150099140866050'
+        }),
+        // 镀锌原料库
+        listMaterialCoil({
+          startTime: this.queryParams.startTime,
+          endTime: this.queryParams.endTime,
+          pageSize: 9999,
+          pageNum: 1,
+          dataType: 1,
+          createBy: 'suanzhakuguan',
+          warehouseId: '1988150263284953089'
+        }),
+        // 脱脂原料库
+        listMaterialCoil({
+          startTime: this.queryParams.startTime,
+          endTime: this.queryParams.endTime,
+          pageSize: 9999,
+          pageNum: 1,
+          dataType: 1,
+          createBy: 'suanzhakuguan',
+          warehouseId: '1988150545175736322'
+        }),
+      ]).then(([res1, res2, res3]) => {
+        console.log(res1, res2, res3)
+        this.list = [...res1.rows, ...res2.rows, ...res3.rows]
+        this.loading = false
       })
+      // listPendingAction({
+      //   // actionStatus: 2,
+      //   actionType: 11,
+      //   pageSize: 999,
+      //   pageNum: 1,
+      //   startTime: this.queryParams.startTime,
+      //   endTime: this.queryParams.endTime,
+      // }).then(res => {
+      //   const actions = res.rows
+      //   const coilIds = actions.map(item => item.coilId).join(',')
+      //   console.log(coilIds)
+      //   if (!coilIds) {
+      //     this.$message({
+      //       message: '暂无数据',
+      //       type: 'warning',
+      //     })
+      //     this.loading = false
+      //     return
+      //   }
+      //   listMaterialCoil({
+      //     coilIds: coilIds,
+      //   }).then(res => {
+      //     this.list = res.rows
+      //     this.loading = false
+      //   })
+      // })
     },
     // 导出
     exportData() {

From bff083720d592c9c992b433706d79e161c342baa Mon Sep 17 00:00:00 2001
From: 86156 <823267011@qq.com>
Date: Fri, 9 Jan 2026 20:09:30 +0800
Subject: [PATCH 4/5] =?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      | 84 +++++++++++--------
 1 file changed, 50 insertions(+), 34 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 8ed52f20..2cd4e0bb 100644
--- a/klp-ui/src/views/wms/coil/panels/LabelRender/ProductionTagPreview.vue
+++ b/klp-ui/src/views/wms/coil/panels/LabelRender/ProductionTagPreview.vue
@@ -1,9 +1,9 @@
 <template>
   <div class="label-container" :style="{ '--print-scale': printScale }">
     <table class="material-label-table">
-      <!-- 调整第一行结构，使label和value各占2列（等宽） -->
+      <!-- 调整第一行结构，左侧内容扩大，右侧二维码减小边距 -->
       <tr>
-        <td colspan="3" style="padding: 0;">
+        <td colspan="2" style="padding: 0; width: 50%;">
           <div 
             style="
               display: flex; 
@@ -12,35 +12,52 @@
               text-align: center; 
               justify-content: space-evenly; 
               flex-direction: column;
+              font-size: 13px;
               ">
             <div style="display: flex; flex: 1; align-items: center;">
-              <div style="flex: 1; height: 100%; display: flex; align-items: center; justify-content: center; border: 1px solid #333; box-sizing: border-box;" class="label-cell">
+              <div style="flex: 1; height: 100%; display: flex; align-items: center; justify-content: center; border: 1px solid #333; box-sizing: border-box; padding: 3px; word-break: break-all; overflow-wrap: break-word;" class="label-cell">
                 料卷号
               </div>
-              <div style="flex: 1; height: 100%; display: flex; align-items: center; justify-content: center; border: 1px solid #333; box-sizing: border-box;" class="value-cell">
+              <div style="flex: 1; height: 100%; display: flex; align-items: center; justify-content: center; border: 1px solid #333; box-sizing: border-box; padding: 3px; word-break: break-all; overflow-wrap: break-word;" class="value-cell">
                 {{ content.enterCoilNo || '' }}
               </div>
             </div>
             <div style="display: flex; flex: 1; align-items: center;">
-              <div style="flex: 1; height: 100%; display: flex; align-items: center; justify-content: center; border: 1px solid #333; box-sizing: border-box;" class="label-cell">
+              <div style="flex: 1; height: 100%; display: flex; align-items: center; justify-content: center; border: 1px solid #333; box-sizing: border-box; padding: 3px; word-break: break-all; overflow-wrap: break-word;" class="label-cell">
                 逻辑库区
               </div>
-              <div style="flex: 1; height: 100%; display: flex; align-items: center; justify-content: center; border: 1px solid #333; box-sizing: border-box;" class="value-cell">
+              <div style="flex: 1; height: 100%; display: flex; align-items: center; justify-content: center; border: 1px solid #333; box-sizing: border-box; padding: 3px; word-break: break-all; overflow-wrap: break-word;" class="value-cell">
                 <input type="text" class="nob" :value="content.warehouseName || ''" />
               </div>
             </div>
             <div style="display: flex; flex: 1; align-items: center;">
-              <div style="flex: 1; height: 100%; display: flex; align-items: center; justify-content: center; border: 1px solid #333; box-sizing: border-box;" class="label-cell">
+              <div style="flex: 1; height: 100%; display: flex; align-items: center; justify-content: center; border: 1px solid #333; box-sizing: border-box; padding: 3px; word-break: break-all; overflow-wrap: break-word;" class="label-cell">
                 实际库区
               </div>
-              <div style="flex: 1; height: 100%; display: flex; align-items: center; justify-content: center; border: 1px solid #333; box-sizing: border-box;" class="value-cell">
+              <div style="flex: 1; height: 100%; display: flex; align-items: center; justify-content: center; border: 1px solid #333; box-sizing: border-box; padding: 3px; word-break: break-all; overflow-wrap: break-word;" class="value-cell">
                 <input type="text" class="nob" :value="content.actualWarehouseName || ''" />
               </div>
             </div>
+            <div style="display: flex; flex: 1; align-items: center;">
+              <div style="flex: 1; height: 100%; display: flex; align-items: center; justify-content: center; border: 1px solid #333; box-sizing: border-box; padding: 3px; word-break: break-all; overflow-wrap: break-word;" class="label-cell">
+                规格(mm)
+              </div>
+              <div style="flex: 1; height: 100%; display: flex; align-items: center; justify-content: center; border: 1px solid #333; box-sizing: border-box; padding: 3px; word-break: break-all; overflow-wrap: break-word;" class="value-cell">
+                <input type="text" class="nob" :value="content.specification || ''" />
+              </div>
+            </div>
+            <div style="display: flex; flex: 1; align-items: center;">
+              <div style="flex: 1; height: 100%; display: flex; align-items: center; justify-content: center; border: 1px solid #333; box-sizing: border-box; padding: 3px; word-break: break-all; overflow-wrap: break-word;" class="label-cell">
+                生产班组
+              </div>
+              <div style="flex: 1; height: 100%; display: flex; align-items: center; justify-content: center; border: 1px solid #333; box-sizing: border-box; padding: 3px; word-break: break-all; overflow-wrap: break-word;" class="value-cell">
+                <input type="text" class="nob" :value="content.team || ''" />
+              </div>
+            </div>
           </div>
         </td>
-        <td class="value-cell" colspan="1">
-          <QRCode :content="content.qrcodeRecordId || ' '" :size="60" />
+        <td class="value-cell" colspan="4" style="width: 50%; padding: 2px; text-align: center; vertical-align: middle;">
+          <QRCode :content="content.qrcodeRecordId || ' '" :size="130" />
         </td>
       </tr>
        <!-- <tr>
@@ -56,34 +73,25 @@
         </td>
       </tr> -->
       <tr>
-        <td class="label-cell">规格(mm)</td>
-        <td class="value-cell">
-          <input type="text" class="nob" :value="content.specification || ''" />
-        </td>
-        <td class="label-cell">净重</td>
-        <td class="value-cell">
+        <td class="label-cell" style="width: 16.67%; padding: 4px;">净重</td>
+        <td class="value-cell" colspan="2" style="width: 33.33%; padding: 4px;">
           <input type="text" class="nob" :value="content.netWeight || ''" />
         </td>
-      </tr>
-      <tr>
-        <td class="label-cell">材质</td>
-        <td class="value-cell">
+        <td class="label-cell" style="width: 16.67%; padding: 4px;">材质</td>
+        <td class="value-cell" colspan="2" style="width: 33.33%; padding: 4px;">
           <input type="text" class="nob" :value="content.material || ''" />
         </td>
-        <td class="label-cell">下道</td>
-        <td class="value-cell">
-          <input type="text" class="nob" :value="content.nextProcess || ''" />
-        </td>
       </tr>
       <tr>
-        <td class="label-cell">生产班组</td>
-        <td class="value-cell">
-          <input type="text" class="nob" :value="content.team || ''" />
-        </td>
-        <td class="label-cell">时间</td>
-        <td class="value-cell">
+        <td class="label-cell" style="width: 16.67%; padding: 4px;">时间</td>
+        <td class="value-cell" colspan="2" style="width: 33.33%; padding: 4px;">
           <input type="text" class="nob" :value="content.updateTime || ''" />
         </td>
+        <td class="label-cell" style="width: 16.67%; padding: 4px;">下道</td>
+        <td class="value-cell" colspan="2" style="width: 33.33%; padding: 4px;">
+          <input type="text" class="nob" :value="content.nextProcess || ''" />
+        </td>
+
       </tr>
     </table>
   </div>
@@ -170,7 +178,7 @@ export default {
         const container = this.$el;
         if (!container) return;
         
-        // 纸张尺寸：100mm x 80mm
+        // 纸张尺寸：180mm x 100mm
         const dpi = 96; // 标准 DPI
         const mmToPx = dpi / 25.4; // 1mm = 3.779527559px
         
@@ -231,7 +239,6 @@ export default {
   flex-direction: column; /* 子元素垂直排列 */
   font-family: "SimSun", serif;
   box-sizing: border-box; /* 确保内边距/边框不影响总尺寸 */
-  overflow: visible; /* 确保所有内容可见，不被裁剪 */
 }
 
 .material-label-table {
@@ -240,6 +247,7 @@ export default {
   table-layout: fixed;
   flex-grow: 1; /* 让表格拉伸，占满剩余垂直空间 */
   height: 0; /* 配合flex-grow，自动计算高度 */
+  border: 1px solid #333; /* 确保表格有最外层边框 */
 }
 
 /* 四列均分宽度，每列占25% */
@@ -250,6 +258,10 @@ export default {
   /* width: 25%; */
   box-sizing: border-box;
   text-align: center;
+  word-break: break-all;
+  overflow-wrap: break-word;
+  white-space: normal;
+  overflow: hidden;
 }
 
 .label-cell {
@@ -268,12 +280,16 @@ export default {
   outline: none;
   background: transparent;
   text-align: center;
+  font-size: inherit;
+  word-break: break-all;
+  overflow-wrap: break-word;
+  white-space: normal;
 }
 
-/* 打印样式 - 强制单页，适配100mm x 80mm纸张，保持原有样式不变 */
+/* 打印样式 - 强制单页，适配180mm x 100mm纸张，保持原有样式不变 */
 @media print {
   @page {
-    size: 100mm 80mm;
+    size: 180mm 100mm;
     margin: 0 !important;
     padding: 0 !important;
   }

From c4a15b04565d723100bf1d2e8be6cf1e6aa34e06 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A0=82=E7=B3=96?= <qq2178503051@163.com>
Date: Fri, 9 Jan 2026 20:12:22 +0800
Subject: [PATCH 5/5] =?UTF-8?q?feat(wms=E6=8A=A5=E8=A1=A8):=20=E5=A2=9E?=
 =?UTF-8?q?=E5=BC=BA=E6=8A=A5=E8=A1=A8=E9=A1=B5=E9=9D=A2=E7=9A=84=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

为接收、发货和轧后酸洗报表页面添加更多查询条件，包括钢卷号、库位、产品信息等
统一使用el-form布局查询表单，并新增相关组件引用和字典配置
---
 klp-ui/src/views/wms/report/delivery.vue | 66 ++++++++++++++++++++---
 klp-ui/src/views/wms/report/receive.vue  | 65 +++++++++++++++++++---
 klp-ui/src/views/wms/report/zha.vue      | 68 +++++++++++++++++++++---
 3 files changed, 177 insertions(+), 22 deletions(-)

diff --git a/klp-ui/src/views/wms/report/delivery.vue b/klp-ui/src/views/wms/report/delivery.vue
index 0131fca0..0f0014d1 100644
--- a/klp-ui/src/views/wms/report/delivery.vue
+++ b/klp-ui/src/views/wms/report/delivery.vue
@@ -1,13 +1,48 @@
 <template>
   <div class="app-container" v-loading="loading">
     <el-row>
-      <!-- 筛选区 -->
-      开始时间：<el-date-picker v-model="queryParams.startTime" type="datetime" value-format="yyyy-MM-dd HH:mm:ss"
-        placeholder="选择开始时间"></el-date-picker>
-      结束时间：<el-date-picker v-model="queryParams.endTime" type="datetime" value-format="yyyy-MM-dd HH:mm:ss"
-        placeholder="选择结束时间"></el-date-picker>
-      <el-button type="primary" style="margin-left: 10px;" @click="getList">查询</el-button>
-      <el-button type="primary" @click="exportData">导出</el-button>
+      <el-form label-width="80px" inline>
+        <el-form-item label="开始时间" prop="startTime">
+          <el-date-picker style="width: 200px;" v-model="queryParams.startTime" type="datetime" value-format="yyyy-MM-dd HH:mm:ss"
+            placeholder="选择开始时间"></el-date-picker>
+        </el-form-item>
+        <el-form-item label="结束时间" prop="endTime">
+          <el-date-picker style="width: 200px;" v-model="queryParams.endTime" type="datetime" value-format="yyyy-MM-dd HH:mm:ss"
+            placeholder="选择结束时间"></el-date-picker>
+        </el-form-item>
+        <el-form-item label="入场钢卷号" prop="endTime">
+          <el-input style="width: 200px; display: inline-block;" v-model="queryParams.enterCoilNo"
+            placeholder="请输入入场钢卷号" clearable @keyup.enter.native="handleQuery" />
+        </el-form-item>
+        <el-form-item label="当前钢卷号" prop="endTime">
+          <el-input style="width: 200px;" v-model="queryParams.currentCoilNo" placeholder="请输入当前钢卷号" clearable
+            @keyup.enter.native="handleQuery" />
+        </el-form-item>
+        <el-form-item label="逻辑库位" prop="endTime">
+          <warehouse-select v-model="queryParams.warehouseId" placeholder="请选择仓库/库区/库位"
+            style="width: 100%; display: inline-block; width: 200px;" clearable />
+        </el-form-item>
+        <el-form-item label="产品名称" prop="endTime">
+          <el-input style="width: 200px;" v-model="queryParams.itemName" placeholder="请输入产品名称" clearable
+            @keyup.enter.native="handleQuery" />
+        </el-form-item>
+        <el-form-item label="规格" prop="endTime">
+          <memo-input style="width: 200px;" v-model="queryParams.itemSpecification" storageKey="coilSpec"
+            placeholder="请选择规格" clearable @keyup.enter.native="handleQuery" />
+        </el-form-item>
+        <el-form-item label="材质" prop="endTime">
+          <muti-select style="width: 200px;" v-model="queryParams.itemMaterial" :options="dict.type.coil_material"
+            placeholder="请选择材质" clearable @keyup.enter.native="handleQuery" />
+        </el-form-item>
+        <el-form-item label="厂家" prop="endTime">
+          <muti-select style="width: 200px;" v-model="queryParams.itemManufacturer"
+            :options="dict.type.coil_manufacturer" placeholder="请选择厂家" clearable @keyup.enter.native="handleQuery" />
+        </el-form-item>
+        <el-form-item prop="endTime">
+          <el-button type="primary" @click="getList">查询</el-button>
+          <el-button type="primary" @click="exportData">导出</el-button>
+        </el-form-item>
+      </el-form>
     </el-row>
 
     <el-descriptions title="统计信息" :column="3" border>
@@ -18,7 +53,7 @@
 
     <el-descriptions title="明细信息" :column="3" border>
     </el-descriptions>
-    <el-table :data="list" border  height="calc(100vh - 320px)">
+    <el-table :data="list" border height="calc(100vh - 320px)">
       <el-table-column label="入场钢卷号" align="center" prop="enterCoilNo">
         <template slot-scope="scope">
           <coil-no :coil-no="scope.row.enterCoilNo"></coil-no>
@@ -50,13 +85,20 @@ import { listMaterialCoil } from "@/api/wms/coil";
 import ProductInfo from "@/components/KLPService/Renderer/ProductInfo";
 import RawMaterialInfo from "@/components/KLPService/Renderer/RawMaterialInfo";
 import CoilNo from "@/components/KLPService/Renderer/CoilNo.vue";
+import MemoInput from "@/components/MemoInput";
+import MutiSelect from "@/components/MutiSelect";
+import WarehouseSelect from "@/components/KLPService/WarehouseSelect";
 
 export default {
   components: {
     ProductInfo,
     RawMaterialInfo,
     CoilNo,
+    MemoInput,
+    MutiSelect,
+    WarehouseSelect
   },
+  dicts: ['product_coil_status', 'coil_material', 'coil_itemname', 'coil_manufacturer'],
   data() {
     // 获取昨天0点到今天0点的时间范围
     const now = new Date()
@@ -71,6 +113,14 @@ export default {
         status: 1,
         startTime: startTime,
         endTime: endTime,
+        selectType: 'product',
+        enterCoilNo: '',
+        currentCoilNo: '',
+        warehouseId: '',
+        productName: '',
+        itemSpecification: '',
+        itemMaterial: '',
+        itemManufacturer: '',
       },
       loading: false,
     }
diff --git a/klp-ui/src/views/wms/report/receive.vue b/klp-ui/src/views/wms/report/receive.vue
index 28bb1daa..419efea9 100644
--- a/klp-ui/src/views/wms/report/receive.vue
+++ b/klp-ui/src/views/wms/report/receive.vue
@@ -1,13 +1,48 @@
 <template>
   <div class="app-container" v-loading="loading">
     <el-row>
-      <!-- 筛选区 -->
-      开始时间：<el-date-picker v-model="queryParams.startTime" type="datetime" value-format="yyyy-MM-dd HH:mm:ss"
-        placeholder="选择开始时间"></el-date-picker>
-      结束时间：<el-date-picker v-model="queryParams.endTime" type="datetime" value-format="yyyy-MM-dd HH:mm:ss"
-        placeholder="选择结束时间"></el-date-picker>
-      <el-button type="primary"  style="margin-left: 10px;" @click="getList">查询</el-button>
-      <el-button type="primary" @click="exportData">导出</el-button>
+      <el-form label-width="80px" inline>
+        <el-form-item label="开始时间" prop="startTime">
+          <el-date-picker style="width: 200px;" v-model="queryParams.startTime" type="datetime"
+            value-format="yyyy-MM-dd HH:mm:ss" placeholder="选择开始时间"></el-date-picker>
+        </el-form-item>
+        <el-form-item label="结束时间" prop="endTime">
+          <el-date-picker style="width: 200px;" v-model="queryParams.endTime" type="datetime"
+            value-format="yyyy-MM-dd HH:mm:ss" placeholder="选择结束时间"></el-date-picker>
+        </el-form-item>
+        <el-form-item label="入场钢卷号" prop="endTime">
+          <el-input style="width: 200px; display: inline-block;" v-model="queryParams.enterCoilNo"
+            placeholder="请输入入场钢卷号" clearable @keyup.enter.native="handleQuery" />
+        </el-form-item>
+        <el-form-item label="当前钢卷号" prop="endTime">
+          <el-input style="width: 200px;" v-model="queryParams.currentCoilNo" placeholder="请输入当前钢卷号" clearable
+            @keyup.enter.native="handleQuery" />
+        </el-form-item>
+        <el-form-item label="逻辑库位" prop="endTime">
+          <warehouse-select v-model="queryParams.warehouseId" placeholder="请选择仓库/库区/库位"
+            style="width: 100%; display: inline-block; width: 200px;" clearable />
+        </el-form-item>
+        <el-form-item label="产品名称" prop="endTime">
+          <el-input style="width: 200px;" v-model="queryParams.itemName" placeholder="请输入产品名称" clearable
+            @keyup.enter.native="handleQuery" />
+        </el-form-item>
+        <el-form-item label="规格" prop="endTime">
+          <memo-input style="width: 200px;" v-model="queryParams.itemSpecification" storageKey="coilSpec"
+            placeholder="请选择规格" clearable @keyup.enter.native="handleQuery" />
+        </el-form-item>
+        <el-form-item label="材质" prop="endTime">
+          <muti-select style="width: 200px;" v-model="queryParams.itemMaterial" :options="dict.type.coil_material"
+            placeholder="请选择材质" clearable @keyup.enter.native="handleQuery" />
+        </el-form-item>
+        <el-form-item label="厂家" prop="endTime">
+          <muti-select style="width: 200px;" v-model="queryParams.itemManufacturer"
+            :options="dict.type.coil_manufacturer" placeholder="请选择厂家" clearable @keyup.enter.native="handleQuery" />
+        </el-form-item>
+        <el-form-item prop="endTime">
+          <el-button type="primary" @click="getList">查询</el-button>
+          <el-button type="primary" @click="exportData">导出</el-button>
+        </el-form-item>
+      </el-form>
     </el-row>
 
     <el-descriptions title="统计信息" :column="3" border>
@@ -52,13 +87,20 @@ import {
 import ProductInfo from "@/components/KLPService/Renderer/ProductInfo";
 import RawMaterialInfo from "@/components/KLPService/Renderer/RawMaterialInfo";
 import CoilNo from "@/components/KLPService/Renderer/CoilNo.vue";
+import MemoInput from "@/components/MemoInput";
+import MutiSelect from "@/components/MutiSelect";
+import WarehouseSelect from "@/components/KLPService/WarehouseSelect";
 
 export default {
   components: {
     ProductInfo,
     RawMaterialInfo,
     CoilNo,
+    MemoInput,
+    MutiSelect,
+    WarehouseSelect,
   },
+  dicts: ['product_coil_status', 'coil_material', 'coil_itemname', 'coil_manufacturer'],
   data() {
     // 获取昨天0点到今天0点的时间范围
     const now = new Date()
@@ -73,6 +115,14 @@ export default {
         status: 1,
         startTime: startTime,
         endTime: endTime,
+        selectType: 'product',
+        enterCoilNo: '',
+        currentCoilNo: '',
+        warehouseId: '',
+        productName: '',
+        itemSpecification: '',
+        itemMaterial: '',
+        itemManufacturer: '',
       },
       loading: false,
     }
@@ -113,6 +163,7 @@ export default {
           return
         }
         listMaterialCoil({
+          ...this.queryParams,
           coilIds: coilIds,
         }).then(res => {
           this.list = res.rows
diff --git a/klp-ui/src/views/wms/report/zha.vue b/klp-ui/src/views/wms/report/zha.vue
index 26218005..f64a3f9f 100644
--- a/klp-ui/src/views/wms/report/zha.vue
+++ b/klp-ui/src/views/wms/report/zha.vue
@@ -1,13 +1,48 @@
 <template>
   <div class="app-container" v-loading="loading">
     <el-row>
-      <!-- 筛选区 -->
-      开始时间：<el-date-picker v-model="queryParams.startTime" type="datetime" value-format="yyyy-MM-dd HH:mm:ss"
-        placeholder="选择开始时间"></el-date-picker>
-      结束时间：<el-date-picker v-model="queryParams.endTime" type="datetime" value-format="yyyy-MM-dd HH:mm:ss"
-        placeholder="选择结束时间"></el-date-picker>
-      <el-button type="primary" style="margin-left: 10px;" @click="getList">查询</el-button>
-      <el-button type="primary" @click="exportData">导出</el-button>
+      <el-form label-width="80px" inline>
+        <el-form-item label="开始时间" prop="startTime">
+          <el-date-picker style="width: 200px;" v-model="queryParams.startTime" type="datetime"
+            value-format="yyyy-MM-dd HH:mm:ss" placeholder="选择开始时间"></el-date-picker>
+        </el-form-item>
+        <el-form-item label="结束时间" prop="endTime">
+          <el-date-picker style="width: 200px;" v-model="queryParams.endTime" type="datetime"
+            value-format="yyyy-MM-dd HH:mm:ss" placeholder="选择结束时间"></el-date-picker>
+        </el-form-item>
+        <el-form-item label="入场钢卷号" prop="endTime">
+          <el-input style="width: 200px; display: inline-block;" v-model="queryParams.enterCoilNo"
+            placeholder="请输入入场钢卷号" clearable @keyup.enter.native="handleQuery" />
+        </el-form-item>
+        <el-form-item label="当前钢卷号" prop="endTime">
+          <el-input style="width: 200px;" v-model="queryParams.currentCoilNo" placeholder="请输入当前钢卷号" clearable
+            @keyup.enter.native="handleQuery" />
+        </el-form-item>
+        <el-form-item label="逻辑库位" prop="endTime">
+          <warehouse-select v-model="queryParams.warehouseId" placeholder="请选择仓库/库区/库位"
+            style="width: 100%; display: inline-block; width: 200px;" clearable />
+        </el-form-item>
+        <el-form-item label="产品名称" prop="endTime">
+          <el-input style="width: 200px;" v-model="queryParams.itemName" placeholder="请输入产品名称" clearable
+            @keyup.enter.native="handleQuery" />
+        </el-form-item>
+        <el-form-item label="规格" prop="endTime">
+          <memo-input style="width: 200px;" v-model="queryParams.itemSpecification" storageKey="coilSpec"
+            placeholder="请选择规格" clearable @keyup.enter.native="handleQuery" />
+        </el-form-item>
+        <el-form-item label="材质" prop="endTime">
+          <muti-select style="width: 200px;" v-model="queryParams.itemMaterial" :options="dict.type.coil_material"
+            placeholder="请选择材质" clearable @keyup.enter.native="handleQuery" />
+        </el-form-item>
+        <el-form-item label="厂家" prop="endTime">
+          <muti-select style="width: 200px;" v-model="queryParams.itemManufacturer"
+            :options="dict.type.coil_manufacturer" placeholder="请选择厂家" clearable @keyup.enter.native="handleQuery" />
+        </el-form-item>
+        <el-form-item prop="endTime">
+          <el-button type="primary" @click="getList">查询</el-button>
+          <el-button type="primary" @click="exportData">导出</el-button>
+        </el-form-item>
+      </el-form>
     </el-row>
 
     <el-descriptions title="统计信息" :column="3" border>
@@ -51,13 +86,21 @@ import {
 import ProductInfo from "@/components/KLPService/Renderer/ProductInfo";
 import RawMaterialInfo from "@/components/KLPService/Renderer/RawMaterialInfo";
 import CoilNo from "@/components/KLPService/Renderer/CoilNo.vue";
+import MemoInput from "@/components/MemoInput";
+import MutiSelect from "@/components/MutiSelect";
+import WarehouseSelect from "@/components/KLPService/WarehouseSelect";
+
 
 export default {
   components: {
     ProductInfo,
     RawMaterialInfo,
     CoilNo,
+    MemoInput,
+    MutiSelect,
+    WarehouseSelect,
   },
+  dicts: ['product_coil_status', 'coil_material', 'coil_itemname', 'coil_manufacturer'],
   data() {
     // 获取昨天0点到今天0点的时间范围
     const now = new Date()
@@ -72,6 +115,14 @@ export default {
         status: 1,
         startTime: startTime,
         endTime: endTime,
+        selectType: 'product',
+        enterCoilNo: '',
+        currentCoilNo: '',
+        warehouseId: '',
+        productName: '',
+        itemSpecification: '',
+        itemMaterial: '',
+        itemManufacturer: '',
       },
       loading: false,
     }
@@ -95,6 +146,7 @@ export default {
       Promise.all([
         // 酸连轧成品库
         listMaterialCoil({
+          ...this.queryParams,
           startTime: this.queryParams.startTime,
           endTime: this.queryParams.endTime,
           pageSize: 9999,
@@ -105,6 +157,7 @@ export default {
         }),
         // 镀锌原料库
         listMaterialCoil({
+          ...this.queryParams,
           startTime: this.queryParams.startTime,
           endTime: this.queryParams.endTime,
           pageSize: 9999,
@@ -115,6 +168,7 @@ export default {
         }),
         // 脱脂原料库
         listMaterialCoil({
+          ...this.queryParams,
           startTime: this.queryParams.startTime,
           endTime: this.queryParams.endTime,
           pageSize: 9999,