DeXun/klp-oa
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
移除冗余的isEmpty判断分支，改用空值合并运算符统一处理前后字段赋值，优化代码可读性和维护性
This commit is contained in:
砂糖
2026-07-07 15:31:01 +08:00
parent 93816d5406
commit e4d0422c40
1 changed files with 23 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

66
klp-ui/src/views/wms/move/components/tranferItemTable.vue
View File

@@ -167,45 +167,29 @@ export default {
if (newVal !== oldVal) { if (newVal !== oldVal) {
// 预处理数据 // 预处理数据
this.tableData = newVal.map(item => { this.tableData = newVal.map(item => {
const isEmpty = this.isEmpty(item); return {
if (isEmpty) { ...item,
return { oBefore: {
...item, manufacturer: item.manufacturerBefore,
oBefore: { specification: item.specificationBefore,
manufacturer: item.manufacturerBefore, material: item.materialBefore,
specification: item.specificationBefore, itemName: item.materialNameBefore,
material: item.materialBefore, surfaceTreatmentDesc: item.surfaceTreatmentBefore,
itemName: item.materialNameBefore, zincLayer: item.zincLayerBefore
surfaceTreatmentDesc: item.surfaceTreatmentBefore, },
zincLayer: item.zincLayerBefore oAfter: {
}, manufacturer: item.manufacturerAfter ?? item.manufacturerBefore,
oAfter: { specification: item.specificationAfter ?? item.specificationBefore,
manufacturer: item.manufacturerAfter, material: item.materialAfter ?? item.materialBefore,
specification: item.specificationAfter, itemName: item.materialNameAfter ?? item.materialNameBefore,
material: item.materialAfter, surfaceTreatmentDesc: item.surfaceTreatmentAfter ?? item.surfaceTreatmentBefore,
itemName: item.materialNameAfter, zincLayer: item.zincLayerAfter ?? item.zincLayerBefore
surfaceTreatmentDesc: item.surfaceTreatmentAfter, },
zincLayer: item.zincLayerAfter // 每个字段独立判断：如果after有值则用after，否则回退到before
}, itemIdAfter: item.itemIdAfter ?? item.itemIdBefore,
isConfirmed: this.isConfirmed(item) warehouseIdAfter: item.warehouseIdAfter ?? item.warehouseIdBefore,
} materialTypeAfter: item.materialTypeAfter ?? item.materialTypeBefore,
} else { isConfirmed: this.isConfirmed(item)
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({