diff --git a/klp-ui/src/views/wms/coil/panels/LabelRender/LajiaoRawTag.vue b/klp-ui/src/views/wms/coil/panels/LabelRender/LajiaoRawTag.vue
new file mode 100644
index 000000000..dc49669ba
--- /dev/null
+++ b/klp-ui/src/views/wms/coil/panels/LabelRender/LajiaoRawTag.vue
@@ -0,0 +1,325 @@
+
+
+
+
+
嘉祥科伦普重工有限公司
+
+
+
钢卷号
+
+
{{ content.currentCoilNo || '' }}
+
+
原料号
+
+
{{ content.enterCoilNo || '' }}
+
+
+
+
+
规格
+
+
{{ content.specification || '' }}
+
+
净重
+
+
{{ content.netWeight || '' }}
+
+
+
材质
+
+
{{ content.material || '' }}
+
+
下工序
+
+
+
+
厂家
+
+
{{ content.manufacturer }}
+
+
+
+
+
+
+
生产班组
+
+
+
+
生产日期
+
+
{{ formatDate(content.createTime) }}
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/klp-ui/src/views/wms/coil/panels/LabelRender/ShuangRawTag.vue b/klp-ui/src/views/wms/coil/panels/LabelRender/ShuangRawTag.vue
new file mode 100644
index 000000000..7497d6985
--- /dev/null
+++ b/klp-ui/src/views/wms/coil/panels/LabelRender/ShuangRawTag.vue
@@ -0,0 +1,325 @@
+
+
+
+
+
嘉祥科伦普重工有限公司
+
+
+
钢卷号
+
+
{{ content.currentCoilNo || '' }}
+
+
原料号
+
+
{{ content.enterCoilNo || '' }}
+
+
+
+
+
规格
+
+
{{ content.specification || '' }}
+
+
净重
+
+
{{ content.netWeight || '' }}
+
+
+
材质
+
+
{{ content.material || '' }}
+
+
下工序
+
+
+
+
厂家
+
+
{{ content.manufacturer }}
+
+
+
+
+
+
+
生产班组
+
+
+
+
生产日期
+
+
{{ 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 ee2917c12..2fd4c6177 100644
--- a/klp-ui/src/views/wms/coil/panels/LabelRender/index.vue
+++ b/klp-ui/src/views/wms/coil/panels/LabelRender/index.vue
@@ -56,6 +56,18 @@
:paperWidthMm="180"
:paperHeightMm="100"
/>
+
+
下载标签图片
@@ -80,6 +92,9 @@ import DuGeTag from './DuGeTag.vue';
import TuoZhiTag from './TuoZhiTag.vue';
import SplitTag from './SplitTag.vue';
import TuiHuoRawTag from './TuiHuoRawTag.vue';
+import LajiaoRawTag from './LajiaoRawTag.vue';
+import ShuangRawTag from './ShuangRawTag.vue';
+
export default {
name: 'LabelRender',
@@ -93,6 +108,8 @@ export default {
TuoZhiTag,
SplitTag,
TuiHuoRawTag,
+ LajiaoRawTag,
+ ShuangRawTag,
},
data() {
return {
@@ -134,6 +151,14 @@ export default {
'tuihuo-raw': {
width: 180,
height: 100,
+ },
+ 'lajiao-raw': {
+ width: 100,
+ height: 80,
+ },
+ 'shuang-raw': {
+ width: 100,
+ height: 80,
}
},
loading: false,
@@ -193,6 +218,14 @@ export default {
else if (itemType == 'raw_material' && (warehouseId == '1988150648993148929' || warehouseId == '1988150750390448129')) {
this.labelType = 'tuihuo-raw';
}
+ // 拉矫卷使用拉矫原料标签
+ else if (itemType == 'raw_material' && warehouseId == '1988150854442741762') {
+ this.labelType = 'lajiao-raw';
+ }
+ // 双机架原料卷使用双机架原料标签
+ else if (itemType == 'raw_material' && warehouseId == '1992873386047643650') {
+ this.labelType = 'shuang-raw';
+ }
// 否则使用普通的原料标签
else if (itemType == 'raw_material') {
this.labelType = '2';