From e4d0422c407290e9dadc7898b85f9d126745e7cf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A0=82=E7=B3=96?= <qq2178503051@163.com>
Date: Tue, 7 Jul 2026 15:31:01 +0800
Subject: [PATCH] =?UTF-8?q?refactor(wms/transfer):=20=E7=AE=80=E5=8C=96?=
 =?UTF-8?q?=E8=B0=83=E6=8B=A8=E5=AD=90=E8=A1=A8=E6=95=B0=E6=8D=AE=E9=A2=84?=
 =?UTF-8?q?=E5=A4=84=E7=90=86=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

移除冗余的isEmpty判断分支，改用空值合并运算符统一处理前后字段赋值，优化代码可读性和维护性
---
 .../wms/move/components/tranferItemTable.vue  | 66 +++++++------------
 1 file changed, 23 insertions(+), 43 deletions(-)

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({