@@ -182,13 +182,14 @@ export default {
materialWithManufacturer() {
return this.content.material
},
+ orderUnitDisplay() {
+ return (this.content.orderUnit || '').replace(/有限公司/g, '')
+ },
orderUnitFontSize() {
- const len = (this.content.orderUnit || '').length
+ const len = this.orderUnitDisplay.length
if (len < 10) return '1.2em'
- if (len <= 14) return '1em'
- if (len <= 18) return '0.88em'
- if (len <= 24) return '0.78em'
- return '0.68em'
+ const size = Math.max(0.55, 12 / len).toFixed(2)
+ return size + 'em'
}
},
data() {
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 443d07b0..a5c5989f 100644
--- a/klp-ui/src/views/wms/coil/panels/LabelRender/OuterTagPreview.vue
+++ b/klp-ui/src/views/wms/coil/panels/LabelRender/OuterTagPreview.vue
@@ -19,7 +19,7 @@
订货单位
-
{{ content.orderUnit || '' }}
+
{{ orderUnitDisplay }}
合同号
@@ -188,13 +188,14 @@ export default {
materialWithManufacturer() {
return this.content.material
},
+ orderUnitDisplay() {
+ return (this.content.orderUnit || '').replace(/有限公司/g, '')
+ },
orderUnitFontSize() {
- const len = (this.content.orderUnit || '').length
+ const len = this.orderUnitDisplay.length
if (len < 10) return '1.2em'
- if (len <= 14) return '1em'
- if (len <= 18) return '0.88em'
- if (len <= 24) return '0.78em'
- return '0.68em'
+ const size = Math.max(0.55, 12 / len).toFixed(2)
+ return size + 'em'
}
},
data() {
diff --git a/klp-ui/src/views/wms/coil/panels/base.vue b/klp-ui/src/views/wms/coil/panels/base.vue
index e7912ac8..e3e4d6b3 100644
--- a/klp-ui/src/views/wms/coil/panels/base.vue
+++ b/klp-ui/src/views/wms/coil/panels/base.vue
@@ -78,6 +78,11 @@
clearable />
+
+
+
+
全部
@@ -220,11 +225,11 @@
+
-
-
+
diff --git a/klp-ui/src/views/wms/post/flow.vue b/klp-ui/src/views/wms/post/flow.vue
index cfc16518..1c4d9558 100644
--- a/klp-ui/src/views/wms/post/flow.vue
+++ b/klp-ui/src/views/wms/post/flow.vue
@@ -14,7 +14,7 @@