|
|
@ -89,6 +89,7 @@ |
|
|
<div onclick="closeShowDataMessage()" style="position: absolute; right: 0; top: 2%; cursor: pointer;"> |
|
|
<div onclick="closeShowDataMessage()" style="position: absolute; right: 0; top: 2%; cursor: pointer;"> |
|
|
<i class="fa fa-window-close-o"></i> |
|
|
<i class="fa fa-window-close-o"></i> |
|
|
</div> |
|
|
</div> |
|
|
|
|
|
<div id="showDataContent"></div> |
|
|
</div> |
|
|
</div> |
|
|
|
|
|
|
|
|
</div> |
|
|
</div> |
|
|
@ -540,7 +541,7 @@ |
|
|
var show = "<p style='color: #00FF00'>" + code + ", " + mname + ", " + version + ", 数量为" + quantity + ":通过" + "</p>"; |
|
|
var show = "<p style='color: #00FF00'>" + code + ", " + mname + ", " + version + ", 数量为" + quantity + ":通过" + "</p>"; |
|
|
re += show |
|
|
re += show |
|
|
} |
|
|
} |
|
|
$("#showImportData").append(re); |
|
|
$("#showDataContent").append(re); |
|
|
}); |
|
|
}); |
|
|
|
|
|
|
|
|
} |
|
|
} |
|
|
@ -573,8 +574,9 @@ |
|
|
} |
|
|
} |
|
|
layer.alert("数据导入完成", { |
|
|
layer.alert("数据导入完成", { |
|
|
icon: 0 |
|
|
icon: 0 |
|
|
},function () { |
|
|
},function (indexForMsg,layero) { |
|
|
closeShowDataMessage(); |
|
|
closeShowDataMessage(); |
|
|
|
|
|
layer.close(indexForMsg); |
|
|
table.reload('currentTableId', { |
|
|
table.reload('currentTableId', { |
|
|
url: '/material/findInventory', |
|
|
url: '/material/findInventory', |
|
|
page: { |
|
|
page: { |
|
|
@ -628,7 +630,7 @@ |
|
|
closeShowDataMessage = function () { |
|
|
closeShowDataMessage = function () { |
|
|
$("#layui-layer-shade-x"+newIndexShade).remove(); |
|
|
$("#layui-layer-shade-x"+newIndexShade).remove(); |
|
|
$("#showImportData").hide(); |
|
|
$("#showImportData").hide(); |
|
|
$("#showImportData").empty(); |
|
|
$("#showDataContent").empty(); |
|
|
if (socket !== null) { |
|
|
if (socket !== null) { |
|
|
socket.close(); |
|
|
socket.close(); |
|
|
} |
|
|
} |
|
|
|