From 980b95a9b3d0ed25dd93a4b223aa457a00d155b2 Mon Sep 17 00:00:00 2001
From: erdanergou <p17686264821@163.com>
Date: Fri, 31 Mar 2023 14:51:04 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=BA=93=E5=AD=98=E3=80=81?=
 =?UTF-8?q?=E7=89=A9=E6=96=99=E3=80=81=E7=89=A9=E6=96=99=E7=B1=BB=E5=9E=8B?=
 =?UTF-8?q?=E5=AF=BC=E5=85=A5=E6=96=B9=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/templates/pages/depository/table-stock.html | 8 +++++---
 .../resources/templates/pages/material/material-out.html  | 8 +++++---
 .../templates/pages/materialtype/materialType_view.html   | 8 +++++---
 .../classes/templates/pages/depository/table-stock.html   | 8 +++++---
 target/classes/templates/pages/material/material-out.html | 8 +++++---
 .../templates/pages/materialtype/materialType_view.html   | 8 +++++---
 6 files changed, 30 insertions(+), 18 deletions(-)

diff --git a/src/main/resources/templates/pages/depository/table-stock.html b/src/main/resources/templates/pages/depository/table-stock.html
index 4381cb1b..bb17ff3b 100644
--- a/src/main/resources/templates/pages/depository/table-stock.html
+++ b/src/main/resources/templates/pages/depository/table-stock.html
@@ -89,6 +89,7 @@
             <div onclick="closeShowDataMessage()" style="position: absolute;    right: 0;    top: 2%; cursor: pointer;">
                 <i class="fa fa-window-close-o"></i>
             </div>
+            <div id="showDataContent"></div>
         </div>
 
     </div>
@@ -540,7 +541,7 @@
                                     var show = "<p style='color: #00FF00'>" + code + "， " + mname + "， " + version + "， 数量为" + quantity + "：通过" + "</p>";
                                     re += show
                                 }
-                                $("#showImportData").append(re);
+                                $("#showDataContent").append(re);
                             });
 
                         }
@@ -573,8 +574,9 @@
                                         }
                                         layer.alert("数据导入完成", {
                                             icon: 0
-                                        },function () {
+                                        },function (indexForMsg,layero) {
                                             closeShowDataMessage();
+                                            layer.close(indexForMsg);
                                             table.reload('currentTableId', {
                                                 url: '/material/findInventory',
                                                 page: {
@@ -628,7 +630,7 @@
         closeShowDataMessage = function () {
             $("#layui-layer-shade-x"+newIndexShade).remove();
             $("#showImportData").hide();
-            $("#showImportData").empty();
+            $("#showDataContent").empty();
             if (socket !== null) {
                 socket.close();
             }
diff --git a/src/main/resources/templates/pages/material/material-out.html b/src/main/resources/templates/pages/material/material-out.html
index d32608cc..ff1999f7 100644
--- a/src/main/resources/templates/pages/material/material-out.html
+++ b/src/main/resources/templates/pages/material/material-out.html
@@ -115,6 +115,7 @@
             <div onclick="closeShowDataMessage()" style="position: absolute;    right: 0;    top: 2%; cursor: pointer;">
                 <i class="fa fa-window-close-o"></i>
             </div>
+            <div id="showDataContent"></div>
         </div>
     </div>
 </div>
@@ -324,7 +325,7 @@
                                     re += show;
 
                                 }
-                                $("#showImportData").append(re);
+                                $("#showDataContent").append(re);
                             });
 
                         }
@@ -357,8 +358,9 @@
                                         }
                                         layer.alert("数据导入完成", {
                                             icon: 0
-                                        },function () {
+                                        },function (indexForMsg,layero) {
                                             closeShowDataMessage();
+                                            layer.close(indexForMsg);
                                             table.reload('currentTableId', {
                                                 url: '/material/material',
                                                 page: {
@@ -410,7 +412,7 @@
         closeShowDataMessage = function () {
             $("#layui-layer-shade-x"+newIndexShade).remove();
             $("#showImportData").hide();
-            $("#showImportData").empty();
+            $("#showDataContent").empty();
             if (socket !== null) {
                 socket.close();
             }
diff --git a/src/main/resources/templates/pages/materialtype/materialType_view.html b/src/main/resources/templates/pages/materialtype/materialType_view.html
index 8e415ec6..8a0fb118 100644
--- a/src/main/resources/templates/pages/materialtype/materialType_view.html
+++ b/src/main/resources/templates/pages/materialtype/materialType_view.html
@@ -91,6 +91,7 @@
             <div onclick="closeShowDataMessage()" style="position: absolute;    right: 0;    top: 2%; cursor: pointer;">
                 <i class="fa fa-window-close-o"></i>
             </div>
+            <div id="showDataContent"></div>
         </div>
 
     </div>
@@ -320,7 +321,7 @@
                                     re += show
 
                                 }
-                                $("#showImportData").append(re);
+                                $("#showDataContent").append(re);
                             });
 
                         }
@@ -353,7 +354,8 @@
                                         }
                                         layer.alert("数据导入完成", {
                                             icon: 0
-                                        },function () {
+                                        },function (indexForMsg,layero) {
+                                            layer.close(indexForMsg);
                                             closeShowDataMessage();
                                             table.reload('currentTableId', {
                                                 url: '/materialType/materialTypeRecord',
@@ -408,7 +410,7 @@
         closeShowDataMessage = function () {
             $("#layui-layer-shade-x"+newIndexShade).remove();
             $("#showImportData").hide();
-            $("#showImportData").empty();
+            $("#showDataContent").empty();
             if (socket !== null) {
                 socket.close();
             }
diff --git a/target/classes/templates/pages/depository/table-stock.html b/target/classes/templates/pages/depository/table-stock.html
index 4381cb1b..bb17ff3b 100644
--- a/target/classes/templates/pages/depository/table-stock.html
+++ b/target/classes/templates/pages/depository/table-stock.html
@@ -89,6 +89,7 @@
             <div onclick="closeShowDataMessage()" style="position: absolute;    right: 0;    top: 2%; cursor: pointer;">
                 <i class="fa fa-window-close-o"></i>
             </div>
+            <div id="showDataContent"></div>
         </div>
 
     </div>
@@ -540,7 +541,7 @@
                                     var show = "<p style='color: #00FF00'>" + code + "， " + mname + "， " + version + "， 数量为" + quantity + "：通过" + "</p>";
                                     re += show
                                 }
-                                $("#showImportData").append(re);
+                                $("#showDataContent").append(re);
                             });
 
                         }
@@ -573,8 +574,9 @@
                                         }
                                         layer.alert("数据导入完成", {
                                             icon: 0
-                                        },function () {
+                                        },function (indexForMsg,layero) {
                                             closeShowDataMessage();
+                                            layer.close(indexForMsg);
                                             table.reload('currentTableId', {
                                                 url: '/material/findInventory',
                                                 page: {
@@ -628,7 +630,7 @@
         closeShowDataMessage = function () {
             $("#layui-layer-shade-x"+newIndexShade).remove();
             $("#showImportData").hide();
-            $("#showImportData").empty();
+            $("#showDataContent").empty();
             if (socket !== null) {
                 socket.close();
             }
diff --git a/target/classes/templates/pages/material/material-out.html b/target/classes/templates/pages/material/material-out.html
index d32608cc..ff1999f7 100644
--- a/target/classes/templates/pages/material/material-out.html
+++ b/target/classes/templates/pages/material/material-out.html
@@ -115,6 +115,7 @@
             <div onclick="closeShowDataMessage()" style="position: absolute;    right: 0;    top: 2%; cursor: pointer;">
                 <i class="fa fa-window-close-o"></i>
             </div>
+            <div id="showDataContent"></div>
         </div>
     </div>
 </div>
@@ -324,7 +325,7 @@
                                     re += show;
 
                                 }
-                                $("#showImportData").append(re);
+                                $("#showDataContent").append(re);
                             });
 
                         }
@@ -357,8 +358,9 @@
                                         }
                                         layer.alert("数据导入完成", {
                                             icon: 0
-                                        },function () {
+                                        },function (indexForMsg,layero) {
                                             closeShowDataMessage();
+                                            layer.close(indexForMsg);
                                             table.reload('currentTableId', {
                                                 url: '/material/material',
                                                 page: {
@@ -410,7 +412,7 @@
         closeShowDataMessage = function () {
             $("#layui-layer-shade-x"+newIndexShade).remove();
             $("#showImportData").hide();
-            $("#showImportData").empty();
+            $("#showDataContent").empty();
             if (socket !== null) {
                 socket.close();
             }
diff --git a/target/classes/templates/pages/materialtype/materialType_view.html b/target/classes/templates/pages/materialtype/materialType_view.html
index 8e415ec6..8a0fb118 100644
--- a/target/classes/templates/pages/materialtype/materialType_view.html
+++ b/target/classes/templates/pages/materialtype/materialType_view.html
@@ -91,6 +91,7 @@
             <div onclick="closeShowDataMessage()" style="position: absolute;    right: 0;    top: 2%; cursor: pointer;">
                 <i class="fa fa-window-close-o"></i>
             </div>
+            <div id="showDataContent"></div>
         </div>
 
     </div>
@@ -320,7 +321,7 @@
                                     re += show
 
                                 }
-                                $("#showImportData").append(re);
+                                $("#showDataContent").append(re);
                             });
 
                         }
@@ -353,7 +354,8 @@
                                         }
                                         layer.alert("数据导入完成", {
                                             icon: 0
-                                        },function () {
+                                        },function (indexForMsg,layero) {
+                                            layer.close(indexForMsg);
                                             closeShowDataMessage();
                                             table.reload('currentTableId', {
                                                 url: '/materialType/materialTypeRecord',
@@ -408,7 +410,7 @@
         closeShowDataMessage = function () {
             $("#layui-layer-shade-x"+newIndexShade).remove();
             $("#showImportData").hide();
-            $("#showImportData").empty();
+            $("#showDataContent").empty();
             if (socket !== null) {
                 socket.close();
             }