From 2f7f09c4fb7cf09544b161b17f00d8342e3872dd Mon Sep 17 00:00:00 2001
From: erdanergou <p17686264821@163.com>
Date: Tue, 13 Jun 2023 09:07:35 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=89=AB=E7=A0=81=E5=90=8E?=
 =?UTF-8?q?=E7=82=B9=E5=87=BB=E5=BA=93=E5=AD=98=E6=95=B0=E6=8D=AE=E4=B8=8D?=
 =?UTF-8?q?=E5=87=86=E7=A1=AE=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../showInventoryForLocation.html              | 17 +++++++++--------
 .../showInventoryForLocation.html              | 18 ++++++++++--------
 2 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/src/main/resources/templates/pages/showInventory/showInventoryForLocation.html b/src/main/resources/templates/pages/showInventory/showInventoryForLocation.html
index 8fe6adf4..e402be5f 100644
--- a/src/main/resources/templates/pages/showInventory/showInventoryForLocation.html
+++ b/src/main/resources/templates/pages/showInventory/showInventoryForLocation.html
@@ -166,11 +166,12 @@
                             result = res.data;
                             lis.push("<div class='clearfix'>");
                             for (let i = 0; i < result.length; i++) {
-                                let splitInventory = result[i].splitInventory;
+                                let resultElement = result[i];
+                                let splitInventory = resultElement.splitInventory;
                                 let keys = Object.keys(splitInventory);
                                 let InventoryItem = "";
-                                let brandItem = '<p>' + "物料品牌：" + result[i].mbrand + '</p>';
-                                if (result[i].mbrand === "") {
+                                let brandItem = '<p>' + "物料品牌：" + resultElement.mbrand + '</p>';
+                                if (resultElement.mbrand === "") {
                                     brandItem = "";
                                 }
                                 for (let j = 0; j < keys.length; j++) {
@@ -178,13 +179,13 @@
                                     let item = '<p>' + "计量单位：" + key + ";对应库存：" + splitInventory[key] + '</p>';
                                     InventoryItem += item;
                                 }
-                                lis.push('<li style="width:100%;margin-top: 10px;float:left;border: 1px solid #9999996e;"><div class="layui-card  my-shadow my-card flow1" onclick="showDetail(' + result[i].id + ')">' +
-                                    '<div class="layui-card-header"><h2>' + "物料名称：" + result[i].mname + '</h2></div>');
+                                lis.push('<li style="width:100%;margin-top: 10px;float:left;border: 1px solid #9999996e;"><div class="layui-card  my-shadow my-card flow1" onclick="showDetail(' + resultElement.iid + ')">' +
+                                    '<div class="layui-card-header"><h2>' + "物料名称：" + resultElement.mname + '</h2></div>');
                                 lis.push('<div class="layui-col-md4 my-info" style="margin-left: 15px; color: #999;font-size: 15px;">'
-                                    + '<p>' + "物料编码：" + result[i].mcode + '</p>'
-                                    + '<p>' + "物料型号：" + result[i].version + '</p>'
+                                    + '<p>' + "物料编码：" + resultElement.mcode + '</p>'
+                                    + '<p>' + "物料型号：" + resultElement.version + '</p>'
                                     + brandItem
-                                    + '<p>' + "所处位置：" + result[i].dname + "-" + result[i].kingdeecode + '</p>'
+                                    + '<p>' + "所处位置：" + resultElement.dname + "-" + resultElement.kingdeecode + '</p>'
                                     + InventoryItem
                                     + '</div></div></li>');
                             }
diff --git a/target/classes/templates/pages/showInventory/showInventoryForLocation.html b/target/classes/templates/pages/showInventory/showInventoryForLocation.html
index 8fe6adf4..a1044dda 100644
--- a/target/classes/templates/pages/showInventory/showInventoryForLocation.html
+++ b/target/classes/templates/pages/showInventory/showInventoryForLocation.html
@@ -166,11 +166,13 @@
                             result = res.data;
                             lis.push("<div class='clearfix'>");
                             for (let i = 0; i < result.length; i++) {
-                                let splitInventory = result[i].splitInventory;
+                                let resultElement = result[i];
+                                console.log(resultElement)
+                                let splitInventory = resultElement.splitInventory;
                                 let keys = Object.keys(splitInventory);
                                 let InventoryItem = "";
-                                let brandItem = '<p>' + "物料品牌：" + result[i].mbrand + '</p>';
-                                if (result[i].mbrand === "") {
+                                let brandItem = '<p>' + "物料品牌：" + resultElement.mbrand + '</p>';
+                                if (resultElement.mbrand === "") {
                                     brandItem = "";
                                 }
                                 for (let j = 0; j < keys.length; j++) {
@@ -178,13 +180,13 @@
                                     let item = '<p>' + "计量单位：" + key + ";对应库存：" + splitInventory[key] + '</p>';
                                     InventoryItem += item;
                                 }
-                                lis.push('<li style="width:100%;margin-top: 10px;float:left;border: 1px solid #9999996e;"><div class="layui-card  my-shadow my-card flow1" onclick="showDetail(' + result[i].id + ')">' +
-                                    '<div class="layui-card-header"><h2>' + "物料名称：" + result[i].mname + '</h2></div>');
+                                lis.push('<li style="width:100%;margin-top: 10px;float:left;border: 1px solid #9999996e;"><div class="layui-card  my-shadow my-card flow1" onclick="showDetail(' + resultElement.iid + ')">' +
+                                    '<div class="layui-card-header"><h2>' + "物料名称：" + resultElement.mname + '</h2></div>');
                                 lis.push('<div class="layui-col-md4 my-info" style="margin-left: 15px; color: #999;font-size: 15px;">'
-                                    + '<p>' + "物料编码：" + result[i].mcode + '</p>'
-                                    + '<p>' + "物料型号：" + result[i].version + '</p>'
+                                    + '<p>' + "物料编码：" + resultElement.mcode + '</p>'
+                                    + '<p>' + "物料型号：" + resultElement.version + '</p>'
                                     + brandItem
-                                    + '<p>' + "所处位置：" + result[i].dname + "-" + result[i].kingdeecode + '</p>'
+                                    + '<p>' + "所处位置：" + resultElement.dname + "-" + resultElement.kingdeecode + '</p>'
                                     + InventoryItem
                                     + '</div></div></li>');
                             }