From 3f503eab0ca0701d7dcfd630d6a2aae1d64fae24 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A0=82=E7=B3=96?= <qq2178503051@163.com>
Date: Fri, 20 Mar 2026 15:15:51 +0800
Subject: [PATCH] =?UTF-8?q?refactor(=E6=A0=87=E7=AD=BE=E6=B8=B2=E6=9F=93):?=
 =?UTF-8?q?=20=E5=B0=86=E8=BE=93=E5=85=A5=E6=A1=86=E6=9B=BF=E6=8D=A2?=
 =?UTF-8?q?=E4=B8=BA=E9=9D=99=E6=80=81=E6=96=87=E6=9C=AC=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

移除标签渲染组件中的可编辑输入框，统一使用静态文本显示内容
恢复修正按钮功能，移除质量状态表单字段
注释掉未使用的统计信息组件
---
 .../wms/coil/panels/LabelRender/DuGeTag.vue   | 33 ++++++-------
 .../coil/panels/LabelRender/GalvanizedTag.vue | 38 ++++++++-------
 .../coil/panels/LabelRender/MaterialTag.vue   | 19 +++++---
 .../panels/LabelRender/OuterTagPreview.vue    | 48 ++++++++++++-------
 .../wms/coil/panels/LabelRender/TuoZhiTag.vue | 20 ++++----
 .../wms/coil/panels/LabelRender/WhereTag.vue  | 20 ++++----
 .../coil/panels/LabelRender/ZincRawTag.vue    | 20 ++++----
 klp-ui/src/views/wms/coil/panels/base.vue     | 12 ++---
 .../src/views/wms/coil/panels/stepSplit.vue   |  3 ++
 klp-ui/src/views/wms/report/merge/index.vue   | 13 ++---
 10 files changed, 125 insertions(+), 101 deletions(-)

diff --git a/klp-ui/src/views/wms/coil/panels/LabelRender/DuGeTag.vue b/klp-ui/src/views/wms/coil/panels/LabelRender/DuGeTag.vue
index a05b5484..a8e181f6 100644
--- a/klp-ui/src/views/wms/coil/panels/LabelRender/DuGeTag.vue
+++ b/klp-ui/src/views/wms/coil/panels/LabelRender/DuGeTag.vue
@@ -19,53 +19,54 @@
         <!-- 第一行：订货单位 + 合同号 -->
         <div class="info-grid-item label-cell">订货单位</div>
         <div class="info-grid-item value-cell">
-          <input type="text" class="nob" :value="content.orderUnit || ''" />
+          <div class="nob">{{ content.orderUnit || '' }}</div>
+          <!-- <input type="text"  :value="content.orderUnit || ''" /> -->
         </div>
         <div class="info-grid-item label-cell">合同号</div>
         <div class="info-grid-item value-cell">
-          <input type="text" class="nob" :value="content.contractNumber || ''" />
+          <div class="nob">{{ content.contractNumber || '' }}</div>
         </div>
 
         <!-- 第二行：执行标准 + 钢卷号 -->
         <div class="info-grid-item label-cell">产品名称</div>
         <div class="info-grid-item value-cell">
-          <input type="text" class="nob" :value="content.itemName || ''" />
+          <div class="nob">{{ content.itemName || '' }}</div>
         </div>
         <div class="info-grid-item label-cell">执行标准</div>
         <div class="info-grid-item value-cell">
-          <input type="text" class="nob" :value="content.executionStandard || ''" />
+          <div class="nob">{{ content.executionStandard || '' }}</div>
         </div>
         <div class="info-grid-item label-cell">钢卷号</div>
         <div class="info-grid-item value-cell">
-          <input type="text" class="nob" :value="content.currentCoilNo || ''" />
+          <div class="nob">{{ content.currentCoilNo || '' }}</div>
         </div>
 
         <!-- 第三行：原料卷号 + 规格 -->
         <div class="info-grid-item label-cell">原料卷号</div>
         <div class="info-grid-item value-cell">
-          <input type="text" class="nob" :value="content.enterCoilNo || ''" />
+          <div class="nob">{{ content.enterCoilNo || '' }}</div>
         </div>
         <div class="info-grid-item label-cell">规格</div>
         <div class="info-grid-item value-cell">
-          <input type="text" class="nob" :value="content.specification || ''" />
+          <div class="nob">{{ content.specification || '' }}</div>
         </div>
 
         <!-- 第四行：材质 + 表面质量 -->
         <div class="info-grid-item label-cell">材质</div>
         <div class="info-grid-item value-cell">
-          <input type="text" class="nob" :value="materialWithManufacturer || ''" />
+          <div class="nob">{{ content.materialWithManufacturer || '' }}</div>
         </div>
         <div class="info-grid-item label-cell">表面状态</div>
         <div class="info-grid-item value-cell">
-          <input type="text" class="nob" :value="content.surfaceTreatmentDesc || ''" />
+          <div class="nob">{{ content.surfaceTreatmentDesc || '' }}</div>
         </div>
         <div class="info-grid-item label-cell">调制度</div>
         <div class="info-grid-item value-cell">
-          <input type="text" class="nob" :value="content.temperGrade || ''" />
+          <div class="nob">{{ content.temperGrade || '' }}</div>
         </div>
         <div class="info-grid-item label-cell">产品等级</div>
         <div class="info-grid-item value-cell">
-          <input type="text" class="nob" :value="content.qualityStatus || ''" />
+          <div class="nob">{{ content.qualityStatus || '' }}</div>
         </div>
 
         <!-- 第五行：表面处理 + 剪切要求 -->
@@ -81,27 +82,27 @@
         <!-- 第六行：包装种类 + 毛重 -->
         <div class="info-grid-item label-cell">镀层质量</div>
         <div class="info-grid-item value-cell">
-          <input type="text" class="nob" :value="content.zincLayer || ''" />
+          <div class="nob">{{ content.zincLayer || '' }}</div>
         </div>
         <div class="info-grid-item label-cell">毛重</div>
         <div class="info-grid-item value-cell">
-          <input type="text" class="nob" :value="content.grossWeight || ''" />
+          <div class="nob">{{ content.grossWeight || '' }}</div>
         </div>
 
         <!-- 第七行：净重 + 参考长度 -->
         <div class="info-grid-item label-cell">净重</div>
         <div class="info-grid-item value-cell">
-          <input type="text" class="nob" :value="content.netWeight || ''" />
+          <div class="nob">{{ content.netWeight || '' }}</div>
         </div>
         <div class="info-grid-item label-cell">参考长度</div>
         <div class="info-grid-item value-cell">
-          <input type="text" class="nob" :value="content.length || ''" />
+          <div class="nob">{{ content.length || '' }}</div>
         </div>
 
         <!-- 第八行：生产日期（跨3列） -->
         <div class="info-grid-item label-cell">生产日期</div>
         <div class="info-grid-item value-cell">
-          <input type="text" class="nob" :value="parseTime(content.updateTime, '{y}-{m}-{d}')" />
+          <div class="nob">{{ parseTime(content.updateTime, '{y}-{m}-{d}') || '' }}</div>
         </div>
       </div>
 
diff --git a/klp-ui/src/views/wms/coil/panels/LabelRender/GalvanizedTag.vue b/klp-ui/src/views/wms/coil/panels/LabelRender/GalvanizedTag.vue
index 2eb6f316..c63f92ce 100644
--- a/klp-ui/src/views/wms/coil/panels/LabelRender/GalvanizedTag.vue
+++ b/klp-ui/src/views/wms/coil/panels/LabelRender/GalvanizedTag.vue
@@ -19,89 +19,91 @@
         <!-- 第一行：订货单位 + 合同号 -->
         <div class="info-grid-item label-cell">订货单位</div>
         <div class="info-grid-item value-cell">
-          <input type="text" class="nob" :value="content.orderUnit || ''" />
+          <!-- <input type="text" class="nob" :value="content.orderUnit || ''" /> -->
+          <div class="nob">{{ content.orderUnit || '' }}</div>
         </div>
         <div class="info-grid-item label-cell">合同号</div>
         <div class="info-grid-item value-cell">
-          <input type="text" class="nob" :value="content.contractNumber || ''" />
+          <div class="nob">{{ content.contractNumber || '' }}</div>
         </div>
 
         <!-- 第二行：执行标准 + 钢卷号 -->
         <div class="info-grid-item label-cell">产品名称</div>
         <div class="info-grid-item value-cell">
-          <input type="text" class="nob" :value="content.itemName || ''" />
+          <div class="nob">{{ content.itemName || '' }}</div>
         </div>
         <div class="info-grid-item label-cell">执行标准</div>
         <div class="info-grid-item value-cell">
-          <input type="text" class="nob" :value="content.executionStandard || ''" />
+          <div class="nob">{{ content.executionStandard || '' }}</div>
         </div>
         <div class="info-grid-item label-cell">钢卷号</div>
         <div class="info-grid-item value-cell">
-          <input type="text" class="nob" :value="content.currentCoilNo || ''" />
+          <div class="nob">{{ content.currentCoilNo || '' }}</div>
         </div>
 
         <!-- 第三行：原料卷号 + 规格 -->
         <div class="info-grid-item label-cell">原料卷号</div>
         <div class="info-grid-item value-cell">
-          <input type="text" class="nob" :value="content.enterCoilNo || ''" />
+          <div class="nob">{{ content.enterCoilNo || '' }}</div>
         </div>
         <div class="info-grid-item label-cell">规格</div>
         <div class="info-grid-item value-cell">
-          <input type="text" class="nob" :value="content.specification || ''" />
+          <div class="nob">{{ content.specification || '' }}</div>
         </div>
 
         <!-- 第四行：材质 + 表面质量 -->
         <div class="info-grid-item label-cell">材质</div>
         <div class="info-grid-item value-cell">
-          <input type="text" class="nob" :value="materialWithManufacturer || ''" />
+          <div class="nob">{{ content.materialWithManufacturer || '' }}</div>
         </div>
         <div class="info-grid-item label-cell">镀层种类</div>
         <div class="info-grid-item value-cell">
-          <input type="text" class="nob" :value="content.coatingType || ''" />
+          <div class="nob">{{ content.coatingType || '' }}</div>
         </div>
         <div class="info-grid-item label-cell">锌层质量</div>
         <div class="info-grid-item value-cell">
-          <input type="text" class="nob" :value="content.zincLayer || ''" />
+          <div class="nob">{{ content.zincLayer || '' }}</div>
         </div>
         <div class="info-grid-item label-cell">质量状态</div>
         <div class="info-grid-item value-cell">
-          <input type="text" class="nob" :value="content.qualityStatus || ''" />
+          <div class="nob">{{ content.qualityStatus || '' }}</div>
         </div>
 
         <!-- 第五行：表面处理 + 剪切要求 -->
         <div class="info-grid-item label-cell">表面处理</div>
         <div class="info-grid-item value-cell">
-          <input type="text" class="nob" :value="content.surfaceTreatmentDesc || ''" />
+          <div class="nob">{{ content.surfaceTreatmentDesc || '' }}</div>
         </div>
         <div class="info-grid-item label-cell">切边要求</div>
         <div class="info-grid-item value-cell">
-          <input type="text" class="nob" :value="content.trimmingRequirement || ''" />
+          <div class="nob">{{ content.trimmingRequirement || '' }}</div>
         </div>
 
         <!-- 第六行：包装种类 + 毛重 -->
         <div class="info-grid-item label-cell">包装要求</div>
         <div class="info-grid-item value-cell">
-          <input type="text" class="nob" :value="content.packagingRequirement || ''" />
+          <div class="nob">{{ content.packagingRequirement || '' }}</div>
         </div>
         <div class="info-grid-item label-cell">毛重</div>
         <div class="info-grid-item value-cell">
-          <input type="text" class="nob" :value="content.grossWeight || ''" />
+          <div class="nob">{{ content.grossWeight || '' }}</div>
         </div>
 
         <!-- 第七行：净重 + 参考长度 -->
         <div class="info-grid-item label-cell">净重</div>
         <div class="info-grid-item value-cell">
-          <input type="text" class="nob" :value="content.netWeight || ''" />
+          <div class="nob">{{ content.netWeight || '' }}</div>
         </div>
         <div class="info-grid-item label-cell">参考长度</div>
         <div class="info-grid-item value-cell">
-          <input type="text" class="nob" :value="content.length || ''" />
+          <div class="nob">{{ content.length || '' }}</div>
         </div>
 
         <!-- 第八行：生产日期（跨3列） -->
         <div class="info-grid-item label-cell">生产日期</div>
         <div class="info-grid-item value-cell">
-          <input type="text" class="nob" :value="parseTime(content.updateTime, '{y}-{m}-{d}')" />
+          <div>{{ parseTime(content.updateTime, '{y}-{m}-{d}') }}</div>
+          <!-- <input type="text" class="nob" :value=" /> -->
         </div>
       </div>
 
diff --git a/klp-ui/src/views/wms/coil/panels/LabelRender/MaterialTag.vue b/klp-ui/src/views/wms/coil/panels/LabelRender/MaterialTag.vue
index d7384576..02dc8909 100644
--- a/klp-ui/src/views/wms/coil/panels/LabelRender/MaterialTag.vue
+++ b/klp-ui/src/views/wms/coil/panels/LabelRender/MaterialTag.vue
@@ -96,11 +96,13 @@
       <tr>
         <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.specification || ''" />
+          <div class="nob">{{ content.specification || '' }}</div>
+          <!-- <input type="text" class="nob" :value="content.specification || ''" /> -->
         </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.team || ''" />
+          <div class="nob">{{ content.team || '' }}</div>
+          <!-- <input type="text" class="nob" :value="content.team || ''" /> -->
         </td>
       </tr>
       <!-- <tr>
@@ -118,23 +120,26 @@
       <tr>
         <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 || ''" />
+          <div class="nob">{{ content.netWeight || '' }}</div>
+          <!-- <input type="text" class="nob" :value="content.netWeight || ''" /> -->
         </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.material || ''" />
+          <div class="nob">{{ content.material || '' }}</div>
+          <!-- <input type="text" class="nob" :value="content.material || ''" /> -->
         </td>
       </tr>
       <tr>
         <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 || ''" />
+          <!-- <input type="text" class="nob" :value="content.updateTime || ''" /> -->
+          <div class="nob">{{ content.updateTime || '' }}</div>
         </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 || ''" />
+          <!-- <input type="text" class="nob" :value="content.nextProcess || ''" /> -->
+          <div class="nob">{{ content.nextProcess || '' }}</div>
         </td>
-
       </tr>
     </table>
   </div>
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 1effb3cf..bd71f9d0 100644
--- a/klp-ui/src/views/wms/coil/panels/LabelRender/OuterTagPreview.vue
+++ b/klp-ui/src/views/wms/coil/panels/LabelRender/OuterTagPreview.vue
@@ -19,81 +19,97 @@
         <!-- 第一行：订货单位 + 合同号 -->
         <div class="info-grid-item label-cell">订货单位</div>
         <div class="info-grid-item value-cell">
-          <input type="text" class="nob" :value="content.orderUnit || ''" />
+          <div class="nob">{{ content.orderUnit || '' }}</div>
+          <!-- <input type="text" class="nob" :value="content.orderUnit || ''" /> -->
         </div>
         <div class="info-grid-item label-cell">合同号</div>
         <div class="info-grid-item value-cell">
-          <input type="text" class="nob" :value="content.contractNumber || ''" />
+          <div class="nob">{{ content.contractNumber || '' }}</div>
+          <!-- <input type="text" class="nob" :value="content.contractNumber || ''" /> -->
         </div>
 
         <!-- 第二行：执行标准 + 钢卷号 -->
         <div class="info-grid-item label-cell">产品名称</div>
         <div class="info-grid-item value-cell">
-          <input type="text" class="nob" :value="content.itemName || ''" />
+          <div class="nob">{{ content.itemName || '' }}</div>
+          <!-- <input type="text" class="nob" :value="content.itemName || ''" /> -->
         </div>
         <div class="info-grid-item label-cell">执行标准</div>
         <div class="info-grid-item value-cell">
-          <input type="text" class="nob" :value="content.executionStandard || ''" />
+          <div class="nob">{{ content.executionStandard || '' }}</div>
+          <!-- <input type="text" class="nob" :value="content.executionStandard || ''" /> -->
         </div>
         <div class="info-grid-item label-cell">钢卷号</div>
         <div class="info-grid-item value-cell">
-          <input type="text" class="nob" :value="content.currentCoilNo || ''" />
+          <div class="nob">{{ content.currentCoilNo || '' }}</div>
+          <!-- <input type="text" class="nob" :value="content.currentCoilNo || ''" /> -->
         </div>
 
         <!-- 第三行：原料卷号 + 规格 -->
         <div class="info-grid-item label-cell">原料卷号</div>
         <div class="info-grid-item value-cell">
-          <input type="text" class="nob" :value="content.enterCoilNo || ''" />
+          <div class="nob">{{ content.enterCoilNo || '' }}</div>
+          <!-- <input type="text" class="nob" :value="content.enterCoilNo || ''" /> -->
         </div>
         <div class="info-grid-item label-cell">规格</div>
         <div class="info-grid-item value-cell">
-          <input type="text" class="nob" :value="content.specification || ''" />
+          <div class="nob">{{ content.specification || '' }}</div>
+          <!-- <input type="text" class="nob" :value="content.specification || ''" /> -->
         </div>
 
         <!-- 第四行：材质 + 表面质量 -->
         <div class="info-grid-item label-cell">材质</div>
         <div class="info-grid-item value-cell">
-          <input type="text" class="nob" :value="materialWithManufacturer || ''" />
+          <div class="nob">{{ content.materialWithManufacturer || '' }}</div>
+          <!-- <input type="text" class="nob" :value="content.materialWithManufacturer || ''" /> -->
         </div>
         <div class="info-grid-item label-cell">质量要求</div>
         <div class="info-grid-item value-cell">
-          <input type="text" class="nob" :value="content.qualityStatus || ''" />
+          <div class="nob">{{ content.qualityStatus || '' }}</div>
+          <!-- <input type="text" class="" :value="content.qualityStatus || ''" /> -->
         </div>
 
         <!-- 第五行：表面处理 + 剪切要求 -->
         <div class="info-grid-item label-cell">表面处理</div>
         <div class="info-grid-item value-cell">
-          <input type="text" class="nob" :value="content.surfaceTreatmentDesc || ''" />
+          <div class="nob">{{ content.surfaceTreatmentDesc || '' }}</div>
+          <!-- <input type="text" class="nob" :value="content.surfaceTreatmentDesc || ''" /> -->
         </div>
         <div class="info-grid-item label-cell">切边要求</div>
         <div class="info-grid-item value-cell">
-          <input type="text" class="nob" :value="content.trimmingRequirement || ''" />
+          <div class="nob">{{ content.trimmingRequirement || '' }}</div>
+          <!-- <input type="text" class="nob" :value="content.trimmingRequirement || ''" /> -->
         </div>
 
         <!-- 第六行：包装种类 + 毛重 -->
         <div class="info-grid-item label-cell">包装要求</div>
         <div class="info-grid-item value-cell">
-          <input type="text" class="nob" :value="content.packagingRequirement || ''" />
+          <div class="nob">{{ content.packagingRequirement || '' }}</div>
+          <!-- <input type="text" class="nob" :value="content.packagingRequirement || ''" /> -->
         </div>
         <div class="info-grid-item label-cell">毛重</div>
         <div class="info-grid-item value-cell">
-          <input type="text" class="nob" :value="content.grossWeight || ''" />
+          <div class="nob">{{ content.grossWeight || '' }}</div>
+          <!-- <input type="text" class="nob" :value="content.grossWeight || ''" /> -->
         </div>
 
         <!-- 第七行：净重 + 参考长度 -->
         <div class="info-grid-item label-cell">净重</div>
         <div class="info-grid-item value-cell">
-          <input type="text" class="nob" :value="content.netWeight || ''" />
+          <div class="nob">{{ content.netWeight || '' }}</div>
+          <!-- <input type="text" class="nob" :value="content.netWeight || ''" /> -->
         </div>
         <div class="info-grid-item label-cell">参考长度</div>
         <div class="info-grid-item value-cell">
-          <input type="text" class="nob" :value="content.length || ''" />
+          <div class="nob">{{ content.length || '' }}</div>
+          <!-- <input type="text" class="nob" :value="content.length || ''" /> -->
         </div>
 
         <!-- 第八行：生产日期（跨3列） -->
         <div class="info-grid-item label-cell">生产日期</div>
         <div class="info-grid-item value-cell">
-          <input type="text" class="nob" :value="parseTime(content.updateTime, '{y}-{m}-{d}')" />
+          <div class="nob">{{ parseTime(content.updateTime, '{y}-{m}-{d}') || '' }}</div>
+          <!-- <input type="text" class="nob" :value="parseTime(content.updateTime, '{y}-{m}-{d}')" /> -->
         </div>
       </div>
 
diff --git a/klp-ui/src/views/wms/coil/panels/LabelRender/TuoZhiTag.vue b/klp-ui/src/views/wms/coil/panels/LabelRender/TuoZhiTag.vue
index 44411cc1..80515cd3 100644
--- a/klp-ui/src/views/wms/coil/panels/LabelRender/TuoZhiTag.vue
+++ b/klp-ui/src/views/wms/coil/panels/LabelRender/TuoZhiTag.vue
@@ -7,47 +7,47 @@
       <!-- 第一行：冷卷号、热卷号 -->
       <div class="grid-cell label-cell">冷卷号</div>
       <div class="grid-cell value-cell">
-        <div class="nob" contenteditable>{{ content.currentCoilNo || '' }}</div>
+        <div class="nob">{{ content.currentCoilNo || '' }}</div>
       </div>
       <div class="grid-cell label-cell">热卷号</div>
       <div class="grid-cell value-cell">
-        <div class="nob" contenteditable>{{ content.enterCoilNo || '' }}</div>
+        <div class="nob">{{ content.enterCoilNo || '' }}</div>
       </div>
       
       <!-- 第二行：规格、钢种 -->
       <div class="grid-cell label-cell">规格</div>
       <div class="grid-cell value-cell">
-        <div class="nob" contenteditable>{{ content.specification || '' }}</div>
+        <div class="nob">{{ content.specification || '' }}</div>
       </div>
       <div class="grid-cell label-cell">钢种</div>
       <div class="grid-cell value-cell">
-        <div class="nob" contenteditable>{{ content.material || '' }}</div>
+        <div class="nob">{{ content.material || '' }}</div>
       </div>
       
       <!-- 第三行：净重、下工序 -->
       <div class="grid-cell label-cell">净重</div>
       <div class="grid-cell value-cell">
-        <div class="nob" contenteditable>{{ content.netWeight || '' }}</div>
+        <div class="nob">{{ content.netWeight || '' }}</div>
       </div>
       <div class="grid-cell label-cell">下工序</div>
       <div class="grid-cell value-cell">
-        <div class="nob" contenteditable>{{ content.nextProcess || '冷轧' }}</div>
+        <div class="nob">{{ content.nextProcess || '冷轧' }}</div>
       </div>
       
       <!-- 第四行：包装要求、切边要求 -->
       <div class="grid-cell label-cell">包装要求</div>
       <div class="grid-cell value-cell">
-        <div class="nob" contenteditable>{{ content.packagingRequirement || '' }}</div>
+        <div class="nob">{{ content.packagingRequirement || '' }}</div>
       </div>
       <div class="grid-cell label-cell">切边要求</div>
       <div class="grid-cell value-cell">
-        <div class="nob" contenteditable>{{ content.trimmingRequirement || '' }}</div>
+        <div class="nob">{{ content.trimmingRequirement || '' }}</div>
       </div>
       
       <!-- 第五行：班组、代码（二维码） -->
       <div class="grid-cell label-cell">班组</div>
       <div class="grid-cell value-cell">
-        <div class="nob" contenteditable>{{ content.team || '' }}</div>
+        <div class="nob">{{ content.team || '' }}</div>
       </div>
       <div class="grid-cell label-cell">代码</div>
       <div class="grid-cell qrcode-cell">
@@ -58,7 +58,7 @@
       <!-- 第六行：生产日期 -->
       <div class="grid-cell label-cell">生产日期</div>
       <div class="grid-cell value-cell date-cell">
-        <div class="nob" contenteditable>{{ content.createTime || '' }}</div>
+        <div class="nob">{{ content.createTime || '' }}</div>
       </div>
     </div>
   </div>
diff --git a/klp-ui/src/views/wms/coil/panels/LabelRender/WhereTag.vue b/klp-ui/src/views/wms/coil/panels/LabelRender/WhereTag.vue
index 372d849e..0242ba6a 100644
--- a/klp-ui/src/views/wms/coil/panels/LabelRender/WhereTag.vue
+++ b/klp-ui/src/views/wms/coil/panels/LabelRender/WhereTag.vue
@@ -4,51 +4,51 @@
       <tr>
         <td class="label-cell" style="width: 16.67%; padding: 4px;">卷号</td>
         <td class="value-cell" colspan="2" style="width: 33.33%; padding: 4px;">
-          <div class="nob" contenteditable>{{ content.currentCoilNo || '' }}</div>
+          <div class="nob">{{ content.currentCoilNo || '' }}</div>
         </td>
         <td class="label-cell" style="width: 16.67%; padding: 4px;">来源</td>
         <td class="value-cell" colspan="2" style="width: 33.33%; padding: 4px;">
-          <div class="nob" contenteditable>{{ content.warehouseName || '' }}</div>
+          <div class="nob">{{ content.warehouseName || '' }}</div>
         </td>
       </tr>
       <tr>
         <td class="label-cell" style="width: 16.67%; padding: 4px;">班组</td>
         <td class="value-cell" colspan="2" style="width: 33.33%; padding: 4px;">
-          <div class="nob" contenteditable>{{ content.team || '' }}</div>
+          <div class="nob">{{ content.team || '' }}</div>
         </td>
         <td class="label-cell" style="width: 16.67%; padding: 4px;">净重</td>
         <td class="value-cell" colspan="2" style="width: 33.33%; padding: 4px;">
-          <div class="nob" contenteditable>{{ content.netWeight || '' }}</div>
+          <div class="nob">{{ content.netWeight || '' }}</div>
         </td>
       </tr>
       <tr>
         <td class="label-cell" style="width: 16.67%; padding: 4px;">规格</td>
         <td class="value-cell" colspan="2" style="width: 33.33%; padding: 4px;">
-          <div class="nob" contenteditable>{{ content.specification || '' }}</div>
+          <div class="nob">{{ content.specification || '' }}</div>
         </td>
         <td class="label-cell" style="width: 16.67%; padding: 4px;">材质</td>
         <td class="value-cell" colspan="2" style="width: 33.33%; padding: 4px;">
-          <div class="nob" contenteditable>{{ content.material || '' }}</div>
+          <div class="nob">{{ content.material || '' }}</div>
         </td>
       </tr>
        <tr>
         <td class="label-cell" style="width: 16.67%; padding: 4px;">卷名</td>
         <td class="value-cell" colspan="2" style="width: 33.33%; padding: 4px;">
-          <div class="nob" contenteditable>{{ content.itemName || '' }}</div>
+          <div class="nob">{{ content.itemName || '' }}</div>
         </td>
         <td class="label-cell" style="width: 16.67%; padding: 4px;">厂家</td>
         <td class="value-cell" colspan="2" style="width: 33.33%; padding: 4px;">
-          <div class="nob" contenteditable>{{ content.manufacturer || '' }}</div>
+          <div class="nob">{{ content.manufacturer || '' }}</div>
         </td>
       </tr>
       <tr>
         <td class="label-cell" style="width: 16.67%; padding: 4px;">时间</td>
         <td class="value-cell" colspan="2" style="width: 33.33%; padding: 4px;">
-          <div class="nob" contenteditable>{{ content.updateTime || '' }}</div>
+          <div class="nob">{{ content.updateTime || '' }}</div>
         </td>
         <td class="label-cell" style="width: 16.67%; padding: 4px;">去向</td>
         <td class="value-cell" colspan="2" style="width: 33.33%; padding: 4px;">
-          <div class="nob" contenteditable>{{ content.nextWarehouseName || '' }}</div>
+          <div class="nob">{{ content.nextWarehouseName || '' }}</div>
         </td>
       </tr>
     </table>
diff --git a/klp-ui/src/views/wms/coil/panels/LabelRender/ZincRawTag.vue b/klp-ui/src/views/wms/coil/panels/LabelRender/ZincRawTag.vue
index 90da999d..f61439ad 100644
--- a/klp-ui/src/views/wms/coil/panels/LabelRender/ZincRawTag.vue
+++ b/klp-ui/src/views/wms/coil/panels/LabelRender/ZincRawTag.vue
@@ -7,47 +7,47 @@
       <!-- 第一行：冷卷号、热卷号 -->
       <div class="grid-cell label-cell">冷卷号</div>
       <div class="grid-cell value-cell">
-        <div class="nob" contenteditable>{{ content.currentCoilNo || '' }}</div>
+        <div class="nob">{{ content.currentCoilNo || '' }}</div>
       </div>
       <div class="grid-cell label-cell">热卷号</div>
       <div class="grid-cell value-cell">
-        <div class="nob" contenteditable>{{ content.enterCoilNo || '' }}</div>
+        <div class="nob">{{ content.enterCoilNo || '' }}</div>
       </div>
       
       <!-- 第二行：规格、钢种 -->
       <div class="grid-cell label-cell">规格</div>
       <div class="grid-cell value-cell">
-        <div class="nob" contenteditable>{{ content.specification || '' }}</div>
+        <div class="nob">{{ content.specification || '' }}</div>
       </div>
       <div class="grid-cell label-cell">钢种</div>
       <div class="grid-cell value-cell">
-        <div class="nob" contenteditable>{{ content.material || '' }}</div>
+        <div class="nob">{{ content.material || '' }}</div>
       </div>
       
       <!-- 第三行：净重、下工序 -->
       <div class="grid-cell label-cell">净重</div>
       <div class="grid-cell value-cell">
-        <div class="nob" contenteditable>{{ content.netWeight || '' }}</div>
+        <div class="nob">{{ content.netWeight || '' }}</div>
       </div>
       <div class="grid-cell label-cell">下工序</div>
       <div class="grid-cell value-cell">
-        <div class="nob" contenteditable>{{ content.nextProcess || '镀锌卷' }}</div>
+        <div class="nob">{{ content.nextProcess || '镀锌卷' }}</div>
       </div>
       
       <!-- 第四行：包装要求、切边要求 -->
       <div class="grid-cell label-cell">包装要求</div>
       <div class="grid-cell value-cell">
-        <div class="nob" contenteditable>{{ content.packagingRequirement || '' }}</div>
+        <div class="nob">{{ content.packagingRequirement || '' }}</div>
       </div>
       <div class="grid-cell label-cell">切边要求</div>
       <div class="grid-cell value-cell">
-        <div class="nob" contenteditable>{{ content.trimmingRequirement || '' }}</div>
+        <div class="nob">{{ content.trimmingRequirement || '' }}</div>
       </div>
       
       <!-- 第五行：班组、代码（二维码） -->
       <div class="grid-cell label-cell">班组</div>
       <div class="grid-cell value-cell">
-        <div class="nob" contenteditable>{{ content.team || '' }}</div>
+        <div class="nob">{{ content.team || '' }}</div>
       </div>
       <div class="grid-cell label-cell">代码</div>
       <div class="grid-cell qrcode-cell">
@@ -58,7 +58,7 @@
       <!-- 第六行：生产日期 -->
       <div class="grid-cell label-cell">生产日期</div>
       <div class="grid-cell value-cell date-cell">
-        <div class="nob" contenteditable>{{ content.createTime || '' }}</div>
+        <div class="nob">{{ content.createTime || '' }}</div>
       </div>
     </div>
   </div>
diff --git a/klp-ui/src/views/wms/coil/panels/base.vue b/klp-ui/src/views/wms/coil/panels/base.vue
index 2a4cb9cd..08547b9f 100644
--- a/klp-ui/src/views/wms/coil/panels/base.vue
+++ b/klp-ui/src/views/wms/coil/panels/base.vue
@@ -59,10 +59,10 @@
       <!-- <el-col :span="1.5">
         <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd">新增</el-button>
       </el-col> -->
-      <!-- <el-col :span="1.5">
+      <el-col :span="1.5">
         <el-button type="success" plain icon="el-icon-edit" size="mini" :disabled="single"
           @click="handleCheck">修正</el-button>
-      </el-col> -->
+      </el-col>
       <!-- <el-col :span="1.5">
         <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple"
           @click="handleDelete">删除</el-button>
@@ -281,8 +281,8 @@
             @click="handleReturnCoil(scope.row)">
             退货钢卷
           </el-button>
-          <!-- <el-button size="mini" type="text" icon="el-icon-edit" @click="handleCheck(scope.row)"
-            v-if="showControl">修正</el-button> -->
+          <el-button size="mini" type="text" icon="el-icon-edit" @click="handleCheck(scope.row)"
+            v-if="showControl">修正</el-button>
           <el-button size="mini" type="text" icon="el-icon-search" @click="handleTrace(scope.row)">追溯</el-button>
         </template>
       </el-table-column>
@@ -329,12 +329,12 @@
             style="width: 100%;" clearable />
           <div v-else>请先选择材料类型</div>
         </el-form-item>
-        <el-form-item label="质量状态" prop="qualityStatus">
+        <!-- <el-form-item label="质量状态" prop="qualityStatus">
           <el-select v-model="form.qualityStatus" placeholder="请选择质量状态" style="width: 100%">
             <el-option v-for="item in dict.type.coil_quality_status" :key="item.value" :label="item.label"
               :value="item.value" />
           </el-select>
-        </el-form-item>
+        </el-form-item> -->
 
         <el-form-item label="切边要求" prop="trimmingRequirement">
           <el-select v-model="form.trimmingRequirement" placeholder="请选择切边要求" style="width: 100%">
diff --git a/klp-ui/src/views/wms/coil/panels/stepSplit.vue b/klp-ui/src/views/wms/coil/panels/stepSplit.vue
index 42caddbb..b02b8b27 100644
--- a/klp-ui/src/views/wms/coil/panels/stepSplit.vue
+++ b/klp-ui/src/views/wms/coil/panels/stepSplit.vue
@@ -66,6 +66,9 @@
               </template>
             </el-table-column>
           </el-table>
+
+          <!-- <el-descriptions :column="1" border title="二级数据" v-if="showSplitForm"></el-descriptions>
+          <el-table v-if="showSplitForm"></el-table> -->
         </div>
       </el-col>
 
diff --git a/klp-ui/src/views/wms/report/merge/index.vue b/klp-ui/src/views/wms/report/merge/index.vue
index ecb4dd29..78334400 100644
--- a/klp-ui/src/views/wms/report/merge/index.vue
+++ b/klp-ui/src/views/wms/report/merge/index.vue
@@ -66,7 +66,7 @@
     </el-descriptions>
 
      <!-- 已处理M统计信息 -->
-    <el-descriptions title="已处理M统计信息" :column="3" border>
+    <!-- <el-descriptions title="已处理M统计信息" :column="3" border>
       <el-descriptions-item label="产出数量">{{ mSummary.outCount }}</el-descriptions-item>
       <el-descriptions-item label="产出总重">{{ mSummary.outTotalWeight }}t</el-descriptions-item>
       <el-descriptions-item label="产出均重">{{ mSummary.outAvgWeight }}t</el-descriptions-item>
@@ -79,14 +79,11 @@
       <el-descriptions-item label="合计总重">{{ mSummary.totalWeight }}t</el-descriptions-item>
       <el-descriptions-item label="合计均重">{{ mSummary.totalAvgWeight }}t</el-descriptions-item>
 
-      <!-- 成品率 -->
       <el-descriptions-item label="成品率">{{ mSummary.passRate }}</el-descriptions-item>
       <el-descriptions-item label="损耗率">{{ mSummary.lossRate }}</el-descriptions-item>
-      <!-- 异常率 -->
       <el-descriptions-item label="异常率">{{ mSummary.abRate }}</el-descriptions-item>
-      <!-- 正品率 -->
       <el-descriptions-item label="正品率">{{ mSummary.passRate2 }}</el-descriptions-item>
-    </el-descriptions>
+    </el-descriptions> -->
 
     <el-descriptions title="明细信息" :column="3" border>
     </el-descriptions>
@@ -216,9 +213,9 @@ export default {
     summary() {
       return calcSummary(this.outList, this.lossList)
     },
-    mSummary() {
-      return calcMSummary(this.outList, this.lossList)
-    },
+    // mSummary() {
+    //   return calcMSummary(this.outList, this.lossList)
+    // },
   },
   created() {
     this.handleQuery()