From 1f16c984a8473ff13f1594dc8ca652ce15bd85e3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=A0=82=E7=B3=96?= <2178503051@qq.com> Date: Tue, 23 Jun 2026 13:28:11 +0800 Subject: [PATCH] =?UTF-8?q?fix(wms/coil/label-render):=20=E8=B0=83?= =?UTF-8?q?=E6=95=B4=E6=A0=87=E7=AD=BE=E5=AD=97=E5=8F=B7=E8=AE=A1=E7=AE=97?= =?UTF-8?q?=E9=80=BB=E8=BE=91=E5=B9=B6=E6=9B=B4=E6=96=B0=E5=8E=9F=E6=96=99?= =?UTF-8?q?=E5=BA=93=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 1. 统一修正四个标签组件的订单单位字号计算规则,将判断阈值从<10改为<=9,同时调整字号计算基数 2. 更新脱脂原料标签的适用仓库,新增退火原料库和罩式退火纵剪分条原料库 --- klp-ui/src/views/wms/coil/panels/LabelRender/DuGeTag.vue | 4 ++-- .../src/views/wms/coil/panels/LabelRender/GalvanizedTag.vue | 4 ++-- .../src/views/wms/coil/panels/LabelRender/OuterTagPreview.vue | 4 ++-- klp-ui/src/views/wms/coil/panels/LabelRender/index.vue | 4 ++-- 4 files changed, 8 insertions(+), 8 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 fe76c239..6fd6716d 100644 --- a/klp-ui/src/views/wms/coil/panels/LabelRender/DuGeTag.vue +++ b/klp-ui/src/views/wms/coil/panels/LabelRender/DuGeTag.vue @@ -186,8 +186,8 @@ export default { }, orderUnitFontSize() { const len = this.orderUnitDisplay.length - if (len < 10) return '1.2em' - const size = Math.max(0.55, 12 / len).toFixed(2) + if (len <= 9) return '1.2em' + const size = (1.2 * 9 / len).toFixed(2) return size + 'em' } }, 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 00ada584..c3211c69 100644 --- a/klp-ui/src/views/wms/coil/panels/LabelRender/GalvanizedTag.vue +++ b/klp-ui/src/views/wms/coil/panels/LabelRender/GalvanizedTag.vue @@ -187,8 +187,8 @@ export default { }, orderUnitFontSize() { const len = this.orderUnitDisplay.length - if (len < 10) return '1.2em' - const size = Math.max(0.55, 12 / len).toFixed(2) + if (len <= 9) return '1.2em' + const size = (1.2 * 9 / len).toFixed(2) return size + 'em' } }, 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 a5c5989f..f9365179 100644 --- a/klp-ui/src/views/wms/coil/panels/LabelRender/OuterTagPreview.vue +++ b/klp-ui/src/views/wms/coil/panels/LabelRender/OuterTagPreview.vue @@ -193,8 +193,8 @@ export default { }, orderUnitFontSize() { const len = this.orderUnitDisplay.length - if (len < 10) return '1.2em' - const size = Math.max(0.55, 12 / len).toFixed(2) + if (len <= 9) return '1.2em' + const size = (1.2 * 9 / len).toFixed(2) return size + 'em' } }, 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 3657573f..cf095f62 100644 --- a/klp-ui/src/views/wms/coil/panels/LabelRender/index.vue +++ b/klp-ui/src/views/wms/coil/panels/LabelRender/index.vue @@ -173,8 +173,8 @@ export default { if (itemType == 'raw_material' && (warehouseId == '1988150263284953089' || warehouseId == '1988150487185289217')) { this.labelType = '5'; } - // 在脱脂原料库的卷使用脱脂原料标签 - else if (itemType == 'raw_material' && (warehouseId == '1988150545175736322')) { + // 在脱脂原料库或者退火原料库或者罩式退火纵剪分条原料库的卷使用脱脂原料标签 + else if (itemType == 'raw_material' && (warehouseId == '1988150545175736322' || warehouseId == '1988150648993148929' || warehouseId == '1988150750390448129')) { this.labelType = '6'; } // 否则使用普通的原料标签