diff --git a/klp-ui/src/views/wms/coil/js/coilPrint.js b/klp-ui/src/views/wms/coil/js/coilPrint.js
index f8e43296..f91e64ed 100644
--- a/klp-ui/src/views/wms/coil/js/coilPrint.js
+++ b/klp-ui/src/views/wms/coil/js/coilPrint.js
@@ -4,7 +4,8 @@ const ECoilPrintType = {
'镀锌成品': '4',
'镀铬成品': 'ge',
'镀锌原料': '5',
- '脱脂原料': '6'
+ '脱脂原料': '6',
+ '分条成品': 'split',
}
/**
@@ -26,6 +27,11 @@ export const getCoilTagPrintType = (coil) => {
else if (itemType == 'raw_material' && (warehouseId == '1988150545175736322')) {
type = ECoilPrintType['脱脂原料'];
}
+ // 分条成品库
+ else if (itemType == 'product' && (warehouseId == '1988150210872930306' || warehouseId == '1988150800092950529' || warehouseId == '1988150380649967617' || warehouseId == '1988151027466170370')) {
+ type = ECoilPrintType['分条成品'];
+ }
+ // 其他卷使用成品标签
else if (itemType == 'raw_material') {
type = ECoilPrintType['原料标签'];
} else if (itemType == 'product' && itemName == '冷硬卷') {
diff --git a/klp-ui/src/views/wms/coil/panels/LabelRender/SplitTag.vue b/klp-ui/src/views/wms/coil/panels/LabelRender/SplitTag.vue
new file mode 100644
index 00000000..6ec1f3dc
--- /dev/null
+++ b/klp-ui/src/views/wms/coil/panels/LabelRender/SplitTag.vue
@@ -0,0 +1,287 @@
+
+
+
+
+
嘉祥科伦普重工有限公司
+
+
+
原料号
+
+
{{ content.enterCoilNo|| '' }}
+
+
钢卷号
+
+
{{ content.currentCoilNo || '' }}
+
+
+
+
规格
+
+
{{ content.specification || '' }}
+
+
净重
+
+
{{ content.netWeight || '' }}
+
+
+
+
材质
+
+
{{ content.material || '' }}
+
+
厂家
+
+
{{ content.manufacturer }}
+
+
+
+
生产班组
+
+
{{ content.team || '' }}
+
+
生产日期
+
+
{{ formatDate(content.createTime) }}
+
+
+
+
+
+
+
+
\ No newline at end of file
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 48ac7a80..34f58f43 100644
--- a/klp-ui/src/views/wms/coil/panels/LabelRender/index.vue
+++ b/klp-ui/src/views/wms/coil/panels/LabelRender/index.vue
@@ -44,6 +44,12 @@
:paperWidthMm="180"
:paperHeightMm="100"
/>
+
下载标签图片
@@ -65,7 +71,7 @@ import WhereTag from './WhereTag.vue';
import ZincRawTag from './ZincRawTag.vue';
import DuGeTag from './DuGeTag.vue';
import TuoZhiTag from './TuoZhiTag.vue';
-
+import SplitTag from './SplitTag.vue';
export default {
name: 'LabelRender',
@@ -77,6 +83,7 @@ export default {
ZincRawTag,
DuGeTag,
TuoZhiTag,
+ SplitTag,
// SampleTagPreview,
// ForgeTagPreview,
// SaltSprayTagPreview,
@@ -113,6 +120,10 @@ export default {
width: 180,
height: 100,
},
+ 'split': {
+ width: 180,
+ height: 100,
+ },
}
}
},
@@ -151,8 +162,10 @@ export default {
this.labelType = '6';
} else if (itemType == 'raw_material') {
this.labelType = '2';
- } else if (itemType == 'product') {
- this.labelType = 'where';
+ }
+ // 分条成品
+ else if (itemType == 'product' && (warehouseId == '1988150210872930306' || warehouseId == '1988150800092950529' || warehouseId == '1988150380649967617' || warehouseId == '1988151027466170370')) {
+ this.labelType = 'split';
} else if (itemType == 'product' && itemName == '冷硬卷') {
this.labelType = '3';
} else if (itemType == 'product' && itemName == '热轧卷板') {