refactor(wms/transfer): 简化调拨子表数据预处理逻辑

移除冗余的isEmpty判断分支,改用空值合并运算符统一处理前后字段赋值,优化代码可读性和维护性
This commit is contained in:
砂糖
2026-07-07 15:31:01 +08:00
parent 93816d5406
commit e4d0422c40

View File

@@ -167,8 +167,6 @@ export default {
if (newVal !== oldVal) { if (newVal !== oldVal) {
// 预处理数据 // 预处理数据
this.tableData = newVal.map(item => { this.tableData = newVal.map(item => {
const isEmpty = this.isEmpty(item);
if (isEmpty) {
return { return {
...item, ...item,
oBefore: { oBefore: {
@@ -180,33 +178,19 @@ export default {
zincLayer: item.zincLayerBefore zincLayer: item.zincLayerBefore
}, },
oAfter: { oAfter: {
manufacturer: item.manufacturerAfter, manufacturer: item.manufacturerAfter ?? item.manufacturerBefore,
specification: item.specificationAfter, specification: item.specificationAfter ?? item.specificationBefore,
material: item.materialAfter, material: item.materialAfter ?? item.materialBefore,
itemName: item.materialNameAfter, itemName: item.materialNameAfter ?? item.materialNameBefore,
surfaceTreatmentDesc: item.surfaceTreatmentAfter, surfaceTreatmentDesc: item.surfaceTreatmentAfter ?? item.surfaceTreatmentBefore,
zincLayer: item.zincLayerAfter zincLayer: item.zincLayerAfter ?? item.zincLayerBefore
}, },
// 每个字段独立判断如果after有值则用after否则回退到before
itemIdAfter: item.itemIdAfter ?? item.itemIdBefore,
warehouseIdAfter: item.warehouseIdAfter ?? item.warehouseIdBefore,
materialTypeAfter: item.materialTypeAfter ?? item.materialTypeBefore,
isConfirmed: this.isConfirmed(item) isConfirmed: this.isConfirmed(item)
} }
} else {
return {
...item,
oBefore: {
manufacturer: item.manufacturerBefore,
specification: item.specificationBefore,
material: item.materialBefore,
itemName: item.materialNameBefore,
surfaceTreatmentDesc: item.surfaceTreatmentBefore,
zincLayer: item.zincLayerBefore
},
// 将三个after字段设置为与before相同
itemIdAfter: item.itemIdBefore,
warehouseIdAfter: item.warehouseIdBefore,
materialTypeAfter: item.materialTypeBefore,
isConfirmed: this.isConfirmed(item)
}
}
}); });
} }
}, },
@@ -226,10 +210,6 @@ export default {
// return item && item.itemIdAfter && item.warehouseIdAfter && item.materialTypeAfter // return item && item.itemIdAfter && item.warehouseIdAfter && item.materialTypeAfter
return item.isTransferred == 1 return item.isTransferred == 1
}, },
// isEmpty 是否为空
isEmpty(item) {
return item && item.itemIdAfter && item.warehouseIdAfter && item.materialTypeAfter
},
handleUpdate(row) { handleUpdate(row) {
updateTransferOrderItem(row).then(res => { updateTransferOrderItem(row).then(res => {
this.$message({ this.$message({