From 396b3de4c4d183deb113921d3cccb74689e86c42 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A0=82=E7=B3=96?= <qq2178503051@163.com>
Date: Tue, 13 Jan 2026 15:44:21 +0800
Subject: [PATCH] =?UTF-8?q?fix(wms):=20=E4=BF=AE=E5=A4=8D=E6=A0=87?=
 =?UTF-8?q?=E7=AD=BE=E9=A2=84=E8=A7=88=E4=B8=ADlabelType=E6=9C=AA=E6=AD=A3?=
 =?UTF-8?q?=E7=A1=AE=E8=AE=BE=E7=BD=AE=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

将labelType从组件属性改为使用labelRender.type，确保标签类型根据物料类型正确设置
---
 klp-ui/src/views/wms/coil/panels/base.vue | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/klp-ui/src/views/wms/coil/panels/base.vue b/klp-ui/src/views/wms/coil/panels/base.vue
index 3fc4b54a..ae6fe9a3 100644
--- a/klp-ui/src/views/wms/coil/panels/base.vue
+++ b/klp-ui/src/views/wms/coil/panels/base.vue
@@ -251,10 +251,10 @@
 
     <!-- 标签预览弹窗 -->
     <el-dialog title="标签预览" :visible.sync="labelRender.visible" append-to-body>
-      <label-render :content="labelRender.data" :labelType="labelType" />
+      <label-render :content="labelRender.data" :labelType="labelRender.type" />
     </el-dialog>
 
-    <label-render ref="labelRender" v-show="false" :content="labelRender.data" :labelType="labelType" />
+    <label-render ref="labelRender" v-show="false" :content="labelRender.data" :labelType="labelRender.type" />
 
     <!-- 批量导出标签PDF弹窗 -->
     <el-dialog title="批量导出标签PDF" :visible.sync="batchPrint.visible" width="520px" append-to-body>
@@ -582,15 +582,13 @@ export default {
       const item = row.itemType === 'product' ? row.product : row.rawMaterial;
       const itemName = row.itemType === 'product' ? item?.productName || '' : item?.rawMaterialName || '';
 
+      this.labelRender.type = row.itemType === 'product' ? '3' : '2';
       this.labelRender.data = {
         ...row,
         itemName: itemName,
         updateTime: row.updateTime?.split(' ')[0] || '',
       };
       this.$refs.labelRender.printLabel();
-      // this.labelRender.visible = true;
-      // this.labelRender.data = row;
-      // this.labelRender.type = '2';
     },
     // 处理材料类型变化
     handleMaterialTypeChange(value) {
@@ -661,6 +659,7 @@ export default {
       const item = row.itemType === 'product' ? row.product : row.rawMaterial;
       const itemName = row.itemType === 'product' ? item?.productName || '' : item?.rawMaterialName || '';
 
+      this.labelRender.type = row.itemType === 'product' ? '3' : '2';
       this.labelRender.data = {
         ...row,
         itemName: itemName,