diff --git a/src/main/resources/templates/index.html b/src/main/resources/templates/index.html
index c310294d..34fee9f7 100644
--- a/src/main/resources/templates/index.html
+++ b/src/main/resources/templates/index.html
@@ -79,10 +79,6 @@
基本资料
-
- 修改密码
-
@@ -199,11 +195,12 @@
this.layerIndex = layer.load(0, {shade: [0.5, '#393D49']});
},
success: function (data) {
- layer.close(this.layerIndex);
+
layer.msg(data.statusInfo.message,{
icon:0,
time:500
}, function () {
+ layer.close(this.layerIndex);
window.location = '/login';
});
}
diff --git a/src/main/resources/templates/pages/application/application-in.html b/src/main/resources/templates/pages/application/application-in.html
index 949e540d..4d91f477 100644
--- a/src/main/resources/templates/pages/application/application-in.html
+++ b/src/main/resources/templates/pages/application/application-in.html
@@ -713,6 +713,8 @@
req.code = code;
req.type = "in";
if(code !== ""){
+ // 展示遮盖层
+ let loading2 = layer.open({ type: 3, shade: [0.25, '#000'], icon: 2, speed: 0});
$.ajax({
url: "/material/findMatrialByCode",
type: "get",
@@ -723,15 +725,21 @@
var d = d.data;
var idNumber = materialId.name.split("mid")[1];
if (d == null) {
- layer.msg("没有该编码,请确认是否输入正确");
- materialName.value = "";
- materialId.value = "";
- obj.value = "";
- $("#barCode" + idNumber).empty();
- $("#unit" + idNumber).empty();
- form.render();
+ layer.msg("没有该编码,请确认是否输入正确",{
+ icon:0,
+ time:500
+ },function () {
+ layer.close(loading2)
+ materialName.value = "";
+ materialId.value = "";
+ obj.value = "";
+ $("#barCode" + idNumber).empty();
+ $("#unit" + idNumber).empty();
+ form.render();
+ });
} else {
+
materialName.value = d.mname;
materialId.value = d.mid;
// 获取物料与条形码的对应关系
@@ -774,9 +782,11 @@
if (shelfLife !== null && shelfLife !== undefined) {
$("#" + "producedDateItem" + idNumber).show();
$("#" + "producedDate" + idNumber).attr("lay-verify", "required");
- } else {
+ }
+ else {
$("#" + "producedDateItem" + idNumber).hide();
}
+ layer.close(loading2)
}
}
});
@@ -823,6 +833,7 @@
end: function () {
var mid = materialId.value;
if (mid !== '') {
+ let loading2 = layer.open({ type: 3, shade: [0.25, '#000'], icon: 2, speed: 0});
$.ajax({
url: "/material/findMatrialById?mid=" + mid,
type: "get",
@@ -872,6 +883,7 @@
$("#unit" + idNumber).append(new Option(unitList[i].newUnit, unitList[i].newUnit));
}
form.render();
+ layer.close(loading2)
}
});
}
@@ -896,6 +908,7 @@
var req = {};
data = data.split(",")[0];
if(data !== ""){
+ let loading2 = layer.open({ type: 3, shade: [0.25, '#000'], icon: 2, speed: 0});
req.mname = data;
$.ajax({
url: "/material/findMaterialByCondition",
@@ -905,15 +918,25 @@
contentType: "application/json;charset=utf-8",
success: function (d) {
if (d.count > 1) {
- layer.msg("请点击右侧搜索确定物品");
- materialId.value = "";
- codeValue.value = "";
+ layer.msg("请点击右侧搜索确定物品",{
+ icon:0,
+ time:500
+ },function () {
+ materialId.value = "";
+ codeValue.value = "";
+ layer.close(loading2)
+ });
return false;
} else if (d.count === 0) {
- layer.msg("没有该物品,请确认输入是否正确");
- materialId.value = "";
- codeValue.value = "";
- materialName.value = "";
+ layer.msg("没有该物品,请确认输入是否正确",{
+ icon:5,
+ time:500
+ },function() {
+ materialId.value = "";
+ codeValue.value = "";
+ materialName.value = "";
+ layer.close(loading2)
+ });
return false;
} else {
var idNumber = materialId.name.split("mid")[1];
@@ -936,6 +959,7 @@
for (let i = 0; i < unitList.length; i++) {
$("#unit" + idNumber).append(new Option(unitList[i].newUnit, unitList[i].newUnit));
}
+ layer.close(loading2)
form.render();
}
@@ -965,6 +989,7 @@
req.qrCode = result;
req.codeFlag = 2;
$("#qrCode" + obj.id.split("qrCodeImg")[1]).val(result);
+ let loading2 = layer.open({ type: 3, shade: [0.25, '#000'], icon: 2, speed: 0});
$.ajax({
url: "/material/qywxApplicationInScanQrCode",
type: "post",
@@ -993,6 +1018,7 @@
icon: 0,
time: 1000 //0.5秒关闭(如果不配置,默认是3秒)
}, function () {
+ layer.close(loading2)
})
} else {
var code = data.code;
@@ -1042,6 +1068,7 @@
for (let i = 0; i < unitList.length; i++) {
$("#unit" + idNumber).append(new Option(unitList[i].newUnit, unitList[i].newUnit));
}
+ layer.close(loading2)
form.render();
}
@@ -1074,6 +1101,7 @@
var req = {};
req.qrCode = result;
req.codeFlag = 1;
+ let loading2 = layer.open({ type: 3, shade: [0.25, '#000'], icon: 2, speed: 0});
$.ajax({
url: "/material/qywxApplicationInScanBarCode",
type: "post",
@@ -1126,14 +1154,17 @@
for (let i = 0; i < unitList.length; i++) {
$("#unit" + idNumber).append(new Option(unitList[i].newUnit, unitList[i].newUnit));
}
+ layer.close(loading2)
form.render();
- } else {
+ }
+ else {
// 如果没有对应关系
layer.msg("对于编码:" + result + ",并未发现对应的物料", {
icon: 0,
time: 1000 //0.5秒关闭(如果不配置,默认是3秒)
}, function () {
+ layer.close(loading2)
})
}
}
@@ -1216,6 +1247,7 @@
var result = res.resultStr;//当needResult为1时返回处理结果
var req = {};
req.qrCode = result;
+ let loading2 = layer.open({ type: 3, shade: [0.25, '#000'], icon: 2, speed: 0});
$.ajax({
url: "/place/qywxApplicationInScanQrCode",
type: "post",
@@ -1234,6 +1266,8 @@
layer.msg("并未查询到对应位置,请重新扫描",{
icon:0,
time:1000
+ },function () {
+ layer.close(loading2)
});
} else if (flag === 1) {
// 如果获取到的是库位
@@ -1241,6 +1275,7 @@
placeId.value = place.id;
depositoryId.value = place.did;
depositoryName.value = place.depositoryName;
+ layer.close(loading2)
} else if (flag === 2) {
// 如果获取到的是仓库
@@ -1248,6 +1283,7 @@
placeId.value = "0";
depositoryId.value = depository.id;
depositoryName.value = depository.dname;
+ layer.close(loading2)
}
}
})
@@ -1273,6 +1309,7 @@
let req = {};
if(code !== ""){
req.code = code;
+ let loading2 = layer.open({ type: 3, shade: [0.25, '#000'], icon: 2, speed: 0});
$.ajax({
url: "/group/findGroupByCodeForIn",
type: "post",
@@ -1295,6 +1332,7 @@
childNodes[i].remove()
}
}
+ layer.close(loading2)
})
} else {
let childNodes = parent.childNodes;
@@ -1312,6 +1350,7 @@
CoverpageForGroup(pid, data[i]);
}
element.init();
+ layer.close(loading2)
}
}
@@ -1362,6 +1401,8 @@
end: function () {
let gid = gidItem.value;
if (gid !== '') {
+ let loading2 = layer.open({ type: 3, shade: [0.25, '#000'], icon: 2, speed: 0});
+
let req = {};
req.gid = gid;
req.type = "in";
@@ -1387,6 +1428,7 @@
childNodes[i].remove()
}
}
+ layer.close(loading2)
})
} else {
let childNodes = parent.childNodes;
@@ -1403,7 +1445,7 @@
CoverpageForGroup(pid, data[i]);
}
element.init();
-
+ layer.close(loading2)
}
}
})
@@ -1431,6 +1473,7 @@
if (gname !== '') {
+ let loading2 = layer.open({ type: 3, shade: [0.25, '#000'], icon: 2, speed: 0});
var req = {};
req.gname = gname;
@@ -1456,6 +1499,7 @@
childNodes[i].remove()
}
}
+ layer.close(loading2)
});
} else if (d.count === 0) {
// 如果当前组合名称不存在
@@ -1472,6 +1516,7 @@
childNodes[i].remove()
}
}
+ layer.close(loading2)
});
} else {
// 正常
@@ -1491,6 +1536,7 @@
CoverpageForGroup(pid, data[i]);
}
element.init();
+ layer.close(loading2)
}
}
@@ -1504,6 +1550,7 @@
childNodes[i].remove()
}
}
+ layer.close(loading2)
}
};
@@ -1527,6 +1574,8 @@
var result = res.resultStr;//当needResult为1时返回处理结果
var req = {};
req.qrCode = result;
+ let loading2 = layer.open({ type: 3, shade: [0.25, '#000'], icon: 2, speed: 0});
+
$.ajax({
url: "/material/qywxApplicationOutScanQrCode",
type: "post",
@@ -1595,6 +1644,7 @@
materialName.value = data.mname;
materialId.value = data.id;
materialCode.value = data.code;
+ layer.close(loading2)
}
})
}
diff --git a/target/classes/templates/pages/application/application-in.html b/target/classes/templates/pages/application/application-in.html
index 3cf4a793..4d91f477 100644
--- a/target/classes/templates/pages/application/application-in.html
+++ b/target/classes/templates/pages/application/application-in.html
@@ -413,6 +413,11 @@
// 用于卡片编号
var NewIdNumber = 1;
+
+ // 用于标志当前表单是否第一次提交
+ let flagForForm = false;
+ let GroupflagForForm = false;
+
// 用于暂存卡片个数(组合)
var params2 = [];
layui.use(['form', 'step', 'flow', 'laydate', 'element'], function () {
@@ -449,92 +454,100 @@
// 用于提交操作
form.on('submit(formStep)', function (data) {
- data = data.field;
- data.type = 1;
- data.params = params;
- $.ajax({
- url: "/depositoryRecord/applicationIn",
- type: 'post',
- dataType: 'json',
- contentType: "application/json;charset=utf-8",
- data: JSON.stringify(data),
- beforeSend: function () {
- this.layerIndex = layer.load(0, {shade: [0.5, '#393D49']});
- },
- success: function (data) {
- layer.close(this.layerIndex);
- if (data.status >= 300) {
- var d = data.data;
- if (d === "") {
- layer.msg(data.statusInfo.detail);
- } else {
- var err = d["err"];
- var success = d["success"];
- var errMsg = "";
- for (let i = 0; i < err.length; i++) {
- errMsg += "物料编码: ";
- errMsg += err[i]["code"];
- }
- if (err.length > 0) {
- errMsg += "添加失败,请选择新仓库或库位";
- layer.msg(errMsg, {
- icon: 5,
- time: 1000
- }, function () {
- step.next('#stepForm');
- });
+ if(!flagForForm){
+ flagForForm = true;
+ data = data.field;
+ data.type = 1;
+ data.params = params;
+ $.ajax({
+ url: "/depositoryRecord/applicationIn",
+ type: 'post',
+ dataType: 'json',
+ contentType: "application/json;charset=utf-8",
+ data: JSON.stringify(data),
+ beforeSend: function () {
+ this.layerIndex = layer.load(0, {shade: [0.5, '#393D49']});
+ },
+ success: function (data) {
+ layer.close(this.layerIndex);
+ if (data.status >= 300) {
+ var d = data.data;
+ if (d === "") {
+ layer.msg(data.statusInfo.detail);
} else {
- step.next('#stepForm');
+ var err = d["err"];
+ var success = d["success"];
+ var errMsg = "";
+ for (let i = 0; i < err.length; i++) {
+ errMsg += "物料编码: ";
+ errMsg += err[i]["code"];
+ }
+ if (err.length > 0) {
+ errMsg += "添加失败,请选择新仓库或库位";
+ layer.msg(errMsg, {
+ icon: 5,
+ time: 1000
+ }, function () {
+ step.next('#stepForm');
+ });
+ } else {
+ step.next('#stepForm');
+ }
}
- }
- } else {
- layer.msg("申请提交成功", {
- icon: 6,//成功的表情
- time: 500 //1秒关闭(如果不配置,默认是3秒)
- }, function () {
- step.next('#stepForm');
- });
+ } else {
+ layer.msg("申请提交成功", {
+ icon: 6,//成功的表情
+ time: 500 //1秒关闭(如果不配置,默认是3秒)
+ }, function () {
+ step.next('#stepForm');
+ });
+ }
+ },
+ complete: function () {
+ layer.close(this.layerIndex);
}
- },
- complete: function () {
- layer.close(this.layerIndex);
- }
- });
+ });
+ }
+
return false;
});
// 用于提交操作(组合)
form.on('submit(formStep2)', function (data) {
- data = data.field;
- data.type = 1;
- data.params = params2;
- $.ajax({
- url: "/group/applicationInForGroup",
- type: 'post',
- dataType: 'json',
- contentType: "application/json;charset=utf-8",
- data: JSON.stringify(data),
- beforeSend: function () {
- this.layerIndex = layer.load(0, {shade: [0.5, '#393D49']});
- },
- success: function (d) {
- layer.close(this.layerIndex);
- if (d.status >= 300) {
- layer.msg(d.statusInfo.detail);//失败的表情
-
- } else {
- layer.msg("申请提交成功", {
- icon: 6,//成功的表情
- time: 500 //1秒关闭(如果不配置,默认是3秒)
- }, function () {
- step.next('#stepForm2');
- });
+ if(!GroupflagForForm){
+ GroupflagForForm = true;
+ data = data.field;
+ data.type = 1;
+ data.params = params2;
+ $.ajax({
+ url: "/group/applicationInForGroup",
+ type: 'post',
+ dataType: 'json',
+ contentType: "application/json;charset=utf-8",
+ data: JSON.stringify(data),
+ beforeSend: function () {
+ this.layerIndex = layer.load(0, {shade: [0.5, '#393D49']});
+ },
+ success: function (d) {
+ layer.close(this.layerIndex);
+ if (d.status >= 300) {
+ layer.msg(d.statusInfo.detail);//失败的表情
+
+ } else {
+ layer.msg("申请提交成功", {
+ icon: 6,//成功的表情
+ time: 500 //1秒关闭(如果不配置,默认是3秒)
+ }, function () {
+ step.next('#stepForm2');
+ });
+ }
+ },
+ complete: function () {
+ layer.close(this.layerIndex);
}
- },
- complete: function () {
- layer.close(this.layerIndex);
- }
- });
+ });
+ }
+
});
$('.pre').click(function () {
@@ -700,6 +713,8 @@
req.code = code;
req.type = "in";
if(code !== ""){
+ // 展示遮盖层
+ let loading2 = layer.open({ type: 3, shade: [0.25, '#000'], icon: 2, speed: 0});
$.ajax({
url: "/material/findMatrialByCode",
type: "get",
@@ -710,15 +725,21 @@
var d = d.data;
var idNumber = materialId.name.split("mid")[1];
if (d == null) {
- layer.msg("没有该编码,请确认是否输入正确");
- materialName.value = "";
- materialId.value = "";
- obj.value = "";
- $("#barCode" + idNumber).empty();
- $("#unit" + idNumber).empty();
- form.render();
+ layer.msg("没有该编码,请确认是否输入正确",{
+ icon:0,
+ time:500
+ },function () {
+ layer.close(loading2)
+ materialName.value = "";
+ materialId.value = "";
+ obj.value = "";
+ $("#barCode" + idNumber).empty();
+ $("#unit" + idNumber).empty();
+ form.render();
+ });
} else {
+
materialName.value = d.mname;
materialId.value = d.mid;
// 获取物料与条形码的对应关系
@@ -761,9 +782,11 @@
if (shelfLife !== null && shelfLife !== undefined) {
$("#" + "producedDateItem" + idNumber).show();
$("#" + "producedDate" + idNumber).attr("lay-verify", "required");
- } else {
+ }
+ else {
$("#" + "producedDateItem" + idNumber).hide();
}
+ layer.close(loading2)
}
}
});
@@ -810,6 +833,7 @@
end: function () {
var mid = materialId.value;
if (mid !== '') {
+ let loading2 = layer.open({ type: 3, shade: [0.25, '#000'], icon: 2, speed: 0});
$.ajax({
url: "/material/findMatrialById?mid=" + mid,
type: "get",
@@ -859,6 +883,7 @@
$("#unit" + idNumber).append(new Option(unitList[i].newUnit, unitList[i].newUnit));
}
form.render();
+ layer.close(loading2)
}
});
}
@@ -883,6 +908,7 @@
var req = {};
data = data.split(",")[0];
if(data !== ""){
+ let loading2 = layer.open({ type: 3, shade: [0.25, '#000'], icon: 2, speed: 0});
req.mname = data;
$.ajax({
url: "/material/findMaterialByCondition",
@@ -892,15 +918,25 @@
contentType: "application/json;charset=utf-8",
success: function (d) {
if (d.count > 1) {
- layer.msg("请点击右侧搜索确定物品");
- materialId.value = "";
- codeValue.value = "";
+ layer.msg("请点击右侧搜索确定物品",{
+ icon:0,
+ time:500
+ },function () {
+ materialId.value = "";
+ codeValue.value = "";
+ layer.close(loading2)
+ });
return false;
} else if (d.count === 0) {
- layer.msg("没有该物品,请确认输入是否正确");
- materialId.value = "";
- codeValue.value = "";
- materialName.value = "";
+ layer.msg("没有该物品,请确认输入是否正确",{
+ icon:5,
+ time:500
+ },function() {
+ materialId.value = "";
+ codeValue.value = "";
+ materialName.value = "";
+ layer.close(loading2)
+ });
return false;
} else {
var idNumber = materialId.name.split("mid")[1];
@@ -923,6 +959,7 @@
for (let i = 0; i < unitList.length; i++) {
$("#unit" + idNumber).append(new Option(unitList[i].newUnit, unitList[i].newUnit));
}
+ layer.close(loading2)
form.render();
}
@@ -952,6 +989,7 @@
req.qrCode = result;
req.codeFlag = 2;
$("#qrCode" + obj.id.split("qrCodeImg")[1]).val(result);
+ let loading2 = layer.open({ type: 3, shade: [0.25, '#000'], icon: 2, speed: 0});
$.ajax({
url: "/material/qywxApplicationInScanQrCode",
type: "post",
@@ -980,6 +1018,7 @@
icon: 0,
time: 1000 //0.5秒关闭(如果不配置,默认是3秒)
}, function () {
+ layer.close(loading2)
})
} else {
var code = data.code;
@@ -1029,6 +1068,7 @@
for (let i = 0; i < unitList.length; i++) {
$("#unit" + idNumber).append(new Option(unitList[i].newUnit, unitList[i].newUnit));
}
+ layer.close(loading2)
form.render();
}
@@ -1061,6 +1101,7 @@
var req = {};
req.qrCode = result;
req.codeFlag = 1;
+ let loading2 = layer.open({ type: 3, shade: [0.25, '#000'], icon: 2, speed: 0});
$.ajax({
url: "/material/qywxApplicationInScanBarCode",
type: "post",
@@ -1113,14 +1154,17 @@
for (let i = 0; i < unitList.length; i++) {
$("#unit" + idNumber).append(new Option(unitList[i].newUnit, unitList[i].newUnit));
}
+ layer.close(loading2)
form.render();
- } else {
+ }
+ else {
// 如果没有对应关系
layer.msg("对于编码:" + result + ",并未发现对应的物料", {
icon: 0,
time: 1000 //0.5秒关闭(如果不配置,默认是3秒)
}, function () {
+ layer.close(loading2)
})
}
}
@@ -1203,6 +1247,7 @@
var result = res.resultStr;//当needResult为1时返回处理结果
var req = {};
req.qrCode = result;
+ let loading2 = layer.open({ type: 3, shade: [0.25, '#000'], icon: 2, speed: 0});
$.ajax({
url: "/place/qywxApplicationInScanQrCode",
type: "post",
@@ -1221,6 +1266,8 @@
layer.msg("并未查询到对应位置,请重新扫描",{
icon:0,
time:1000
+ },function () {
+ layer.close(loading2)
});
} else if (flag === 1) {
// 如果获取到的是库位
@@ -1228,6 +1275,7 @@
placeId.value = place.id;
depositoryId.value = place.did;
depositoryName.value = place.depositoryName;
+ layer.close(loading2)
} else if (flag === 2) {
// 如果获取到的是仓库
@@ -1235,6 +1283,7 @@
placeId.value = "0";
depositoryId.value = depository.id;
depositoryName.value = depository.dname;
+ layer.close(loading2)
}
}
})
@@ -1260,6 +1309,7 @@
let req = {};
if(code !== ""){
req.code = code;
+ let loading2 = layer.open({ type: 3, shade: [0.25, '#000'], icon: 2, speed: 0});
$.ajax({
url: "/group/findGroupByCodeForIn",
type: "post",
@@ -1282,6 +1332,7 @@
childNodes[i].remove()
}
}
+ layer.close(loading2)
})
} else {
let childNodes = parent.childNodes;
@@ -1299,6 +1350,7 @@
CoverpageForGroup(pid, data[i]);
}
element.init();
+ layer.close(loading2)
}
}
@@ -1349,6 +1401,8 @@
end: function () {
let gid = gidItem.value;
if (gid !== '') {
+ let loading2 = layer.open({ type: 3, shade: [0.25, '#000'], icon: 2, speed: 0});
+
let req = {};
req.gid = gid;
req.type = "in";
@@ -1374,6 +1428,7 @@
childNodes[i].remove()
}
}
+ layer.close(loading2)
})
} else {
let childNodes = parent.childNodes;
@@ -1390,7 +1445,7 @@
CoverpageForGroup(pid, data[i]);
}
element.init();
-
+ layer.close(loading2)
}
}
})
@@ -1418,6 +1473,7 @@
if (gname !== '') {
+ let loading2 = layer.open({ type: 3, shade: [0.25, '#000'], icon: 2, speed: 0});
var req = {};
req.gname = gname;
@@ -1443,6 +1499,7 @@
childNodes[i].remove()
}
}
+ layer.close(loading2)
});
} else if (d.count === 0) {
// 如果当前组合名称不存在
@@ -1459,6 +1516,7 @@
childNodes[i].remove()
}
}
+ layer.close(loading2)
});
} else {
// 正常
@@ -1478,6 +1536,7 @@
CoverpageForGroup(pid, data[i]);
}
element.init();
+ layer.close(loading2)
}
}
@@ -1491,6 +1550,7 @@
childNodes[i].remove()
}
}
+ layer.close(loading2)
}
};
@@ -1514,6 +1574,8 @@
var result = res.resultStr;//当needResult为1时返回处理结果
var req = {};
req.qrCode = result;
+ let loading2 = layer.open({ type: 3, shade: [0.25, '#000'], icon: 2, speed: 0});
+
$.ajax({
url: "/material/qywxApplicationOutScanQrCode",
type: "post",
@@ -1582,6 +1644,7 @@
materialName.value = data.mname;
materialId.value = data.id;
materialCode.value = data.code;
+ layer.close(loading2)
}
})
}
diff --git a/target/classes/templates/pages/application/application-in_back.html b/target/classes/templates/pages/application/application-in_back.html
index bc9bbd97..4b2c27fb 100644
--- a/target/classes/templates/pages/application/application-in_back.html
+++ b/target/classes/templates/pages/application/application-in_back.html
@@ -139,11 +139,14 @@