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 @@
+
@@ -540,7 +541,7 @@
var show = "" + code + ", " + mname + ", " + version + ", 数量为" + quantity + ":通过" + "
";
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 @@
+
@@ -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 @@
+
@@ -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 @@
+
@@ -540,7 +541,7 @@
var show = "" + code + ", " + mname + ", " + version + ", 数量为" + quantity + ":通过" + "
";
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 @@
+
@@ -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 @@
+
@@ -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();
}