fix(wms): 优化标签预览逻辑和显示内容

- 修改特殊操作类型的判断逻辑,使用范围判断代替具体值
- 重构标签预览数据处理逻辑,简化itemName获取方式
- 更新标签预览模板,调整字段显示名称和内容
- 使用updateTime替代productionDate字段
This commit is contained in:
砂糖
2025-12-01 17:23:37 +08:00
parent 3cf67df855
commit 0fc8978436
4 changed files with 35 additions and 23 deletions

View File

@@ -534,8 +534,8 @@ export default {
const actionType = parseInt(row.actionType) const actionType = parseInt(row.actionType)
// 特殊处理:发货和移库操作不需要跳转 // 特殊处理:发货和移库操作不需要跳转
if (actionType === 4 || actionType === 5) { if (actionType >= 400) {
this.$message.info(actionType === 4 ? '发货操作已在移动端完成' : '移库操作已在移动端完成') this.$message.info('特殊操作序在对应页面完成')
return return
} }

View File

@@ -50,25 +50,25 @@
<div class="info-grid-item value-cell"> <div class="info-grid-item value-cell">
<input type="text" class="nob" :value="content.material || ''" /> <input type="text" class="nob" :value="content.material || ''" />
</div> </div>
<div class="info-grid-item label-cell">表面质量</div> <div class="info-grid-item label-cell">质量要求</div>
<div class="info-grid-item value-cell"> <div class="info-grid-item value-cell">
<input type="text" class="nob" :value="content.surfaceQuality || ''" /> <input type="text" class="nob" :value="content.qualityStatus || ''" />
</div> </div>
<!-- 第五行表面处理 + 剪切要求 --> <!-- 第五行表面处理 + 剪切要求 -->
<div class="info-grid-item label-cell">表面处理</div> <div class="info-grid-item label-cell">表面处理</div>
<div class="info-grid-item value-cell"> <div class="info-grid-item value-cell">
<input type="text" class="nob" :value="content.surfaceTreatment || ''" /> <input type="text" class="nob" :value="content.surfaceTreatmentDesc || ''" />
</div> </div>
<div class="info-grid-item label-cell">切要求</div> <div class="info-grid-item label-cell">要求</div>
<div class="info-grid-item value-cell"> <div class="info-grid-item value-cell">
<input type="text" class="nob" :value="content.cuttingRequirements || ''" /> <input type="text" class="nob" :value="content.trimmingRequirement || ''" />
</div> </div>
<!-- 第六行包装种类 + 毛重 --> <!-- 第六行包装种类 + 毛重 -->
<div class="info-grid-item label-cell">包装种类</div> <div class="info-grid-item label-cell">包装要求</div>
<div class="info-grid-item value-cell"> <div class="info-grid-item value-cell">
<input type="text" class="nob" :value="content.packagingType || ''" /> <input type="text" class="nob" :value="content.packagingRequirement || ''" />
</div> </div>
<div class="info-grid-item label-cell">毛重</div> <div class="info-grid-item label-cell">毛重</div>
<div class="info-grid-item value-cell"> <div class="info-grid-item value-cell">
@@ -88,7 +88,7 @@
<!-- 第八行生产日期跨3列 --> <!-- 第八行生产日期跨3列 -->
<div class="info-grid-item label-cell">生产日期</div> <div class="info-grid-item label-cell">生产日期</div>
<div class="info-grid-item value-cell"> <div class="info-grid-item value-cell">
<input type="text" class="nob" :value="content.productionDate || ''" /> <input type="text" class="nob" :value="content.updateTime || ''" />
</div> </div>
</div> </div>
@@ -130,10 +130,10 @@ export default {
rawBlankNumber: '', rawBlankNumber: '',
specification: '2.28*1250', specification: '2.28*1250',
material: '', material: '',
surfaceQuality: '', qualityStatus: '',
surfaceTreatment: '环保钝化/不涂油', surfaceTreatmentDesc: '环保钝化/不涂油',
cuttingRequirements: '', trimmingRequirement: '',
packagingType: 'A03', packagingRequirement: 'A03',
grossWeight: '', grossWeight: '',
netWeight: '7080', netWeight: '7080',
referenceLength: '320', referenceLength: '320',

View File

@@ -10,6 +10,22 @@
<td class="value-cell" colspan="1"> <td class="value-cell" colspan="1">
<QRCode :content="content.qrcodeRecordId || ' '" :size="5" /> <QRCode :content="content.qrcodeRecordId || ' '" :size="5" />
</td> </td>
</tr>
<tr>
<td class="label-cell" colspan="2">逻辑库区</td>
<td class="value-cell" colspan="2">
<input type="text" class="nob" :value="content.warehouseName || ''" />
</td>
<!-- <td class="label-cell">实际库区</td>
<td class="value-cell">
<input type="text" class="nob" :value="content.actualWarehouseName || ''" />
</td> -->
</tr>
<tr>
<td class="label-cell" colspan="2">实际库区</td>
<td class="value-cell" colspan="2">
<input type="text" class="nob" :value="content.actualWarehouseName || ''" />
</td>
</tr> </tr>
<tr> <tr>
<td class="label-cell">规格(mm)</td> <td class="label-cell">规格(mm)</td>
@@ -38,7 +54,7 @@
</td> </td>
<td class="label-cell">时间</td> <td class="label-cell">时间</td>
<td class="value-cell"> <td class="value-cell">
<input type="text" class="nob" :value="content.productionDate || ''" /> <input type="text" class="nob" :value="content.updateTime || ''" />
</td> </td>
</tr> </tr>
</table> </table>

View File

@@ -462,17 +462,13 @@ export default {
/** 预览标签 */ /** 预览标签 */
handlePreviewLabel(row) { handlePreviewLabel(row) {
this.labelRender.visible = true; this.labelRender.visible = true;
const item = findItemWithBom(row.itemType, row.itemId) const item = row.itemType === 'product' ? row.product : row.rawMaterial;
// 寻找boms中bom键名为'材质'的 const itemName = row.itemType === 'product' ? item?.productName || '' : item?.rawMaterialName || '';
const material = item?.boms?.find(bom => bom.attrKey === '材质')
console.log('规格', item)
this.labelRender.data = { this.labelRender.data = {
...row, ...row,
itemName: item?.itemName || '', itemName: itemName,
material: material?.attrValue || '', updateTime: row.updateTime?.split(' ')[0] || '',
specification: item?.specification || '',
}; };
}, },
/** 下载二维码 */ /** 下载二维码 */