diff --git a/klp-ui/src/views/wms/coil/panels/LabelRender/ZincRawTag.vue b/klp-ui/src/views/wms/coil/panels/LabelRender/ZincRawTag.vue index ba5277da..d8c78ee0 100644 --- a/klp-ui/src/views/wms/coil/panels/LabelRender/ZincRawTag.vue +++ b/klp-ui/src/views/wms/coil/panels/LabelRender/ZincRawTag.vue @@ -31,7 +31,7 @@
下工序
-
{{ content.nextProcess || '冷硬卷' }}
+
{{ content.nextProcess || '镀锌卷' }}
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 e57329f7..fbdee04c 100644 --- a/klp-ui/src/views/wms/coil/panels/LabelRender/index.vue +++ b/klp-ui/src/views/wms/coil/panels/LabelRender/index.vue @@ -91,6 +91,10 @@ export default { width: 100, height: 80, }, + '5': { + width: 180, + height: 100, + }, } } }, diff --git a/klp-ui/src/views/wms/coil/panels/do.vue b/klp-ui/src/views/wms/coil/panels/do.vue index b7217e23..d5e00823 100644 --- a/klp-ui/src/views/wms/coil/panels/do.vue +++ b/klp-ui/src/views/wms/coil/panels/do.vue @@ -246,8 +246,7 @@
品名: - +
@@ -273,7 +272,7 @@ {{ item.manufacturer }}
- +
{{ item.itemName || '—' }} @@ -552,6 +551,28 @@ export default { defectCode: null, degree: null, remark: null + }, + tagSizeMap: { + '2': { + width: 100, + height: 80, + }, + '3': { + width: 180, + height: 100, + }, + '4': { + width: 180, + height: 100, + }, + 'where': { + width: 100, + height: 80, + }, + '5': { + width: 180, + height: 100, + }, }, stepSpilt: { list: [], @@ -633,8 +654,24 @@ export default { handlePrintLabel(row) { const item = row.itemType === 'product' ? row.product : row.rawMaterial; const itemName = row.itemType === 'product' ? item?.productName || '' : item?.rawMaterialName || ''; - - this.labelRender.type = row.itemType === 'product' ? '3' : '2' + const itemType = row.itemType || ''; + const warehouseId = row.warehouseId || ''; + // 在镀锌颜料库的卷使用镀锌原料标签 + if (itemType == 'raw_material' && warehouseId == '1988150263284953089') { + this.labelRender.type = '5'; + } else if (itemType == 'raw_material') { + this.labelRender.type = '2'; + } else if (itemType == 'product' && itemName == '冷硬卷') { + this.labelRender.type = '3'; + } else if (itemType == 'product' && itemName == '热轧卷板') { + this.labelRender.type = '3'; + } else if (itemType == 'product' && itemName == '镀锌卷') { + this.labelRender.type = '4'; + } else if (itemType == 'product' && itemName == '冷轧卷') { + this.labelRender.type = '3'; + } else { + this.labelRender.type = '3'; + } this.labelRender.data = { ...row, itemName: itemName,