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'; } // 否则使用普通的原料标签