From 51a27215d60b143e128b2355bc26f0ce7872fb08 Mon Sep 17 00:00:00 2001
From: erdanergou <p17686264821@163.com>
Date: Mon, 3 Apr 2023 14:48:05 +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

---
 src/main/resources/templates/pages/depository/table-stock.html | 3 ++-
 src/main/resources/templates/pages/material/material-out.html  | 2 +-
 target/classes/templates/pages/depository/table-stock.html     | 3 ++-
 target/classes/templates/pages/material/material-out.html      | 2 +-
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/main/resources/templates/pages/depository/table-stock.html b/src/main/resources/templates/pages/depository/table-stock.html
index f7bc8dad..7cdcea1b 100644
--- a/src/main/resources/templates/pages/depository/table-stock.html
+++ b/src/main/resources/templates/pages/depository/table-stock.html
@@ -579,8 +579,8 @@
                                         layer.alert("数据导入完成", {
                                             icon: 0
                                         },function (indexForMsg,layero) {
-                                            closeShowDataMessage();
                                             layer.close(indexForMsg);
+                                            closeShowDataMessage();
                                             table.reload('currentTableId', {
                                                 url: '/material/findInventory',
                                                 page: {
@@ -632,6 +632,7 @@
 
 
         closeShowDataMessage = function () {
+            console.log(1)
             $("#layui-layer-shade-x"+newIndexShade).remove();
             $("#showImportData").hide();
             $("#showDataContent").empty();
diff --git a/src/main/resources/templates/pages/material/material-out.html b/src/main/resources/templates/pages/material/material-out.html
index 1cbd8444..50733255 100644
--- a/src/main/resources/templates/pages/material/material-out.html
+++ b/src/main/resources/templates/pages/material/material-out.html
@@ -360,8 +360,8 @@
                                         layer.alert("数据导入完成", {
                                             icon: 0
                                         },function (indexForMsg,layero) {
-                                            closeShowDataMessage();
                                             layer.close(indexForMsg);
+                                            closeShowDataMessage();
                                             table.reload('currentTableId', {
                                                 url: '/material/material',
                                                 page: {
diff --git a/target/classes/templates/pages/depository/table-stock.html b/target/classes/templates/pages/depository/table-stock.html
index f7bc8dad..7cdcea1b 100644
--- a/target/classes/templates/pages/depository/table-stock.html
+++ b/target/classes/templates/pages/depository/table-stock.html
@@ -579,8 +579,8 @@
                                         layer.alert("数据导入完成", {
                                             icon: 0
                                         },function (indexForMsg,layero) {
-                                            closeShowDataMessage();
                                             layer.close(indexForMsg);
+                                            closeShowDataMessage();
                                             table.reload('currentTableId', {
                                                 url: '/material/findInventory',
                                                 page: {
@@ -632,6 +632,7 @@
 
 
         closeShowDataMessage = function () {
+            console.log(1)
             $("#layui-layer-shade-x"+newIndexShade).remove();
             $("#showImportData").hide();
             $("#showDataContent").empty();
diff --git a/target/classes/templates/pages/material/material-out.html b/target/classes/templates/pages/material/material-out.html
index 1cbd8444..50733255 100644
--- a/target/classes/templates/pages/material/material-out.html
+++ b/target/classes/templates/pages/material/material-out.html
@@ -360,8 +360,8 @@
                                         layer.alert("数据导入完成", {
                                             icon: 0
                                         },function (indexForMsg,layero) {
-                                            closeShowDataMessage();
                                             layer.close(indexForMsg);
+                                            closeShowDataMessage();
                                             table.reload('currentTableId', {
                                                 url: '/material/material',
                                                 page: {