diff --git a/klp-ui/src/views/wms/move/components/tranferItemTable.vue b/klp-ui/src/views/wms/move/components/tranferItemTable.vue index 8dc600904..b04a4b425 100644 --- a/klp-ui/src/views/wms/move/components/tranferItemTable.vue +++ b/klp-ui/src/views/wms/move/components/tranferItemTable.vue @@ -167,45 +167,29 @@ export default { if (newVal !== oldVal) { // 预处理数据 this.tableData = newVal.map(item => { - const isEmpty = this.isEmpty(item); - if (isEmpty) { - return { - ...item, - oBefore: { - manufacturer: item.manufacturerBefore, - specification: item.specificationBefore, - material: item.materialBefore, - itemName: item.materialNameBefore, - surfaceTreatmentDesc: item.surfaceTreatmentBefore, - zincLayer: item.zincLayerBefore - }, - oAfter: { - manufacturer: item.manufacturerAfter, - specification: item.specificationAfter, - material: item.materialAfter, - itemName: item.materialNameAfter, - surfaceTreatmentDesc: item.surfaceTreatmentAfter, - zincLayer: item.zincLayerAfter - }, - 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) - } + return { + ...item, + oBefore: { + manufacturer: item.manufacturerBefore, + specification: item.specificationBefore, + material: item.materialBefore, + itemName: item.materialNameBefore, + surfaceTreatmentDesc: item.surfaceTreatmentBefore, + zincLayer: item.zincLayerBefore + }, + oAfter: { + manufacturer: item.manufacturerAfter ?? item.manufacturerBefore, + specification: item.specificationAfter ?? item.specificationBefore, + material: item.materialAfter ?? item.materialBefore, + itemName: item.materialNameAfter ?? item.materialNameBefore, + surfaceTreatmentDesc: item.surfaceTreatmentAfter ?? item.surfaceTreatmentBefore, + 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) } }); } @@ -226,10 +210,6 @@ export default { // return item && item.itemIdAfter && item.warehouseIdAfter && item.materialTypeAfter return item.isTransferred == 1 }, - // isEmpty 是否为空 - isEmpty(item) { - return item && item.itemIdAfter && item.warehouseIdAfter && item.materialTypeAfter - }, handleUpdate(row) { updateTransferOrderItem(row).then(res => { this.$message({