diff --git a/klp-ui/src/views/wms/coil/do/search.vue b/klp-ui/src/views/wms/coil/do/search.vue
index 8ac4442f..1c0924f8 100644
--- a/klp-ui/src/views/wms/coil/do/search.vue
+++ b/klp-ui/src/views/wms/coil/do/search.vue
@@ -534,8 +534,8 @@ export default {
const actionType = parseInt(row.actionType)
// 特殊处理:发货和移库操作不需要跳转
- if (actionType === 4 || actionType === 5) {
- this.$message.info(actionType === 4 ? '发货操作已在移动端完成' : '移库操作已在移动端完成')
+ if (actionType >= 400) {
+ this.$message.info('特殊操作序在对应页面完成')
return
}
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 d26d91d7..e2bc91c9 100644
--- a/klp-ui/src/views/wms/coil/panels/LabelRender/OuterTagPreview.vue
+++ b/klp-ui/src/views/wms/coil/panels/LabelRender/OuterTagPreview.vue
@@ -50,25 +50,25 @@
- 表面质量
+ 质量要求
-
+
表面处理
-
+
- 剪切要求
+ 切边要求
-
+
- 包装种类
+ 包装要求
-
+
毛重
@@ -130,10 +130,10 @@ export default {
rawBlankNumber: '',
specification: '2.28*1250',
material: '',
- surfaceQuality: '',
- surfaceTreatment: '环保钝化/不涂油',
- cuttingRequirements: '',
- packagingType: 'A03',
+ qualityStatus: '',
+ surfaceTreatmentDesc: '环保钝化/不涂油',
+ trimmingRequirement: '',
+ packagingRequirement: 'A03',
grossWeight: '',
netWeight: '7080',
referenceLength: '320',
diff --git a/klp-ui/src/views/wms/coil/panels/LabelRender/ProductionTagPreview.vue b/klp-ui/src/views/wms/coil/panels/LabelRender/ProductionTagPreview.vue
index 25b54d4d..edf387ce 100644
--- a/klp-ui/src/views/wms/coil/panels/LabelRender/ProductionTagPreview.vue
+++ b/klp-ui/src/views/wms/coil/panels/LabelRender/ProductionTagPreview.vue
@@ -10,6 +10,22 @@
|
+
+
+ | 逻辑库区 |
+
+
+ |
+
+
+
+ | 实际库区 |
+
+
+ |
| 规格(mm) |
@@ -38,7 +54,7 @@
时间 |
-
+
|
diff --git a/klp-ui/src/views/wms/coil/panels/base.vue b/klp-ui/src/views/wms/coil/panels/base.vue
index ce6c9445..e5301853 100644
--- a/klp-ui/src/views/wms/coil/panels/base.vue
+++ b/klp-ui/src/views/wms/coil/panels/base.vue
@@ -462,17 +462,13 @@ export default {
/** 预览标签 */
handlePreviewLabel(row) {
this.labelRender.visible = true;
- const item = findItemWithBom(row.itemType, row.itemId)
- // 寻找boms中bom键名为'材质'的
- const material = item?.boms?.find(bom => bom.attrKey === '材质')
+ const item = row.itemType === 'product' ? row.product : row.rawMaterial;
+ const itemName = row.itemType === 'product' ? item?.productName || '' : item?.rawMaterialName || '';
- console.log('规格', item)
this.labelRender.data = {
...row,
- itemName: item?.itemName || '',
- material: material?.attrValue || '',
- specification: item?.specification || '',
-
+ itemName: itemName,
+ updateTime: row.updateTime?.split(' ')[0] || '',
};
},
/** 下载二维码 */