From 4ebab2512cec9ae33ae82926d8dd844ccbdf0164 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=89=E8=99=B9=E7=9D=BF?= <297504645@qq.com>
Date: Mon, 21 Aug 2023 12:00:46 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BA=93=E4=BD=8D=E5=B0=8F=E8=AE=A1/=E5=82=A8?=
 =?UTF-8?q?=E4=BD=8D=E5=B0=8F=E8=AE=A1/=E7=89=A9=E6=96=99=E5=B0=8F?=
 =?UTF-8?q?=E8=AE=A1=20=E5=88=86=E5=89=B2=E7=BA=BF=E9=95=BF=E5=BA=A6?=
 =?UTF-8?q?=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../reportForm/InventoryBookDetail_innerPage.vue         | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/fe/PC/src/views/activeReportManage/reportForm/InventoryBookDetail_innerPage.vue b/fe/PC/src/views/activeReportManage/reportForm/InventoryBookDetail_innerPage.vue
index 9ead6844e..40d64233d 100644
--- a/fe/PC/src/views/activeReportManage/reportForm/InventoryBookDetail_innerPage.vue
+++ b/fe/PC/src/views/activeReportManage/reportForm/InventoryBookDetail_innerPage.vue
@@ -268,7 +268,8 @@ export default {
               _list.push({
                 level1:item1,
                 level2:item2,
-                level3:item3,
+                // level3:item3,
+                level3:{locationCode:null},
                 total_erp:item2,
               })
             }
@@ -277,8 +278,10 @@ export default {
           if(index2 == item1.reportErpLocationSerialDtos.length - 1){
             _list.push({
               level1:item1,
-              level2:item2,
-              level3:{locationCode:null},//此处为了合并单元格做模拟locationCode处理
+              // level2:item2,
+              // level3:{locationCode:null},
+              level2:{erpLocatioCode:null},
+              level3:{locationCode:item2.erpLocatioCode},//此处为了合并单元格做模拟locationCode处理
               total_item:item1,
             })
           }