From f389576c92b4830be717c8116cad4fbe47448287 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A0=82=E7=B3=96?= <qq2178503051@163.com>
Date: Mon, 9 Mar 2026 13:24:16 +0800
Subject: [PATCH] =?UTF-8?q?feat(=E6=A0=87=E7=AD=BE=E6=89=93=E5=8D=B0):=20?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=95=80=E9=94=8C=E5=8E=9F=E6=96=99=E6=A0=87?=
 =?UTF-8?q?=E7=AD=BE=E7=B1=BB=E5=9E=8B=E5=B9=B6=E4=BC=98=E5=8C=96=E6=A0=87?=
 =?UTF-8?q?=E7=AD=BE=E9=80=89=E6=8B=A9=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在LabelRender组件中新增类型5的标签尺寸配置
- 修改ZincRawTag组件中下工序默认值为'镀锌卷'
- 在do.vue中新增标签尺寸映射并实现根据物料类型和仓库自动选择标签类型
---
 .../coil/panels/LabelRender/ZincRawTag.vue    |  2 +-
 .../wms/coil/panels/LabelRender/index.vue     |  4 ++
 klp-ui/src/views/wms/coil/panels/do.vue       | 47 +++++++++++++++++--
 3 files changed, 47 insertions(+), 6 deletions(-)

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 ba5277da..d8c78ee0 100644
--- a/klp-ui/src/views/wms/coil/panels/LabelRender/ZincRawTag.vue
+++ b/klp-ui/src/views/wms/coil/panels/LabelRender/ZincRawTag.vue
@@ -31,7 +31,7 @@
       </div>
       <div class="grid-cell label-cell">下工序</div>
       <div class="grid-cell value-cell">
-        <div class="nob" contenteditable>{{ content.nextProcess || '冷硬卷' }}</div>
+        <div class="nob" contenteditable>{{ content.nextProcess || '镀锌卷' }}</div>
       </div>
       
       <!-- 第四行：包装要求、切边要求 -->
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 e57329f7..fbdee04c 100644
--- a/klp-ui/src/views/wms/coil/panels/LabelRender/index.vue
+++ b/klp-ui/src/views/wms/coil/panels/LabelRender/index.vue
@@ -91,6 +91,10 @@ export default {
           width: 100,
           height: 80,
         },
+        '5': {
+          width: 180,
+          height: 100,
+        },
       }
     }
   },
diff --git a/klp-ui/src/views/wms/coil/panels/do.vue b/klp-ui/src/views/wms/coil/panels/do.vue
index b7217e23..d5e00823 100644
--- a/klp-ui/src/views/wms/coil/panels/do.vue
+++ b/klp-ui/src/views/wms/coil/panels/do.vue
@@ -246,8 +246,7 @@
                 <div class="info-item">
                   <span class="info-label">品名：</span>
                   <span class="info-value">
-                    <el-popover placement="top" width="280" trigger="hover"
-                      popper-class="material-params-popover">
+                    <el-popover placement="top" width="280" trigger="hover" popper-class="material-params-popover">
                       <div class="material-params-content">
                         <div class="params-list">
                           <div class="param-item">
@@ -273,7 +272,7 @@
                               <span class="param-value">{{ item.manufacturer }}</span>
                             </div>
                           </div>
-                      
+
                         </div>
                       </div>
                       <span slot="reference" style="cursor: pointer; color: #2bf;">{{ item.itemName || '—' }}</span>
@@ -552,6 +551,28 @@ export default {
         defectCode: null,
         degree: null,
         remark: null
+      },
+       tagSizeMap: {
+        '2': {
+          width: 100,
+          height: 80,
+        },
+        '3': {
+          width: 180,
+          height: 100,
+        },
+        '4': {
+          width: 180,
+          height: 100,
+        },
+        'where': {
+          width: 100,
+          height: 80,
+        },
+        '5': {
+          width: 180,
+          height: 100,
+        },
       },
       stepSpilt: {
         list: [],
@@ -633,8 +654,24 @@ export default {
     handlePrintLabel(row) {
       const item = row.itemType === 'product' ? row.product : row.rawMaterial;
       const itemName = row.itemType === 'product' ? item?.productName || '' : item?.rawMaterialName || '';
-
-      this.labelRender.type = row.itemType === 'product' ? '3' : '2'
+      const itemType = row.itemType || '';
+      const warehouseId = row.warehouseId || '';
+      // 在镀锌颜料库的卷使用镀锌原料标签
+      if (itemType == 'raw_material' && warehouseId == '1988150263284953089') {
+        this.labelRender.type = '5';
+      } else if (itemType == 'raw_material') {
+        this.labelRender.type = '2';
+      } else if (itemType == 'product' && itemName == '冷硬卷') {
+        this.labelRender.type = '3';
+      } else if (itemType == 'product' && itemName == '热轧卷板') {
+        this.labelRender.type = '3';
+      } else if (itemType == 'product' && itemName == '镀锌卷') {
+        this.labelRender.type = '4';
+      } else if (itemType == 'product' && itemName == '冷轧卷') {
+        this.labelRender.type = '3';
+      } else {
+        this.labelRender.type = '3';
+      }
       this.labelRender.data = {
         ...row,
         itemName: itemName,