From 3f4ee0fce38242aeacf771ecfa482f37902b5e7a 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 16:33:52 +0800
Subject: [PATCH] =?UTF-8?q?fix(wms):=20=E6=9B=B4=E6=96=B0=E9=95=80?=
 =?UTF-8?q?=E9=94=8C=E5=8E=9F=E6=96=99=E6=A0=87=E7=AD=BE=E5=88=A4=E6=96=AD?=
 =?UTF-8?q?=E9=80=BB=E8=BE=91=E5=B9=B6=E8=B0=83=E6=95=B4=E6=A0=87=E7=AD=BE?=
 =?UTF-8?q?=E5=B0=BA=E5=AF=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

修改多个文件中的镀锌原料仓库判断条件，增加新的仓库ID支持
调整DuGeTag.vue中标签的高度为100mm
更新base.vue中的标签类型判断逻辑，增加更多产品类型处理
修正DuGeTag.vue中的联系电话信息
---
 .../wms/coil/panels/LabelRender/DuGeTag.vue   |  2 +-
 .../wms/coil/panels/LabelRender/index.vue     |  4 +--
 klp-ui/src/views/wms/coil/panels/base.vue     | 25 ++++++++++++++++---
 klp-ui/src/views/wms/coil/panels/do.vue       |  2 +-
 4 files changed, 26 insertions(+), 7 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 c05b45fe..766c2365 100644
--- a/klp-ui/src/views/wms/coil/panels/LabelRender/DuGeTag.vue
+++ b/klp-ui/src/views/wms/coil/panels/LabelRender/DuGeTag.vue
@@ -114,7 +114,7 @@
             Jiaxiang County,Jining City,Shandong Province</span>
           <br />
           <span>
-            TEL：0537-6625068 0537-6625067
+            TEL：1905-3728822 1905-3728835
           </span>
         </div>
         <div class="contact-timestamp">
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 cada81b4..e66a6a5d 100644
--- a/klp-ui/src/views/wms/coil/panels/LabelRender/index.vue
+++ b/klp-ui/src/views/wms/coil/panels/LabelRender/index.vue
@@ -36,7 +36,7 @@
         v-if="tagType === 'ge'"
         :content="content"
         :paperWidthMm="180"
-        :paperHeightMm="80"
+        :paperHeightMm="100"
       />
       <!-- <SampleTagPreview v-if="labelType === '4'" :content="content" />
       <ForgeTagPreview v-if="labelType === '5'" :content="content" />
@@ -141,7 +141,7 @@ export default {
       handler(newVal) {
         const { itemName, itemType, warehouseId } = newVal;
         // 在镀锌颜料库的卷使用镀锌原料标签
-        if (itemType == 'raw_material' && warehouseId == '1988150263284953089') {
+        if (itemType == 'raw_material' && (warehouseId == '1988150263284953089' || warehouseId == '1988150487185289217')) {
           this.labelType = '5';
         } else if (itemType == 'raw_material') {
           this.labelType = '2';
diff --git a/klp-ui/src/views/wms/coil/panels/base.vue b/klp-ui/src/views/wms/coil/panels/base.vue
index 3beb627a..6e479183 100644
--- a/klp-ui/src/views/wms/coil/panels/base.vue
+++ b/klp-ui/src/views/wms/coil/panels/base.vue
@@ -177,7 +177,8 @@
 
       <el-table-column label="关联订单" align="center" prop="relatedToOrder" v-if="showRelatedToOrder" width="150">
         <template slot-scope="scope">
-          <el-switch @change="handleRelatedToOrderChange(scope.row)" v-model="scope.row.isRelatedToOrder" :active-value="1" :inactive-value="0" />
+          <el-switch @change="handleRelatedToOrderChange(scope.row)" v-model="scope.row.isRelatedToOrder"
+            :active-value="1" :inactive-value="0" />
         </template>
       </el-table-column>
 
@@ -787,8 +788,26 @@ 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' || warehouseId == '1988150487185289217')) {
+        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 if (itemType == 'product' && itemName == '镀铬卷') {
+        this.labelRender.type = 'ge';
+      } else {
+        this.labelRender.type = '3';
+      }
       this.labelRender.data = {
         ...row,
         itemName: itemName,
diff --git a/klp-ui/src/views/wms/coil/panels/do.vue b/klp-ui/src/views/wms/coil/panels/do.vue
index 672fb9ae..f493e49e 100644
--- a/klp-ui/src/views/wms/coil/panels/do.vue
+++ b/klp-ui/src/views/wms/coil/panels/do.vue
@@ -661,7 +661,7 @@ export default {
       const itemType = row.itemType || '';
       const warehouseId = row.warehouseId || '';
       // 在镀锌颜料库的卷使用镀锌原料标签
-      if (itemType == 'raw_material' && warehouseId == '1988150263284953089') {
+      if (itemType == 'raw_material' && (warehouseId == '1988150263284953089' || warehouseId == '1988150487185289217')) {
         this.labelRender.type = '5';
       } else if (itemType == 'raw_material') {
         this.labelRender.type = '2';