Browse Source

为一些页面添加遮罩

lwx_dev
erdanergou 3 years ago
parent
commit
bf64894dc8
  1. 29
      src/main/resources/templates/pages/application/application-in_back.html
  2. 34
      src/main/resources/templates/pages/application/application-in_scanQrCode.html
  3. 44
      src/main/resources/templates/pages/application/application-out.html
  4. 33
      src/main/resources/templates/pages/application/application-out_back.html
  5. 5
      src/main/resources/templates/pages/application/application-review.html
  6. 271
      src/main/resources/templates/pages/application/application-transfer.html
  7. 196
      src/main/resources/templates/pages/application/application-transfer_back.html
  8. 53
      src/main/resources/templates/pages/applicationForStorageCenter/application-out.html
  9. 30
      src/main/resources/templates/pages/applicationForStorageCenter/application-out_back.html
  10. 210
      src/main/resources/templates/pages/applicationForStorageCenter/application-out_scanQrCode.html
  11. 7
      target/classes/templates/index.html
  12. 29
      target/classes/templates/pages/application/application-in_back.html
  13. 34
      target/classes/templates/pages/application/application-in_scanQrCode.html
  14. 44
      target/classes/templates/pages/application/application-out.html
  15. 33
      target/classes/templates/pages/application/application-out_back.html
  16. 5
      target/classes/templates/pages/application/application-review.html
  17. 271
      target/classes/templates/pages/application/application-transfer.html
  18. 196
      target/classes/templates/pages/application/application-transfer_back.html

29
src/main/resources/templates/pages/application/application-in_back.html

@ -162,6 +162,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",
@ -171,13 +173,18 @@
success: function (d) {
var d = d.data;
if(d == null){
layer.msg("没有该编码,请确认是否输入正确");
layer.msg("没有该编码,请确认是否输入正确",{icon:5,time:500},function () {
layer.close(loading2);
$("#openSonByMaterial").val("");
$("#mid").val("");
$("#code").val("");
});
}else{
$("#openSonByMaterial").val(d.mname);
$("#mid").val(d.id);
layer.close(loading2);
}
}
});
@ -189,6 +196,8 @@
var data = $(this).val();
var req = {};
req.mname = data;
if(data !== ""){
let loading2 = layer.open({ type: 3, shade: [0.25, '#000'], icon: 2, speed: 0});
$.ajax({
url: "/material/findMaterialByCondition",
type: "post",
@ -197,15 +206,21 @@
contentType: "application/json;charset=utf-8",
success: function (d) {
if(d.count > 1){
layer.msg("请点击右侧搜索确定物品");
layer.msg("请点击右侧搜索确定物品",{icon:0,time:500},function () {
$("#mid").val("");
$("#code").val("");
layer.close(loading2)
});
return false;
}else if(d.count === 0){
layer.msg("没有该物品,请确认输入是否正确");
layer.msg("没有该物品,请确认输入是否正确",{icon:5,time:500},function () {
$("#mid").val("");
$("#code").val("");
$("#openSonByMaterial").val("");
layer.close(loading2)
});
return false;
}
else{
@ -213,9 +228,12 @@
$("#openSonByMaterial").val(material.mname)
$("#mid").val(material.id);
$("#code").val(material.code);
layer.close(loading2)
}
}
});
}
})
$('#openSonByDepository').on('click', function () {
@ -255,6 +273,8 @@
content: '/getMaterialAll?mname=' + mname + '&type=1',
end: function () {
var mid = $("#mid").val();
let loading2 = layer.open({ type: 3, shade: [0.25, '#000'], icon: 2, speed: 0});
$.ajax({
url: "/material/findMatrialById?mid=" + mid,
type: "get",
@ -265,7 +285,8 @@
if(code === undefined){
code = "";
}
$("#code").val(code)
$("#code").val(code);
layer.close(loading2)
}
});

34
src/main/resources/templates/pages/application/application-in_scanQrCode.html

@ -622,6 +622,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",
@ -632,12 +634,15 @@
var d = d.data;
var idNumber = materialId.name.split("mid")[1];
if (d == null) {
layer.msg("没有该编码,请确认是否输入正确");
layer.msg("没有该编码,请确认是否输入正确",{icon:5,time:500},function () {
materialName.value = "";
materialId.value = "";
obj.value = "";
$("#barCode" + idNumber).remove();
form.render();
layer.close(loading2)
});
} else {
materialName.value = d.mname;
materialId.value = d.id;
@ -672,12 +677,14 @@
$.each(materialAndBarCodeList, function (index, item) {
$("#barCode" + idNumber).append(new Option(item.bmcode, item.id));//往下拉菜单里添加元素
});
layer.close(loading2)
form.render();
} else {
var barCode = $("#barCode" + idNumber);
if (barCode.length > 0) {
barCode.empty();
}
layer.close(loading2)
}
}
}
@ -726,6 +733,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",
@ -774,6 +782,7 @@
$("#unit" + idNumber).append(new Option(unitList[i].newUnit, unitList[i].newUnit));
}
form.render();
layer.close(loading2)
}
});
}
@ -800,6 +809,7 @@
data = data.split(",")[0];
if(data !== ""){
req.mname = data;
let loading2 = layer.open({ type: 3, shade: [0.25, '#000'], icon: 2, speed: 0});
$.ajax({
url: "/material/findMaterialByCondition",
type: "post",
@ -808,15 +818,20 @@
contentType: "application/json;charset=utf-8",
success: function (d) {
if (d.count > 1) {
layer.msg("请点击右侧搜索确定物品");
layer.msg("请点击右侧搜索确定物品",{icon:0,time:500},function () {
materialId.value = "";
codeValue.value = "";
layer.close(loading2)
});
return false;
} else if (d.count === 0) {
layer.msg("没有该物品,请确认输入是否正确");
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];
@ -841,7 +856,7 @@
$("#unit" + idNumber).append(new Option(unitList[i].newUnit, unitList[i].newUnit));
}
form.render();
layer.close(loading2)
}
}
});
@ -859,6 +874,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: "/material/qywxApplicationInScanBarCode",
type: "post",
@ -910,12 +926,14 @@
$("#unit" + idNumber).append(new Option(unitList[i].newUnit, unitList[i].newUnit));
}
form.render();
layer.close(loading2);
}
else{
layer.msg("对于编码:" + result + ",并未发现对应的物料", {
icon: 0,
time: 1000 //0.5秒关闭(如果不配置,默认是3秒)
}, function () {
layer.close(loading2)
})
}
}
@ -967,6 +985,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: "/material/qywxApplicationInScanQrCode",
type: "post",
@ -996,6 +1015,7 @@
icon: 0,
time: 1000 //0.5秒关闭(如果不配置,默认是3秒)
}, function () {
layer.close(loading2)
})
} else {
@ -1039,6 +1059,7 @@
$("#unit" + idNumber).append(new Option(unitList[i].newUnit, unitList[i].newUnit));
}
form.render();
layer.close(loading2)
}
}
})
@ -1057,6 +1078,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",
@ -1075,6 +1097,8 @@
layer.msg("并未查询到对应位置,请重新扫描",{
icon:0,
time:1000
},function () {
layer.close(loading2)
});
} else if (flag === 1) {
// 如果获取到的是库位
@ -1082,6 +1106,7 @@
placeId.value = place.id;
depositoryId.value = place.did;
depositoryName.value = place.depositoryName;
layer.close(loading2)
} else if (flag === 2) {
// 如果获取到的是仓库
@ -1089,6 +1114,7 @@
placeId.value = "0";
depositoryId.value = depository.id;
depositoryName.value = depository.dname;
layer.close(loading2)
}
}
})

44
src/main/resources/templates/pages/application/application-out.html

@ -778,6 +778,7 @@
req.code = code;
req.type = "out";
if (code !== "") {
let loading2 = layer.open({ type: 3, shade: [0.25, '#000'], icon: 2, speed: 0});
$.ajax({
url: "/material/findMatrialByCode",
type: "get",
@ -787,11 +788,13 @@
success: function (d) {
var d = d.data;
if (d == null) {
layer.msg("仓库中暂无该物料");
layer.msg("仓库中暂无该物料",{icon:5,time:500},function () {
materialName.value = "";
materialId.value = "";
obj.value = "";
$('#place' + objId).empty();
layer.close(loading2)
});
} else {
materialName.value = d.mname;
@ -828,11 +831,13 @@
$("#barCode" + idNumber).append(new Option(item.bmcode, item.id));//往下拉菜单里添加元素
});
form.render();
layer.close(loading2)
} else {
var barCode = $("#barCode" + idNumber);
if (barCode.length > 0) {
barCode.empty();
}
layer.close(loading2)
}
}
}
@ -859,6 +864,7 @@
let req = {};
req.code = code;
if (code !== "") {
let loading2 = layer.open({ type: 3, shade: [0.25, '#000'], icon: 2, speed: 0});
$.ajax({
url: "/group/findGroupByCode",
type: "post",
@ -881,6 +887,7 @@
childNodes[i].remove()
}
}
layer.close(loading2)
})
} else {
let childNodes = parent.childNodes;
@ -890,6 +897,7 @@
childNodes[i].remove()
}
}
layer.close(loading2)
}
// 赋值给gname
gnameItem.value = data[0].gname;
@ -898,7 +906,7 @@
CoverpageForGroup(pid, data[i]);
}
element.init();
layer.close(loading2)
}
}
});
@ -942,6 +950,7 @@
iframeChildren.css('height', '100%');
},
end: function () {
let loading2 = layer.open({ type: 3, shade: [0.25, '#000'], icon: 2, speed: 0});
var mid = materialId.value;
if (mid !== '') {
$.ajax({
@ -993,6 +1002,7 @@
barCode.empty();
}
}
layer.close(loading2);
form.render();
}
});
@ -1043,6 +1053,7 @@
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;
$.ajax({
@ -1067,6 +1078,7 @@
childNodes[i].remove()
}
}
layer.close(loading2)
})
} else {
let childNodes = parent.childNodes;
@ -1083,7 +1095,7 @@
CoverpageForGroup(pid, data[i]);
}
element.init();
layer.close(loading2)
}
}
})
@ -1111,7 +1123,7 @@
if (gname !== '') {
let loading2 = layer.open({ type: 3, shade: [0.25, '#000'], icon: 2, speed: 0});
var req = {};
req.gname = gname;
$.ajax({
@ -1136,6 +1148,7 @@
childNodes[i].remove()
}
}
layer.close(loading2);
});
} else if (d.count === 0) {
// 如果当前组合名称不存在
@ -1152,6 +1165,7 @@
childNodes[i].remove()
}
}
layer.close(loading2);
});
} else {
// 正常
@ -1171,6 +1185,7 @@
CoverpageForGroup(pid, data[i]);
}
element.init();
layer.close(loading2);
}
}
@ -1184,6 +1199,7 @@
childNodes[i].remove()
}
}
layer.close(loading2);
}
};
@ -1207,6 +1223,7 @@
data = data.split(",")[0];
if (data !== "") {
req.mname = data;
let loading2 = layer.open({ type: 3, shade: [0.25, '#000'], icon: 2, speed: 0});
$.ajax({
url: "/material/findInventoryByCondition",
type: "post",
@ -1215,15 +1232,19 @@
contentType: "application/json;charset=utf-8",
success: function (d) {
if (d.count > 1) {
layer.msg("请点击右侧搜索确定物品");
layer.msg("请点击右侧搜索确定物品",{icon:0,time:500},function () {
layer.close(loading2);
materialId.value = "";
codeValue.value = "";
});
return false;
} else if (d.count === 0) {
layer.msg("没有该物品,请确认输入是否正确");
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];
@ -1269,6 +1290,7 @@
materialName.value = material.mname;
materialId.value = material.id;
codeValue.value = material.code;
layer.close(loading2);
}
}
});
@ -1295,6 +1317,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/qywxApplicationOutScanBarCode",
type: "post",
@ -1336,12 +1359,14 @@
$("#unit" + idNumber).append(new Option(unitList[i].newUnit, unitList[i].newUnit));
}
form.render();
layer.close(loading2);
} else {
// 如果没有对应关系
layer.msg("对于编码:" + result + ",并未发现仓库中存在对应的物料", {
icon: 0,
time: 1000 //0.5秒关闭(如果不配置,默认是3秒)
}, function () {
layer.close(loading2);
})
}
@ -1370,6 +1395,7 @@
var req = {};
req.qrCode = result;
req.codeFlag = 2;
let loading2 = layer.open({ type: 3, shade: [0.25, '#000'], icon: 2, speed: 0});
$.ajax({
url: "/material/qywxApplicationOutScanQrCode",
type: "post",
@ -1383,6 +1409,7 @@
icon: 0,
time: 1000 //0.5秒关闭(如果不配置,默认是3秒)
}, function () {
layer.close(loading2);
})
} else {
// 获取对应元素
@ -1447,6 +1474,7 @@
materialName.value = data.mname;
materialId.value = data.id;
materialCode.value = data.code;
layer.close(loading2);
}
}
})
@ -1508,6 +1536,7 @@
var req = {};
req.gid = gid;
req.quantity = val;
let loading2 = layer.open({ type: 3, shade: [0.25, '#000'], icon: 2, speed: 0});
$.ajax({
url: "/group/groupQuantityIsTrue",
type: "post",
@ -1522,9 +1551,12 @@
icon: 0,
time: 1000
}, function () {
layer.close(loading2);
$("#quantityForGroup" + id).val("");
});
}else{
layer.close(loading2);
}
}
});

33
src/main/resources/templates/pages/application/application-out_back.html

@ -159,7 +159,8 @@
var req = {};
req.code = code;
req.type = "out";
if(code !== ""){
if (code !== "") {
let loading2 = layer.open({type: 3, shade: [0.25, '#000'], icon: 2, speed: 0});
$.ajax({
url: "/material/findMatrialByCode",
type: "get",
@ -169,9 +170,12 @@
success: function (d) {
var d = d.data;
if (d == null) {
layer.msg("没有该编码,请确认是否输入正确");
layer.msg("没有该编码,请确认是否输入正确", {icon: 0, time: 500}, function () {
$("#mname").val("");
$("#mid").val("");
layer.close(loading2);
});
} else {
req.mid = d.id;
let unitItem = $("#unit");
@ -183,6 +187,7 @@
$("#mname").val(d.mname);
$("#mid").val(d.id);
form.render();
layer.close(loading2);
}
}
})
@ -194,6 +199,8 @@
var data = $(this).val();
var req = {};
req.mname = data;
if (data !== "") {
let loading2 = layer.open({type: 3, shade: [0.25, '#000'], icon: 2, speed: 0});
$.ajax({
url: "/material/findInventoryByCondition",
type: "post",
@ -202,14 +209,19 @@
contentType: "application/json;charset=utf-8",
success: function (d) {
if (d.count > 1) {
layer.msg("请点击右侧搜索确定物品");
layer.msg("请点击右侧搜索确定物品", {icon: 0, time: 500}, function () {
$("#mid").val("");
$("#code").val("");
layer.close(loading2);
});
return false;
} else if (d.count === 0) {
layer.msg("没有该物品,请确认输入是否正确");
layer.msg("没有该物品,请确认输入是否正确", {icon: 0, time: 500}, function () {
layer.close(loading2);
$("#mid").val("");
$("#code").val("");
});
return false;
} else {
var material = d.data[0];
@ -222,9 +234,12 @@
$("#unit").append(new Option(item.newUnit, item.newUnit));
});
form.render();
layer.close(loading2);
}
}
});
}
});
$('#openSonByDepository').on('click', function () {
@ -271,6 +286,7 @@
},
end: function () {
var mid = $("#mid").val();
let loading2 = layer.open({ type: 3, shade: [0.25, '#000'], icon: 2, speed: 0});
$.ajax({
url: "/material/findMatrialById?mid=" + mid,
type: "get",
@ -288,7 +304,7 @@
$("#unit").append(new Option(item.newUnit, item.newUnit));
});
form.render();
layer.close(loading2);
}
});
@ -310,7 +326,7 @@
form.on('submit(formStep)', function (data) {
if(!flagForForm){
if (!flagForForm) {
flagForForm = true;
data = data.field;
var params = [];
@ -376,6 +392,7 @@
req.quantity = val;
req.unit = unit;
req.placeId = -1;
let loading2 = layer.open({ type: 3, shade: [0.25, '#000'], icon: 2, speed: 0});
$.ajax({
url: "/material/MaterialQuantityIsTrue",
type: "post",
@ -387,8 +404,10 @@
if (!flag) { // 如果当前数目不合适
layer.msg("当前单仓库中物料数量不足", {icon: 0, time: 500}, function () {
$("#quantity").val("");
layer.close(loading2);
});
}else{
layer.close(loading2);
}
}
});

5
src/main/resources/templates/pages/application/application-review.html

@ -240,7 +240,7 @@
flagForForm = true;
let data = {};
data.id = $("#id").text();
if (pass == 1) {
if (pass === 1) {
data.departmentheadPass = 1;
} else {
data.departmentheadPass = 2;
@ -248,14 +248,13 @@
data.departmentheadMessage = $("#departmentheadMessageF").val();
send(data);
}
};
check = function (pass) {
if(!flagForForm) {
flagForForm = true;
let data = {};
data.id = $("#id").text();
if (pass == 1) {
if (pass === 1) {
data.depositoryManagerPass = 1;
} else {
data.depositoryManagerPass = 2;

271
src/main/resources/templates/pages/application/application-transfer.html

@ -12,31 +12,39 @@
</head>
<body>
<style>
.inputdiv{
display:flex;background-color: #fff;height: 38px;line-height: 38px;border: 1px solid rgb(238, 238, 238);
.inputdiv {
display: flex;
background-color: #fff;
height: 38px;
line-height: 38px;
border: 1px solid rgb(238, 238, 238);
}
.layui-form-label{
.layui-form-label {
padding: 9px 0px;
text-align: left;
}
.layui-input-block{
.layui-input-block {
margin-left: 80px;
}
.layui-form-select{
.layui-form-select {
width: 100%;
}
.layui-card-body{
.layui-card-body {
padding: 10px 5px;
}
.lay-step{
.lay-step {
display: none;
}
</style>
<div class="layuimini-container">
<div class="layuimini-main">
<div class="layui-fluid">
<!-- 库存转移申请-->
<!-- 库存转移申请-->
<div class="layui-carousel" id="stepForm" lay-filter="stepForm" style="margin: 0 auto;">
<div carousel-item style="overflow: inherit">
@ -45,18 +53,21 @@
<div class="layui-card" id="cardParent">
<div class="layui-card-body" id="cardItem">
<hr>
<i class="layui-icon layui-icon-subtraction" style="display: inline" onclick="deleteItem(this)"></i>
<i class="layui-icon layui-icon-subtraction" style="display: inline"
onclick="deleteItem(this)"></i>
<div class="layui-form-item">
<label class="layui-form-label" style="height: 40px;">物料名称:</label>
<div class="layui-input-block">
<div class="inputdiv">
<input type="text" placeholder="请选择物料" class="layui-input" style="border-style: none"
<input type="text" placeholder="请选择物料" class="layui-input"
style="border-style: none"
id="openSonByMaterial" onblur="selectMaterialByName(this)"
lay-verify="required"/>
<i class="layui-icon layui-icon-search" style="display: inline" id="selectMaterial" onclick="selectMaterial(this)"></i>
<i class="layui-icon layui-icon-search" style="display: inline"
id="selectMaterial" onclick="selectMaterial(this)"></i>
</div>
<input type="text" name="mid" class="layui-input" id="mid"
style="display: none" lay-verify="required" />
style="display: none" lay-verify="required"/>
</div>
</div>
@ -81,7 +92,8 @@
value=""
class="layui-input"
style="border-style: none">
<img src="/static/images/search.ico" height="16" width="16" id="barCodeImg"
<img src="/static/images/search.ico" height="16" width="16"
id="barCodeImg"
style="margin-top: 10px" onclick="scanBarCode(this)">
</div>
</div>
@ -95,7 +107,9 @@
<div class="layui-form-item">
<label class="layui-form-label">物料数量:</label>
<div class="layui-input-block">
<input id="quantity" name="quantity" type="number" onblur="MaterialQuantityIsTrue(this)" placeholder="请填写入物料数量" value="" class="layui-input" lay-verify="number" required>
<input id="quantity" name="quantity" type="number"
onblur="MaterialQuantityIsTrue(this)" placeholder="请填写入物料数量" value=""
class="layui-input" lay-verify="number" required>
</div>
</div>
<div class="layui-form-item">
@ -110,10 +124,13 @@
<label class="layui-form-label" style="height: 40px;">仓库:</label>
<div class="layui-input-block">
<div class="inputdiv">
<input type="text" placeholder="请选择仓库" class="layui-input" style="border-style: none"
id="openSonByDepository" readonly onclick="openDepositoryTree(this)"
<input type="text" placeholder="请选择仓库" class="layui-input"
style="border-style: none"
id="openSonByDepository" readonly
onclick="openDepositoryTree(this)"
lay-verify="required"/>
<input type="text" name="depositoryId" class="layui-input" id="depositoryId"
<input type="text" name="depositoryId" class="layui-input"
id="depositoryId"
style="display: none" lay-verify="required"/>
<input type="text" name="placeId" class="layui-input" id="placeId"
style="display: none" lay-verify="required"/>
@ -126,15 +143,18 @@
<div class="layui-form-item">
<label class="layui-form-label">备注说明:</label>
<div class="layui-input-block">
<input name="applyRemark" placeholder="请填写相关原因及申请原因" value="" class="layui-input"/>
<input name="applyRemark" placeholder="请填写相关原因及申请原因" value=""
class="layui-input"/>
</div>
</div>
<i class="layui-icon layui-icon-addition" style="display: inline" onclick="addItem(this)"></i>
<i class="layui-icon layui-icon-addition" style="display: inline"
onclick="addItem(this)"></i>
</div>
<!-- 提交-->
<div class="layui-form-item" id="btn_sub">
<div class="layui-input-block">
<button class="layui-btn" lay-submit lay-filter="formStep" style="margin-bottom: 10px;margin-left: 15%">
<button class="layui-btn" lay-submit lay-filter="formStep"
style="margin-bottom: 10px;margin-left: 15%">
&emsp;提交&emsp;
</button>
</div>
@ -167,17 +187,29 @@
<script src="/static/js/lay-config.js?v=1.0.4" charset="utf-8"></script>
<script>
// 用于添加标签
function addItem(obj){}
function addItem(obj) {
}
// 用于删除标签
function deleteItem(obj){}
function deleteItem(obj) {
}
// 用于编码查询
function selectCode(obj){}
function selectCode(obj) {
}
// 用于点击搜索按钮
function selectMaterial(obj){}
function selectMaterial(obj) {
}
// 用于物料名称查询
function selectMaterialByName(obj){}
function selectMaterialByName(obj) {
}
// 用于加载仓库菜单
function openDepositoryTree(obj){}
function openDepositoryTree(obj) {
}
// 用于扫码转移
function scanCodeByTransfer(obj) {
}
@ -196,6 +228,7 @@
function scanLocationByQrCode() {
}
// 用于暂存卡片个数
var params = [];
let scanValue = {};
@ -203,7 +236,7 @@
var NewIdNumber = 1;
// 用于标志是否为第一次提交
let flagForForm = false;
layui.use([ 'form', 'step','layer','jquery'], function () {
layui.use(['form', 'step', 'layer', 'jquery'], function () {
var $ = layui.$,
form = layui.form,
step = layui.step;
@ -223,17 +256,17 @@
form.on('submit(formStep)', function (data) {
if(!flagForForm){
if (!flagForForm) {
flagForForm = true;
data=data.field;
data = data.field;
data.params = params;
if(data.mid === undefined){
if (data.mid === undefined) {
// 如果没有初始项
var dataKeys = Object.keys(data);
var dataKey;
for (let i = 0; i < dataKeys.length; i++) {
dataKey = dataKeys[i];
if(dataKey.includes("mid")){
if (dataKey.includes("mid")) {
break;
}
}
@ -241,33 +274,33 @@
var keyNumber = dataKey.split("mid")[1];
for (let index = 0; index < dataKeys.length; index++) {
var tempKey = dataKeys[index];
if(tempKey.includes(keyNumber)){
var key = tempKey.replace(keyNumber,"");
if (tempKey.includes(keyNumber)) {
var key = tempKey.replace(keyNumber, "");
data[key] = data[tempKey];
delete data[tempKey];
}
}
data.params = remove(data.params,Number(keyNumber));
data.params = remove(data.params, Number(keyNumber));
}
$.ajax({
url:"/depositoryRecord/transfer",
type:'put',
dataType:'json',
url: "/depositoryRecord/transfer",
type: 'put',
dataType: 'json',
contentType: "application/json;charset=utf-8",
data:JSON.stringify(data),
beforeSend:function () {
this.layerIndex = layer.load(0, { shade: [0.5, '#393D49'] });
data: JSON.stringify(data),
beforeSend: function () {
this.layerIndex = layer.load(0, {shade: [0.5, '#393D49']});
},
success:function(data){
success: function (data) {
layer.close(this.layerIndex);
if(data.status >= 300){
if (data.status >= 300) {
layer.msg(data.statusInfo.message);//失败的表情
return;
}else{
} else {
layer.msg("申请提交成功", {
icon: 6,//成功的表情
time: 500 //1秒关闭(如果不配置,默认是3秒)
}, function(){
}, function () {
step.next('#stepForm');
});
}
@ -303,7 +336,7 @@
NewIdNumber = NewIdNumber + 1;
// 物料名称栏目
var materialItem = `
<div class="layui-card-body" style="padding-right: 0px" id=`+"cardItem"+NewIdNumber+`>
<div class="layui-card-body" style="padding-right: 0px" id=` + "cardItem" + NewIdNumber + `>
<hr>
<i class="layui-icon layui-icon-subtraction" style="display: inline" onclick="deleteItem(this)"></i>
<div class="layui-form-item">
@ -314,7 +347,7 @@
id="openSonByMaterial" lay-verify="required" onblur="selectMaterialByName(this)"/>
<i class="layui-icon layui-icon-search" style="display: inline" id="selectMaterial" onclick="selectMaterial(this)"></i>
</div>
<input type="text" name=`+"mid"+NewIdNumber+` class="layui-input" id="mid"
<input type="text" name=` + "mid" + NewIdNumber + ` class="layui-input" id="mid"
style="display: none" lay-verify="required" />
</div>
</div>
@ -322,7 +355,7 @@
<label class="layui-form-label">物料编码:</label>
<div class="layui-input-block" style="margin: 0px;">
<div class="inputdiv">
<input id=`+"code"+NewIdNumber+` name=`+"code"+NewIdNumber+` type="text" placeholder="请填写入物料编码" value="" onblur="selectCode(this)"
<input id=` + "code" + NewIdNumber + ` name=` + "code" + NewIdNumber + ` type="text" placeholder="请填写入物料编码" value="" onblur="selectCode(this)"
class="layui-input" lay-verify="required" style="border-style: none">
<img src="/static/images/search.ico" height="16" width="16"
style="margin-top: 10px" onclick="scanCodeByTransfer(this)">
@ -333,9 +366,9 @@
<label class="layui-form-label">条形编码:</label>
<div class="layui-input-block" style="margin: 0px;">
<div class="inputdiv">
<input id=`+"barCode"+NewIdNumber +` name=`+"barCode"+NewIdNumber+` type="text" placeholder="请填写入物料编码" value="" onblur="selectCode(this)"
<input id=` + "barCode" + NewIdNumber + ` name=` + "barCode" + NewIdNumber + ` type="text" placeholder="请填写入物料编码" value="" onblur="selectCode(this)"
class="layui-input" style="border-style: none">
<img src="/static/images/search.ico" height="16" width="16" id=`+"barCodeImg"+NewIdNumber+`
<img src="/static/images/search.ico" height="16" width="16" id=` + "barCodeImg" + NewIdNumber + `
style="margin-top: 10px" onclick="scanBarCode(this)">
</div>
@ -344,20 +377,20 @@
<div class="layui-form-item">
<label class="layui-form-label">所处库位:</label>
<div class="layui-input-block">
<select name=`+"fromPlaceId"+NewIdNumber +` id=`+"place"+NewIdNumber +`></select>
<select name=` + "fromPlaceId" + NewIdNumber + ` id=` + "place" + NewIdNumber + `></select>
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">物料数量:</label>
<div class="layui-input-block">
<input name=`+"quantity"+NewIdNumber+` id=`+"quantity"+NewIdNumber+` type="number" placeholder="请填写入物料数量" value="" onblur="MaterialQuantityIsTrue(this)"
<input name=` + "quantity" + NewIdNumber + ` id=` + "quantity" + NewIdNumber + ` type="number" placeholder="请填写入物料数量" value="" onblur="MaterialQuantityIsTrue(this)"
class="layui-input" lay-verify="number">
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">计量单位:</label>
<div class="layui-input-block">
<select id=`+"unit"+NewIdNumber +` name=`+"unit"+NewIdNumber +`>
<select id=` + "unit" + NewIdNumber + ` name=` + "unit" + NewIdNumber + `>
</select>
</div>
@ -369,9 +402,9 @@
<input type="text" placeholder="请选择仓库" class="layui-input" style="border-style: none"
id="openSonByDepository" readonly onclick="openDepositoryTree(this)"
lay-verify="required"/>
<input type="text" name=`+"depositoryId"+NewIdNumber+` class="layui-input" id="depositoryId"
<input type="text" name=` + "depositoryId" + NewIdNumber + ` class="layui-input" id="depositoryId"
style="display: none" lay-verify="required"/>
<input type="text" name=`+"placeId"+NewIdNumber+` class="layui-input" id="placeId"
<input type="text" name=` + "placeId" + NewIdNumber + ` class="layui-input" id="placeId"
style="display: none" lay-verify="required"/>
<img src="/static/images/search.ico" height="16" width="16"
id="scanLocation"
@ -382,7 +415,7 @@
<div class="layui-form-item">
<label class="layui-form-label">备注说明:</label>
<div class="layui-input-block">
<input name=`+"applyRemark"+NewIdNumber+` placeholder="请填写相关原因及申请原因" value=""
<input name=` + "applyRemark" + NewIdNumber + ` placeholder="请填写相关原因及申请原因" value=""
class="layui-input"/>
</div>
</div>
@ -391,8 +424,8 @@
// 获取当前高度
var height = parseInt(($("#stepForm").css('height')).split("px")[0]);
params.push(NewIdNumber)
$("#stepForm").css("height",height+532 +'px');
$("#"+parentId).after(materialItem);
$("#stepForm").css("height", height + 532 + 'px');
$("#" + parentId).after(materialItem);
};
@ -405,14 +438,13 @@
// 获取祖父节点
var reparent = parent.parentNode;
var height = parseInt(($("#stepForm").css('height')).split("px")[0]);
$("#stepForm").css("height",height-532 +'px');
params = remove(params,parentId);
$("#stepForm").css("height", height - 532 + 'px');
params = remove(params, parentId);
reparent.removeChild(parent);
};
// 用于实现扫描条形码
scanBarCode = function (obj) {
parent.wx.scanQRCode({
desc: 'scanQRCode desc',
needResult: 1, // 默认为0,扫描结果由企业微信处理,1则直接返回扫描结果,
@ -423,6 +455,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/qywxApplicationOutScanBarCode",
type: "post",
@ -448,7 +481,7 @@
var materialCode = materialCodeItem.childNodes[1];
var data = d.data;
if(data!==null) {
if (data !== null) {
materialName.value = data.mname;
materialId.value = data.mid;
@ -475,13 +508,14 @@
$('#place' + codeId).append(new Option(item.depositoryName + "-" + item.code, item.id));//往下拉菜单里添加元素
});
form.render();
}
else{
layer.close(loading2);
} else {
// 如果没有对应关系
layer.msg("对于编码:" + result + ",并未发现对应的物料", {
icon: 0,
time: 1000 //0.5秒关闭(如果不配置,默认是3秒)
}, function () {
layer.close(loading2);
})
}
@ -498,7 +532,7 @@
function remove(arr, item) {
var result = [];
for (let i = 0; i < arr.length; i++) {
if(arr[i] === item){
if (arr[i] === item) {
continue;
}
result.push(arr[i]);
@ -511,13 +545,14 @@
parent.wx.scanQRCode({
desc: 'scanQRCode desc',
needResult: 1, // 默认为0,扫描结果由企业微信处理,1则直接返回扫描结果,
scanType: ["qrCode","barCode"], // 可以指定扫二维码还是条形码(一维码),默认二者都有
scanType: ["qrCode", "barCode"], // 可以指定扫二维码还是条形码(一维码),默认二者都有
success: function (res) {
// 回调
var result = res.resultStr;//当needResult为1时返回处理结果
var req = {};
req.qrCode = result;
req.codeFlag = 2;
let loading2 = layer.open({type: 3, shade: [0.25, '#000'], icon: 2, speed: 0});
$.ajax({
url: "/material/qywxApplicationOutScanQrCode",
type: "post",
@ -532,6 +567,7 @@
icon: 0,
time: 1000 //0.5秒关闭(如果不配置,默认是3秒)
}, function () {
layer.close(loading2);
})
} else {
@ -592,6 +628,7 @@
materialName.value = data.mname;
materialId.value = data.id;
materialCode.value = data.code;
layer.close(loading2);
}
}
})
@ -600,7 +637,7 @@
};
// 用于实现通过编码查询物料
selectCode = function(obj){
selectCode = function (obj) {
// 输入code
var code = obj.value;
var codeId = obj.name.split("code")[1];
@ -616,29 +653,33 @@
var req = {};
req.code = code;
req.type = "out";
if(code !== ""){
if (code !== "") {
let loading2 = layer.open({type: 3, shade: [0.25, '#000'], icon: 2, speed: 0});
$.ajax({
url: "/material/findMatrialByCode",
type: "get",
dataType: 'json',
data:req,
data: req,
contentType: "application/json;charset=utf-8",
success: function (d) {
var d = d.data;
if(d == null){
layer.msg("没有该编码,请确认是否输入正确");
if (d == null) {
layer.msg("没有该编码,请确认是否输入正确", {icon: 5, time: 500}, function () {
materialName.value = "";
materialId.value = "";
obj.value = "";
}else{
layer.close(loading2);
});
} else {
req.mid = d.id;
$.ajax({
url: "/place/findPlaceByMid",
type: "post",
dataType: 'json',
data:JSON.stringify(req),
data: JSON.stringify(req),
contentType: "application/json;charset=utf-8",
success:function (res) {
success: function (res) {
var idNumber = materialId.name.split("mid")[1];
// 获取物料与条形码的对应关系
var materialAndBarCodeList = d["materialAndBarCodeList"];
@ -684,6 +725,7 @@
form.render();
materialName.value = d.mname;
materialId.value = d.id;
layer.close(loading2);
}
});
}
@ -707,7 +749,6 @@
var mname = materialName.value;
var barCodeChildren = parent.childNodes[9];
var barCodeItem = barCodeChildren.childNodes[3];
mname = mname.split(",")[0];
layer.open({
type: 2,
@ -717,20 +758,21 @@
shadeClose: true, //点击遮罩关闭层
area: ['70%', '70%'],
// content: '/selectMaterialByCard?mname='+mname+'&type=2&clickObj='+parentId,
content: '/getMaterialAll?mname='+mname+'&type=2&clickObj='+parentId,
move : '.layui-layer-title',
fixed:false,
success: function(layero, index){
content: '/getMaterialAll?mname=' + mname + '&type=2&clickObj=' + parentId,
move: '.layui-layer-title',
fixed: false,
success: function (layero, index) {
var children = layero.children();
var content = $(children[1]);
var iframeChildren = $(content.children());
content.css('height','100%');
iframeChildren.css('height','100%');
content.css('height', '100%');
iframeChildren.css('height', '100%');
},
end: function () {
var mid = materialId.value;
let loading2 = layer.open({type: 3, shade: [0.25, '#000'], icon: 2, speed: 0});
$.ajax({
url: "/material/findMatrialById?mid=" + mid+"&type=out",
url: "/material/findMatrialById?mid=" + mid + "&type=out",
type: "get",
dataType: 'json',
contentType: "application/json;charset=utf-8",
@ -738,14 +780,14 @@
var material = d.data.materialById;
var placeList = d.data.placeList;
var code = material.code;
if(code === undefined){
if (code === undefined) {
code = "";
}
codeValue.value = code;
var idNumber = materialId.name.split("mid")[1];
$('#place'+idNumber).empty();
$('#place' + idNumber).empty();
$.each(placeList, function (index, item) {
$('#place'+idNumber).append(new Option(item.depositoryName+"-"+item.code, item.id));//往下拉菜单里添加元素
$('#place' + idNumber).append(new Option(item.depositoryName + "-" + item.code, item.id));//往下拉菜单里添加元素
});
var unit = $("#unit" + idNumber);
unit.empty();
@ -781,14 +823,14 @@
$("#barCode" + idNumber).append(new Option(item.bmcode, item.id));//往下拉菜单里添加元素
});
form.render();
}
else {
} else {
var barCode = $("#barCode" + idNumber);
if (barCode.length > 0) {
barCode.empty();
}
}
form.render();
layer.close(loading2);
}
});
@ -814,35 +856,40 @@
var barCodeItem = barCodeChildren.childNodes[3];
var req = {};
data = data.split(",")[0];
if(data !== ""){
if (data !== "") {
req.mname = data;
let loading2 = layer.open({type: 3, shade: [0.25, '#000'], icon: 2, speed: 0});
$.ajax({
url: "/material/findInventoryByCondition",
type: "post",
dataType: 'json',
data:JSON.stringify(req),
data: JSON.stringify(req),
contentType: "application/json;charset=utf-8",
success: function (d) {
if(d.count > 1){
layer.msg("请点击右侧搜索确定物品");
if (d.count > 1) {
layer.msg("请点击右侧搜索确定物品", {icon: 0, time: 500}, function () {
materialId.value = "";
codeValue.value = "";
layer.close(loading2);
})
return false;
}else if(d.count === 0){
layer.msg("没有该物品,请确认输入是否正确");
} else if (d.count === 0) {
layer.msg("没有该物品,请确认输入是否正确", {icon: 0, time: 500}, function () {
materialId.value = "";
codeValue.value = "";
materialName.value = "";
layer.close(loading2);
});
return false;
}
else{
} else {
var idNumber = materialId.name.split("mid")[1];
var material = d.data[0];
var unit = $("#unit" + idNumber);
unit.empty();
$("#unit" + idNumber).append(new Option(material.baseUnit, "-1"));
var unitList = material["splitInfoList"];
if(unitList !== null && unitList != undefined){
if (unitList !== null && unitList != undefined) {
for (let i = 0; i < unitList.length; i++) {
$("#unit" + idNumber).append(new Option(unitList[i].newUnit, unitList[i].newUnit));
}
@ -886,6 +933,7 @@
materialName.value = material.mname;
materialId.value = material.id;
codeValue.value = material.code;
layer.close(loading2);
}
}
});
@ -904,15 +952,15 @@
maxmin: true,
shadeClose: true, //点击遮罩关闭层
area: ['70%', '70%'],
move : '.layui-layer-title',
fixed:false,
content: '/selectDepositoryByCard?type=1&clickObj='+parentId,
success: function(layero, index){
move: '.layui-layer-title',
fixed: false,
content: '/selectDepositoryByCard?type=1&clickObj=' + parentId,
success: function (layero, index) {
var children = layero.children();
var content = $(children[1]);
var iframeChildren = $(content.children());
content.css('height','100%');
iframeChildren.css('height','100%');
content.css('height', '100%');
iframeChildren.css('height', '100%');
}
});
};
@ -921,12 +969,13 @@
parent.wx.scanQRCode({
desc: 'scanQRCode desc',
needResult: 1, // 默认为0,扫描结果由企业微信处理,1则直接返回扫描结果,
scanType: ["qrCode","barCode"], // 可以指定扫二维码还是条形码(一维码),默认二者都有
scanType: ["qrCode", "barCode"], // 可以指定扫二维码还是条形码(一维码),默认二者都有
success: function (res) {
// 回调
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",
@ -940,22 +989,26 @@
var depositoryName = parent.childNodes[1];
var depositoryId = parent.childNodes[3];
var placeId = parent.childNodes[5];
if(flag === 0){
if (flag === 0) {
// 如果没有获取到位置
layer.msg("当前二维码错误,请重新扫描");
}else if(flag === 1){
layer.msg("当前二维码错误,请重新扫描",{icon:5,time:500},function () {
layer.close(loading2);
});
} else if (flag === 1) {
// 如果获取到的是库位
var place = data["place"];
placeId.value = place.id;
depositoryId.value = place.did;
depositoryName.value = place.depositoryName;
layer.close(loading2);
}else if(flag === 2){
} else if (flag === 2) {
// 如果获取到的是仓库
var depository = data["depository"];
placeId.value = 0;
depositoryId.value = depository.id;
depositoryName.value = depository.dname;
layer.close(loading2);
}
}
})
@ -967,7 +1020,7 @@
MaterialQuantityIsTrue = function (obj) {
var id = obj.id.split("quantity")[1];
var mcode = $("#code" + id).val(); // 获取到当前输入的物料编码
var unit = $("#unit"+id).val();
var unit = $("#unit" + id).val();
if (mcode === "" || mcode === undefined || mcode === null) {
layer.msg("请输入物料的正确编码!", {icon: 0, time: 500}, function () {
$("#quantity" + id).val("")
@ -979,7 +1032,8 @@
req.mcode = mcode;
req.quantity = val;
req.unit = unit;
req.placeId = $("#place"+id).val();
req.placeId = $("#place" + id).val();
let loading2 = layer.open({ type: 3, shade: [0.25, '#000'], icon: 2, speed: 0});
$.ajax({
url: "/material/MaterialQuantityIsTrue",
type: "post",
@ -991,6 +1045,7 @@
if (!flag) { // 如果当前数目不合适
layer.msg("当前物料数量不足", {icon: 0, time: 500}, function () {
$("#quantity" + id).val("");
layer.close(loading2);
});
}

196
src/main/resources/templates/pages/application/application-transfer_back.html

@ -12,18 +12,24 @@
</head>
<body>
<style>
.inputdiv{
display:flex;background-color: #fff;height: 38px;line-height: 38px;border: 1px solid rgb(238, 238, 238);
.inputdiv {
display: flex;
background-color: #fff;
height: 38px;
line-height: 38px;
border: 1px solid rgb(238, 238, 238);
}
.layui-form-label{
.layui-form-label {
padding: 9px 0px;
text-align: left;
}
.layui-input-block{
.layui-input-block {
margin-left: 80px;
}
.lay-step{
.lay-step {
display: none;
}
@ -36,29 +42,34 @@
<div carousel-item style="overflow: inherit">
<div>
<form class="layui-form layui-form-pane" style="margin: 0 auto;max-width: 460px;padding-top: 40px;">
<form class="layui-form layui-form-pane"
style="margin: 0 auto;max-width: 460px;padding-top: 40px;">
<div class="layui-card" id="cardParent">
<div class="layui-card-body" id="cardItem1">
<hr>
<i class="layui-icon layui-icon-subtraction" style="display: inline" onclick="deleteItem(this)"></i>
<i class="layui-icon layui-icon-subtraction" style="display: inline"
onclick="deleteItem(this)"></i>
<div class="layui-form-item">
<label class="layui-form-label">物料名称:</label>
<div class="layui-input-block">
<div class="inputdiv">
<input type="text" placeholder="请选择物料" class="layui-input" style="border-style: none"
<input type="text" placeholder="请选择物料" class="layui-input"
style="border-style: none"
id="openSonByMaterial" onblur="selectMaterialByName(this)"
lay-verify="required"/>
<i class="layui-icon layui-icon-search" style="display: inline" id="selectMaterial" onclick="selectMaterial(this)"></i>
<i class="layui-icon layui-icon-search" style="display: inline"
id="selectMaterial" onclick="selectMaterial(this)"></i>
</div>
<input type="text" name="mid" class="layui-input" id="mid"
style="display: none" lay-verify="required" />
style="display: none" lay-verify="required"/>
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">物料编码:</label>
<div class="layui-input-block">
<input id="code" name="code" type="text" placeholder="请填写入物料编码" value="" onblur="selectCode(this)"
<input id="code" name="code" type="text" placeholder="请填写入物料编码" value=""
onblur="selectCode(this)"
class="layui-input" lay-verify="required">
</div>
</div>
@ -71,7 +82,8 @@
<div class="layui-form-item">
<label class="layui-form-label">物料数量:</label>
<div class="layui-input-block">
<input name="quantity" type="number" placeholder="请填写入物料数量" value="" class="layui-input" lay-verify="number" required>
<input name="quantity" type="number" placeholder="请填写入物料数量" value=""
class="layui-input" lay-verify="number" required>
</div>
</div>
<div class="layui-form-item">
@ -89,15 +101,18 @@
<div class="layui-form-item">
<label class="layui-form-label">备注说明:</label>
<div class="layui-input-block">
<input name="applyRemark" placeholder="请填写相关原因及申请原因" value="" class="layui-input"/>
<input name="applyRemark" placeholder="请填写相关原因及申请原因" value=""
class="layui-input"/>
</div>
</div>
<i class="layui-icon layui-icon-addition" style="display: inline" onclick="addItem(this)"></i>
<i class="layui-icon layui-icon-addition" style="display: inline"
onclick="addItem(this)"></i>
</div>
<!-- 提交-->
<div class="layui-form-item">
<div class="layui-input-block">
<button class="layui-btn" lay-submit lay-filter="formStep" style="margin-bottom: 10px;margin-left: 15%">
<button class="layui-btn" lay-submit lay-filter="formStep"
style="margin-bottom: 10px;margin-left: 15%">
&emsp;提交&emsp;
</button>
</div>
@ -136,24 +151,36 @@
<script src="/static/js/lay-config.js?v=1.0.4" charset="utf-8"></script>
<script>
// 用于添加标签
function addItem(obj){}
function addItem(obj) {
}
// 用于删除标签
function deleteItem(obj){}
function deleteItem(obj) {
}
// 用于编码查询
function selectCode(obj){}
function selectCode(obj) {
}
// 用于点击搜索按钮
function selectMaterial(obj){}
function selectMaterial(obj) {
}
// 用于物料名称查询
function selectMaterialByName(obj){}
function selectMaterialByName(obj) {
}
// 用于加载仓库菜单
function openDepositoryTree(obj){}
function openDepositoryTree(obj) {
}
// 用于暂存卡片个数
var params = [];
// 用于卡片编号
var NewIdNumber = 1;
// 用于标志是否为第一次提交
let flagForForm = false;
layui.use([ 'form', 'step','layer','jquery'], function () {
layui.use(['form', 'step', 'layer', 'jquery'], function () {
var $ = layui.$,
form = layui.form,
step = layui.step;
@ -173,29 +200,29 @@
form.on('submit(formStep)', function (data) {
if(!flagForForm){
if (!flagForForm) {
flagForForm = true;
data=data.field;
data = data.field;
data.params = params;
$.ajax({
url:"/depositoryRecord/transfer",
type:'put',
dataType:'json',
url: "/depositoryRecord/transfer",
type: 'put',
dataType: 'json',
contentType: "application/json;charset=utf-8",
data:JSON.stringify(data),
beforeSend:function () {
this.layerIndex = layer.load(0, { shade: [0.5, '#393D49'] });
data: JSON.stringify(data),
beforeSend: function () {
this.layerIndex = layer.load(0, {shade: [0.5, '#393D49']});
},
success:function(data){
success: function (data) {
layer.close(this.layerIndex);
if(data.status >= 300){
if (data.status >= 300) {
layer.msg(data.statusInfo.message);//失败的表情
return;
}else{
} else {
layer.msg("申请提交成功", {
icon: 6,//成功的表情
time: 500 //1秒关闭(如果不配置,默认是3秒)
}, function(){
}, function () {
step.next('#stepForm');
});
}
@ -231,7 +258,7 @@
NewIdNumber = NewIdNumber + 1;
// 物料名称栏目
var materialItem = `
<div class="layui-card-body" style="padding-right: 0px" id=`+"cardItem"+NewIdNumber+`>
<div class="layui-card-body" style="padding-right: 0px" id=` + "cardItem" + NewIdNumber + `>
<hr>
<i class="layui-icon layui-icon-subtraction" style="display: inline" onclick="deleteItem(this)"></i>
<div class="layui-form-item">
@ -242,27 +269,27 @@
id="openSonByMaterial" lay-verify="required" onblur="selectMaterialByName(this)"/>
<i class="layui-icon layui-icon-search" style="display: inline" id="selectMaterial" onclick="selectMaterial(this)"></i>
</div>
<input type="text" name=`+"mid"+NewIdNumber+` class="layui-input" id="mid"
<input type="text" name=` + "mid" + NewIdNumber + ` class="layui-input" id="mid"
style="display: none" lay-verify="required" />
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">物料编码:</label>
<div class="layui-input-block">
<input id="code" name=`+"code"+NewIdNumber+` type="text" placeholder="请填写入物料编码" value="" onblur="selectCode(this)"
<input id="code" name=` + "code" + NewIdNumber + ` type="text" placeholder="请填写入物料编码" value="" onblur="selectCode(this)"
class="layui-input" lay-verify="required">
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">所处库位:</label>
<div class="layui-input-block">
<select name=`+"placeId"+NewIdNumber +` id=`+"place"+NewIdNumber +`></select>
<select name=` + "placeId" + NewIdNumber + ` id=` + "place" + NewIdNumber + `></select>
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">物料数量:</label>
<div class="layui-input-block">
<input name=`+"quantity"+NewIdNumber+` type="number" placeholder="请填写入物料数量" value=""
<input name=` + "quantity" + NewIdNumber + ` type="number" placeholder="请填写入物料数量" value=""
class="layui-input" lay-verify="number">
</div>
</div>
@ -272,16 +299,16 @@
<input type="text" placeholder="请选择仓库" class="layui-input"
id="openSonByDepository" readonly onclick="openDepositoryTree(this)"
lay-verify="required"/>
<input type="text" name=`+"depositoryId"+NewIdNumber+` class="layui-input" id="depositoryId"
<input type="text" name=` + "depositoryId" + NewIdNumber + ` class="layui-input" id="depositoryId"
style="display: none" lay-verify="required"/>
<input type="text" name=`+"placeId"+NewIdNumber+` class="layui-input" id="placeId"
<input type="text" name=` + "placeId" + NewIdNumber + ` class="layui-input" id="placeId"
style="display: none" lay-verify="required"/>
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">备注说明:</label>
<div class="layui-input-block">
<input name=`+"applyRemark"+NewIdNumber+` placeholder="请填写相关原因及申请原因" value=""
<input name=` + "applyRemark" + NewIdNumber + ` placeholder="请填写相关原因及申请原因" value=""
class="layui-input"/>
</div>
</div>
@ -290,8 +317,8 @@
// 获取当前高度
var height = parseInt(($("#stepForm").css('height')).split("px")[0]);
params.push(NewIdNumber)
$("#stepForm").css("height",height+455 +'px');
$("#"+parentId).after(materialItem);
$("#stepForm").css("height", height + 455 + 'px');
$("#" + parentId).after(materialItem);
};
// 实现卡片删除
@ -303,8 +330,8 @@
// 获取祖父节点
var reparent = parent.parentNode;
var height = parseInt(($("#stepForm").css('height')).split("px")[0]);
$("#stepForm").css("height",height-455 +'px');
params = remove(params,parentId);
$("#stepForm").css("height", height - 455 + 'px');
params = remove(params, parentId);
reparent.removeChild(parent);
};
@ -313,7 +340,7 @@
function remove(arr, item) {
var result = [];
for (let i = 0; i < arr.length; i++) {
if(arr[i] === item){
if (arr[i] === item) {
continue;
}
result.push(arr[i]);
@ -323,7 +350,7 @@
// 用于实现通过编码查询物料
selectCode = function(obj){
selectCode = function (obj) {
// 输入code
var code = obj.value;
var id = obj.name.split("code")[1];
@ -336,36 +363,40 @@
var req = {};
req.code = code;
req.type = "out";
if(code !== ""){
if (code !== "") {
let loading2 = layer.open({type: 3, shade: [0.25, '#000'], icon: 2, speed: 0});
$.ajax({
url: "/material/findMatrialByCode",
type: "get",
dataType: 'json',
data:req,
data: req,
contentType: "application/json;charset=utf-8",
success: function (d) {
var d = d.data;
if(d == null){
layer.msg("没有该编码,请确认是否输入正确");
if (d == null) {
layer.msg("没有该编码,请确认是否输入正确", {icon: 5, time: 500}, function () {
layer.close(loading2);
materialName.value = "";
materialId.value = "";
obj.value = "";
}else{
});
} else {
req.mid = d.id;
$.ajax({
url: "/place/findPlaceByMid",
type: "post",
dataType: 'json',
data:JSON.stringify(req),
data: JSON.stringify(req),
contentType: "application/json;charset=utf-8",
success:function (res) {
$('#place'+id).empty();
success: function (res) {
$('#place' + id).empty();
$.each(res.data, function (index, item) {
$('#place'+id).append(new Option(item.depositoryName+"-"+item.code, item.id));//往下拉菜单里添加元素
$('#place' + id).append(new Option(item.depositoryName + "-" + item.code, item.id));//往下拉菜单里添加元素
});
form.render();
materialName.value = d.mname;
materialId.value = d.id;
layer.close(loading2);
}
});
}
@ -397,18 +428,19 @@
shadeClose: true, //点击遮罩关闭层
area: ['70%', '70%'],
// content: '/selectMaterialByCard?mname='+mname+'&type=2&clickObj='+parentId,
content: '/getMaterialAll?mname='+mname+'&type=2&clickObj='+parentId,
move : '.layui-layer-title',
fixed:false,
success: function(layero, index){
content: '/getMaterialAll?mname=' + mname + '&type=2&clickObj=' + parentId,
move: '.layui-layer-title',
fixed: false,
success: function (layero, index) {
var children = layero.children();
var content = $(children[1]);
var iframeChildren = $(content.children());
content.css('height','100%');
iframeChildren.css('height','100%');
content.css('height', '100%');
iframeChildren.css('height', '100%');
},
end: function () {
var mid = materialId.value;
let loading2 = layer.open({type: 3, shade: [0.25, '#000'], icon: 2, speed: 0});
$.ajax({
url: "/material/findMatrialById?mid=" + mid,
type: "get",
@ -418,15 +450,16 @@
var material = d.data.materialById;
var placeList = d.data.placeList;
var code = material.code;
if(code === undefined){
if (code === undefined) {
code = "";
}
codeValue.value = code;
$('#place').empty();
$.each(placeList, function (index, item) {
$('#place').append(new Option(item.depositoryName+"-"+item.code, item.id));//往下拉菜单里添加元素
$('#place').append(new Option(item.depositoryName + "-" + item.code, item.id));//往下拉菜单里添加元素
});
form.render();
layer.close(loading2);
}
});
@ -449,32 +482,37 @@
var materialId = materialName.parentNode.parentNode.childNodes[3];
var req = {};
data = data.split(",")[0];
if(data !== ""){
if (data !== "") {
req.mname = data;
let loading2 = layer.open({type: 3, shade: [0.25, '#000'], icon: 2, speed: 0});
$.ajax({
url: "/material/findMaterialByCondition",
type: "post",
dataType: 'json',
data:JSON.stringify(req),
data: JSON.stringify(req),
contentType: "application/json;charset=utf-8",
success: function (d) {
if(d.count > 1){
layer.msg("请点击右侧搜索确定物品");
if (d.count > 1) {
layer.msg("请点击右侧搜索确定物品", {icon: 0, time: 500}, function () {
materialId.value = "";
codeValue.value = "";
layer.close(loading2);
});
return false;
}else if(d.count === 0){
layer.msg("没有该物品,请确认输入是否正确");
} else if (d.count === 0) {
layer.msg("没有该物品,请确认输入是否正确", {icon: 5, time: 500}, function () {
materialId.value = "";
codeValue.value = "";
materialName.value = "";
layer.close(loading2);
});
return false;
}
else{
} else {
var material = d.data[0];
materialName.value = material.mname;
materialId.value = material.id;
codeValue.value = material.code;
layer.close(loading2);
}
}
});
@ -493,15 +531,15 @@
maxmin: true,
shadeClose: true, //点击遮罩关闭层
area: ['70%', '70%'],
move : '.layui-layer-title',
fixed:false,
content: '/selectDepositoryByCard?type=1&clickObj='+parentId,
success: function(layero, index){
move: '.layui-layer-title',
fixed: false,
content: '/selectDepositoryByCard?type=1&clickObj=' + parentId,
success: function (layero, index) {
var children = layero.children();
var content = $(children[1]);
var iframeChildren = $(content.children());
content.css('height','100%');
iframeChildren.css('height','100%');
content.css('height', '100%');
iframeChildren.css('height', '100%');
}
});
}

53
src/main/resources/templates/pages/applicationForStorageCenter/application-out.html

@ -443,7 +443,7 @@
// 提交(物料出库)
form.on('submit(formStep)', function (data) {
if(!flagForForm){
if (!flagForForm) {
flagForForm = true;
data = data.field;
data.params = params;
@ -505,7 +505,7 @@
// 提交(组合出库)
form.on('submit(formStep2)', function (data) {
if(!GroupFlagForForm){
if (!GroupFlagForForm) {
GroupFlagForForm = true;
data = data.field;
data.params = params2;
@ -892,6 +892,7 @@
req.code = code;
req.type = "out";
if (code !== "") {
let loading2 = layer.open({type: 3, shade: [0.25, '#000'], icon: 2, speed: 0});
$.ajax({
url: "/material/findMatrialByCode",
type: "get",
@ -901,11 +902,13 @@
success: function (d) {
var d = d.data;
if (d == null) {
layer.msg("仓库中暂无该物料");
layer.msg("仓库中暂无该物料", {icon: 0, time: 500}, function () {
layer.close(loading2);
materialName.value = "";
materialId.value = "";
obj.value = "";
$('#place' + objId).empty();
});
} else {
materialName.value = d.mname;
@ -948,6 +951,7 @@
barCode.empty();
}
}
layer.close(loading2);
}
}
});
@ -973,6 +977,7 @@
let req = {};
req.code = code;
if (code !== "") {
let loading2 = layer.open({type: 3, shade: [0.25, '#000'], icon: 2, speed: 0});
$.ajax({
url: "/group/findGroupByCode",
type: "post",
@ -995,6 +1000,7 @@
childNodes[i].remove()
}
}
layer.close(loading2);
})
} else {
let childNodes = parent.childNodes;
@ -1012,7 +1018,7 @@
CoverpageForGroup(pid, data[i]);
}
element.init();
layer.close(loading2);
}
}
});
@ -1057,6 +1063,7 @@
},
end: function () {
var mid = materialId.value;
let loading2 = layer.open({type: 3, shade: [0.25, '#000'], icon: 2, speed: 0});
if (mid !== '') {
$.ajax({
url: "/material/findMatrialById?mid=" + mid + "&type=out",
@ -1108,6 +1115,7 @@
}
}
form.render();
layer.close(loading2);
}
});
}
@ -1159,6 +1167,7 @@
if (gid !== '') {
let req = {};
req.gid = gid;
let loading2 = layer.open({type: 3, shade: [0.25, '#000'], icon: 2, speed: 0});
$.ajax({
url: "/group/findGroupInfoByGid",
data: JSON.stringify(req),
@ -1181,6 +1190,7 @@
childNodes[i].remove()
}
}
layer.close(loading2);
})
} else {
let childNodes = parent.childNodes;
@ -1197,7 +1207,7 @@
CoverpageForGroup(pid, data[i]);
}
element.init();
layer.close(loading2);
}
}
})
@ -1225,7 +1235,7 @@
if (gname !== '') {
let loading2 = layer.open({type: 3, shade: [0.25, '#000'], icon: 2, speed: 0});
var req = {};
req.gname = gname;
$.ajax({
@ -1250,6 +1260,7 @@
childNodes[i].remove()
}
}
layer.close(loading2);
});
} else if (d.count === 0) {
// 如果当前组合名称不存在
@ -1266,6 +1277,7 @@
childNodes[i].remove()
}
}
layer.close(loading2);
});
} else {
// 正常
@ -1285,7 +1297,7 @@
CoverpageForGroup(pid, data[i]);
}
element.init();
layer.close(loading2);
}
}
})
@ -1298,6 +1310,7 @@
childNodes[i].remove()
}
}
}
};
@ -1320,6 +1333,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/findInventoryByCondition",
@ -1329,15 +1343,19 @@
contentType: "application/json;charset=utf-8",
success: function (d) {
if (d.count > 1) {
layer.msg("请点击右侧搜索确定物品");
layer.msg("请点击右侧搜索确定物品", {icon: 0, time: 500}, function () {
layer.close(loading2);
materialId.value = "";
codeValue.value = "";
});
return false;
} else if (d.count === 0) {
layer.msg("没有该物品,请确认输入是否正确");
layer.msg("没有该物品,请确认输入是否正确", {icon: 5, time: 500}, function () {
layer.close(loading2);
materialId.value = "";
codeValue.value = "";
materialName.value = "";
});
return false;
} else {
var idNumber = materialId.name.split("mid")[1];
@ -1383,6 +1401,7 @@
materialName.value = material.mname;
materialId.value = material.id;
codeValue.value = material.code;
layer.close(loading2);
}
}
});
@ -1409,6 +1428,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/qywxApplicationOutScanBarCode",
type: "post",
@ -1450,12 +1470,14 @@
$("#unit" + idNumber).append(new Option(unitList[i].newUnit, unitList[i].newUnit));
}
form.render();
layer.close(loading2);
} else {
// 如果没有对应关系
layer.msg("对于编码:" + result + ",并未发现仓库中存在对应的物料", {
icon: 0,
time: 1000 //0.5秒关闭(如果不配置,默认是3秒)
}, function () {
layer.close(loading2);
})
}
@ -1484,6 +1506,7 @@
var req = {};
req.qrCode = result;
req.codeFlag = 2;
let loading2 = layer.open({ type: 3, shade: [0.25, '#000'], icon: 2, speed: 0});
$.ajax({
url: "/material/qywxApplicationOutScanQrCode",
type: "post",
@ -1497,6 +1520,7 @@
icon: 0,
time: 1000 //0.5秒关闭(如果不配置,默认是3秒)
}, function () {
layer.close(loading2);
})
} else {
// 获取对应元素
@ -1561,6 +1585,7 @@
materialName.value = data.mname;
materialId.value = data.id;
materialCode.value = data.code;
layer.close(loading2);
}
}
})
@ -1585,7 +1610,7 @@
req.quantity = val;
req.unit = unit;
req.placeId = -1;
let loading2 = layer.open({ type: 3, shade: [0.25, '#000'], icon: 2, speed: 0});
let loading2 = layer.open({type: 3, shade: [0.25, '#000'], icon: 2, speed: 0});
$.ajax({
url: "/material/MaterialQuantityIsTrue",
type: "post",
@ -1600,7 +1625,7 @@
$("#quantity" + id).val("");
},
);
}else{
} else {
layer.close(loading2)
}
@ -1614,11 +1639,9 @@
groupQuantityIsTrue = function (obj) {
var id = obj.id.split("quantityForGroup")[1];
var gid = $("#gid" + id).val(); // 获取到当前输入的物料编码
let loading2 = layer.open({ type: 3, shade: [0.25, '#000'], icon: 2, speed: 0});
if (gid === "" || gid === undefined || gid === null) {
layer.msg("请输入正确的组合!", {icon: 0, time: 500}, function () {
$("#quantityForGroup" + id).val("");
layer.close(loading2)
});
} else {
let val = $("#quantityForGroup" + id).val();
@ -1626,7 +1649,7 @@
var req = {};
req.gid = gid;
req.quantity = val;
let loading2 = layer.open({type: 3, shade: [0.25, '#000'], icon: 2, speed: 0});
$.ajax({
url: "/group/groupQuantityIsTrue",
type: "post",
@ -1645,7 +1668,7 @@
layer.close(loading2)
});
}else{
} else {
layer.close(loading2);
}
}

30
src/main/resources/templates/pages/applicationForStorageCenter/application-out_back.html

@ -178,6 +178,7 @@
function selectPost() {
}
// 用于标志是否为第一次提交
let flagForForm = false;
layui.use(['form', 'step', 'layer', 'jquery'], function () {
@ -193,7 +194,8 @@
var req = {};
req.code = code;
req.type = "out";
if(code !== ""){
if (code !== "") {
let loading2 = layer.open({type: 3, shade: [0.25, '#000'], icon: 2, speed: 0});
$.ajax({
url: "/material/findMatrialByCode",
type: "get",
@ -203,9 +205,11 @@
success: function (d) {
var d = d.data;
if (d == null) {
layer.msg("没有该编码,请确认是否输入正确");
layer.msg("没有该编码,请确认是否输入正确", {icon: 5, time: 500}, function () {
$("#mname").val("");
$("#mid").val("");
layer.close(loading2);
});
} else {
req.mid = d.id;
let unitItem = $("#unit");
@ -217,6 +221,7 @@
$("#mname").val(d.mname);
$("#mid").val(d.id);
form.render();
layer.close(loading2);
}
}
})
@ -228,6 +233,8 @@
var data = $(this).val();
var req = {};
req.mname = data;
if(data !== ""){
let loading2 = layer.open({ type: 3, shade: [0.25, '#000'], icon: 2, speed: 0});
$.ajax({
url: "/material/findInventoryByCondition",
type: "post",
@ -236,14 +243,20 @@
contentType: "application/json;charset=utf-8",
success: function (d) {
if (d.count > 1) {
layer.msg("请点击右侧搜索确定物品");
layer.msg("请点击右侧搜索确定物品",{icon:0,time:500},function () {
$("#mid").val("");
$("#code").val("");
layer.close(loading2);
});
return false;
} else if (d.count === 0) {
layer.msg("没有该物品,请确认输入是否正确");
layer.msg("没有该物品,请确认输入是否正确",{icon:5,time:500},function() {
$("#mid").val("");
$("#code").val("");
layer.close(loading2);
});
return false;
} else {
var material = d.data[0];
@ -256,9 +269,12 @@
$("#unit").append(new Option(item.newUnit, item.newUnit));
});
form.render();
layer.close(loading2);
}
}
});
}
});
$('#openSonByDepository').on('click', function () {
@ -305,6 +321,7 @@
},
end: function () {
var mid = $("#mid").val();
let loading2 = layer.open({ type: 3, shade: [0.25, '#000'], icon: 2, speed: 0});
$.ajax({
url: "/material/findMatrialById?mid=" + mid,
type: "get",
@ -322,6 +339,7 @@
$("#unit").append(new Option(item.newUnit, item.newUnit));
});
form.render();
layer.close(loading2);
}
});
@ -344,7 +362,7 @@
form.on('submit(formStep)', function (data) {
if(!flagForForm){
if (!flagForForm) {
flagForForm = true;
data = data.field;
var params = [];
@ -410,6 +428,7 @@
req.quantity = val;
req.unit = unit;
req.placeId = -1;
let loading2 = layer.open({ type: 3, shade: [0.25, '#000'], icon: 2, speed: 0});
$.ajax({
url: "/material/MaterialQuantityIsTrue",
type: "post",
@ -421,6 +440,7 @@
if (!flag) { // 如果当前数目不合适
layer.msg("当前单仓库中物料数量不足", {icon: 0, time: 500}, function () {
$("#quantity").val("");
layer.close(loading2);
});
}

210
src/main/resources/templates/pages/applicationForStorageCenter/application-out_scanQrCode.html

@ -12,41 +12,51 @@
</head>
<body>
<style>
.inputdiv{
display:flex;background-color: #fff;height: 38px;line-height: 38px;border: 1px solid rgb(238, 238, 238);
.inputdiv {
display: flex;
background-color: #fff;
height: 38px;
line-height: 38px;
border: 1px solid rgb(238, 238, 238);
}
.layui-form-label{
.layui-form-label {
padding: 9px 0px;
text-align: left;
}
.layui-input-block{
.layui-input-block {
margin-left: 80px;
}
.lay-step{
.lay-step {
display: none;
}
.layui-form-select .layui-input{
.layui-form-select .layui-input {
border-style: none;
}
</style>
<div class="layuimini-container">
<div class="layuimini-main">
<div class="layui-fluid">
<!-- 出库申请-->
<!-- 出库申请-->
<div class="layui-carousel" id="stepForm" lay-filter="stepForm" style="margin: 0 auto;">
<input th:value="${materialList}" style="display:none;" id="scanValue_materialList">
<input th:value="${depository}" style="display: none" id="scanValue_depositoryId">
<input th:value="${place}" style="display: none" id="scanValue_placeId">
<div carousel-item style="overflow: inherit">
<div>
<form class="layui-form layui-form-pane" style="margin: 0 auto;max-width: 460px;padding-top: 40px;">
<form class="layui-form layui-form-pane"
style="margin: 0 auto;max-width: 460px;padding-top: 40px;">
<div class="layui-card" id="cardParent">
<!-- 提交按钮-->
<div class="layui-form-item" id="btn_sub">
<div class="layui-input-block">
<button class="layui-btn" lay-submit lay-filter="formStep" style="margin-bottom: 30px;margin-left: 15%">
<button class="layui-btn" lay-submit lay-filter="formStep"
style="margin-bottom: 30px;margin-left: 15%">
&emsp;提交申请&emsp;
</button>
</div>
@ -84,19 +94,32 @@
<script src="/static/js/lay-config.js?v=1.0.4" charset="utf-8"></script>
<script>
// 用于添加标签
function addItem(obj){}
function addItem(obj) {
}
// 用于删除标签
function deleteItem(obj){}
function deleteItem(obj) {
}
// 用于编码查询
function selectCode(obj){}
function selectCode(obj) {
}
// 用于点击搜索按钮
function selectMaterial(obj){}
function selectMaterial(obj) {
}
// 用于物料名称查询
function selectMaterialByName(obj){}
function selectMaterialByName(obj) {
}
// 用于暂存卡片个数
var params = [];
// 用于页面初始化时的卡片构造
function initForm(num,obj) {}
function initForm(num, obj) {
}
// 用于卡片编号
var NewIdNumber = 1;
// 用于标志是否为第一次提交
@ -126,49 +149,52 @@
let place = $("#scanValue_placeId").val();
let materialList = $("#scanValue_materialList").val();
materialList = JSON.parse(materialList);
if(depository !== undefined && depository !== null && depository !== ""){
if (depository !== undefined && depository !== null && depository !== "") {
// 如果扫描到仓库
depository = JSON.parse(depository);
scanValue.depository = depository;
}
if(place !== undefined && place !== null && place !== ""){
if (place !== undefined && place !== null && place !== "") {
// 如果扫描到库位
place = JSON.parse(place);
scanValue.place = place;
}
for (let i = 0; i < materialList.length; i++) {
initForm(i,materialList[i]);
initForm(i, materialList[i]);
}
});
// 用于获取当前物料所处的库位
function getPlaceByMaterial(material){
function getPlaceByMaterial(material) {
var req = {};
req.code = material.code;
req.type = "out";
let loading2 = layer.open({type: 3, shade: [0.25, '#000'], icon: 2, speed: 0});
$.ajax({
url: "/material/findMatrialByCode",
type: "get",
dataType: 'json',
data:(req),
data: (req),
contentType: "application/json;charset=utf-8",
success: function (d) {
var d = d.data;
if(d == null){
if (d == null) {
materialIsExist = false;
}else{
layer.close(loading2);
} else {
req.mid = d.id;
$.ajax({
url: "/place/findPlaceByMid",
type: "post",
dataType: 'json',
data:JSON.stringify(req),
data: JSON.stringify(req),
contentType: "application/json;charset=utf-8",
success:function (res) {
success: function (res) {
materialOnPlaceList = res.data;
materialIsExist = true;
layer.close(loading2);
}
});
@ -179,24 +205,24 @@
//用于页面初始化时的卡片构造
initForm = function(num,obj){
initForm = function (num, obj) {
var parent = $("#cardParent");
// 获取待添加父类
NewIdNumber = num;
var isPlace = false;
if(num === 0){ // 如果是第一个
if (num === 0) { // 如果是第一个
NewIdNumber = "";
}
let depositoryItem = `
<div class="layui-form-item">
<label class="layui-form-label">所处库位:</label>
<div class="layui-input-block">
<select name=`+"placeId"+NewIdNumber +` id=`+"place"+NewIdNumber+`></select>
<select name=` + "placeId" + NewIdNumber + ` id=` + "place" + NewIdNumber + `></select>
</div>
</div>
`;
var firstItem = `
<div class="layui-card-body" id=`+"cardItem"+NewIdNumber+`>
<div class="layui-card-body" id=` + "cardItem" + NewIdNumber + `>
<hr>
<i class="layui-icon layui-icon-subtraction" style="display: inline" onclick="deleteItem(this)"></i>
<div class="layui-form-item">
@ -207,14 +233,14 @@
id="openSonByMaterial" lay-verify="required" onblur="selectMaterialByName(this)"/>
<i class="layui-icon layui-icon-search" style="display: inline" id="selectMaterial" onclick="selectMaterial(this)"></i>
</div>
<input type="text" name=`+"mid"+NewIdNumber+` class="layui-input" id="mid" value="${obj.mid}"
<input type="text" name=` + "mid" + NewIdNumber + ` class="layui-input" id="mid" value="${obj.mid}"
style="display: none" lay-verify="required" />
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">物料编码:</label>
<div class="layui-input-block">
<input id="code" name=`+"code"+NewIdNumber+` type="text" placeholder="请填写入物料编码" value="${obj.code}" onblur="selectCode(this)"
<input id="code" name=` + "code" + NewIdNumber + ` type="text" placeholder="请填写入物料编码" value="${obj.code}" onblur="selectCode(this)"
class="layui-input" lay-verify="required">
</div>
</div>`;
@ -223,50 +249,53 @@
var lastItem = `<div class="layui-form-item">
<label class="layui-form-label">物料数量:</label>
<div class="layui-input-block">
<input name=`+"quantity"+NewIdNumber+` type="number" placeholder="请填写入物料数量" value=""
<input name=` + "quantity" + NewIdNumber + ` type="number" placeholder="请填写入物料数量" value=""
class="layui-input" lay-verify="number">
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">备注说明:</label>
<div class="layui-input-block">
<input name=`+"applyRemark"+NewIdNumber+` placeholder="请填写相关原因及申请原因" value=""
<input name=` + "applyRemark" + NewIdNumber + ` placeholder="请填写相关原因及申请原因" value=""
class="layui-input"/>
</div>
</div>
<i class="layui-icon layui-icon-addition" style="display: inline" onclick="addItem(this)"></i>
</div>`;
if(scanValue.depository !== undefined && scanValue.depository !== null && scanValue.depository !== ""){
if (scanValue.depository !== undefined && scanValue.depository !== null && scanValue.depository !== "") {
// 如果扫描了仓库
var depository = scanValue.depository;
var req = {};
req.depositoryId = depository.did;
req.code = obj.code;
let loading2 = layer.open({type: 3, shade: [0.25, '#000'], icon: 2, speed: 0});
$.ajax({
url: "/place/findPlaceByMcodeAndDid",
type: "post",
dataType: 'json',
data:JSON.stringify(req),
data: JSON.stringify(req),
contentType: "application/json;charset=utf-8",
success: function (d) {
if(d.data.length === 0){
initDeleteCard(NewIdNumber)
}else {
if (d.data.length === 0) {
initDeleteCard(NewIdNumber);
layer.close(loading2);
} else {
$('#place' + NewIdNumber).empty();
$.each(d.data, function (index, item) {
$('#place' + NewIdNumber).append(new Option(item.depositoryName + "-" + item.code, item.did));//往下拉菜单里添加元素
});
form.render();
layer.close(loading2);
}
}
})
}
if(scanValue.place !== undefined && scanValue.place !== null && scanValue.place !== ""){
if (scanValue.place !== undefined && scanValue.place !== null && scanValue.place !== "") {
// 如果扫描了库位
var place = scanValue.place;
var midlist = place.midList;
if(midlist.indexOf(obj.mid) !== -1){ // 如果当前库位存在该物料
if (midlist.indexOf(obj.mid) !== -1) { // 如果当前库位存在该物料
isPlace = true;
}
}
@ -275,11 +304,11 @@
if (NewIdNumber !== "") {
params.push(NewIdNumber)
}
$("#stepForm").css("height",height+475 +'px');
$("#stepForm").css("height", height + 475 + 'px');
var materialItem = firstItem + depositoryItem + lastItem;
$("#btn_sub").prepend(materialItem);
if(isPlace) {
if (isPlace) {
// 如果当前库位存在
$('#place' + NewIdNumber).empty();
$('#place' + NewIdNumber).append(new Option(place.dname + "-" + place.code, place.pid));//往下拉菜单里添加元素
@ -290,26 +319,26 @@
};
// 初始化时删除卡片
initDeleteCard = function(NewIdNumber){
initDeleteCard = function (NewIdNumber) {
// 待删除结点
var delItem = $("#cardItem"+NewIdNumber)[0];
var delItem = $("#cardItem" + NewIdNumber)[0];
var parentId = 0;
if(NewIdNumber !== ""){
if (NewIdNumber !== "") {
parentId = parseInt(NewIdNumber);
}
// 获取祖父节点
// console.log(delItem)
var reparent = delItem.parentNode;
var height = parseInt(($("#stepForm").css('height')).split("px")[0]);
$("#stepForm").css("height",height-430 +'px');
params = remove(params,parentId);
$("#stepForm").css("height", height - 430 + 'px');
params = remove(params, parentId);
reparent.removeChild(delItem);
};
// 提交
form.on('submit(formStep)', function (data) {
if(!flagForForm){
if (!flagForForm) {
flagForForm = true;
data = data.field;
data.params = params;
@ -364,7 +393,7 @@
NewIdNumber = NewIdNumber + 1;
// 物料名称栏目
var materialItem = `
<div class="layui-card-body" id=`+"cardItem"+NewIdNumber+`>
<div class="layui-card-body" id=` + "cardItem" + NewIdNumber + `>
<hr>
<i class="layui-icon layui-icon-subtraction" style="display: inline" onclick="deleteItem(this)"></i>
<div class="layui-form-item">
@ -375,34 +404,34 @@
id="openSonByMaterial" lay-verify="required" onblur="selectMaterialByName(this)"/>
<i class="layui-icon layui-icon-search" style="display: inline" id="selectMaterial" onclick="selectMaterial(this)"></i>
</div>
<input type="text" name=`+"mid"+NewIdNumber+` class="layui-input" id="mid"
<input type="text" name=` + "mid" + NewIdNumber + ` class="layui-input" id="mid"
style="display: none" lay-verify="required" />
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">物料编码:</label>
<div class="layui-input-block">
<input id="code" name=`+"code"+NewIdNumber+` type="text" placeholder="请填写入物料编码" value="" onblur="selectCode(this)"
<input id="code" name=` + "code" + NewIdNumber + ` type="text" placeholder="请填写入物料编码" value="" onblur="selectCode(this)"
class="layui-input" lay-verify="required">
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">所处库位:</label>
<div class="layui-input-block">
<select name=`+"placeId"+NewIdNumber +` id="place"></select>
<select name=` + "placeId" + NewIdNumber + ` id="place"></select>
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">物料数量:</label>
<div class="layui-input-block">
<input name=`+"quantity"+NewIdNumber+` type="number" placeholder="请填写入物料数量" value=""
<input name=` + "quantity" + NewIdNumber + ` type="number" placeholder="请填写入物料数量" value=""
class="layui-input" lay-verify="number">
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">备注说明:</label>
<div class="layui-input-block">
<input name=`+"applyRemark"+NewIdNumber+` placeholder="请填写相关原因及申请原因" value=""
<input name=` + "applyRemark" + NewIdNumber + ` placeholder="请填写相关原因及申请原因" value=""
class="layui-input"/>
</div>
</div>
@ -411,8 +440,8 @@
// 获取当前高度
var height = parseInt(($("#stepForm").css('height')).split("px")[0]);
params.push(NewIdNumber)
$("#stepForm").css("height",height+430 +'px');
$("#"+parentId).after(materialItem);
$("#stepForm").css("height", height + 430 + 'px');
$("#" + parentId).after(materialItem);
};
// 实现卡片删除
@ -424,15 +453,16 @@
// 获取祖父节点
var reparent = parent.parentNode;
var height = parseInt(($("#stepForm").css('height')).split("px")[0]);
$("#stepForm").css("height",height-430 +'px');
params = remove(params,parentId);
$("#stepForm").css("height", height - 430 + 'px');
params = remove(params, parentId);
reparent.removeChild(parent);
};
//删除数组中指定元素
function remove(arr, item) {
var result = [];
for (let i = 0; i < arr.length; i++) {
if(arr[i] === item){
if (arr[i] === item) {
continue;
}
result.push(arr[i]);
@ -441,7 +471,7 @@
}
// 用于实现通过编码查询物料
selectCode = function(obj){
selectCode = function (obj) {
// 输入code
var code = obj.value;
// 获取对应元素
@ -453,37 +483,42 @@
var req = {};
req.code = code;
req.type = "out";
if(code !== ""){
if (code !== "") {
let loading2 = layer.open({type: 3, shade: [0.25, '#000'], icon: 2, speed: 0});
$.ajax({
url: "/material/findMatrialByCode",
type: "get",
dataType: 'json',
data:(req),
data: (req),
contentType: "application/json;charset=utf-8",
success: function (d) {
var d = d.data;
if(d == null){
layer.msg("没有该编码,请确认是否输入正确");
if (d == null) {
layer.msg("没有该编码,请确认是否输入正确", {icon: 0, time: 500}, function () {
layer.close(loading2);
materialName.value = "";
materialId.value = "";
obj.value = "";
$('#place').empty();
}else{
});
} else {
req.mid = d.id;
$.ajax({
url: "/place/findPlaceByMid",
type: "post",
dataType: 'json',
data:JSON.stringify(req),
data: JSON.stringify(req),
contentType: "application/json;charset=utf-8",
success:function (res) {
success: function (res) {
$('#place').empty();
$.each(res.data, function (index, item) {
$('#place').append(new Option(item.depositoryName+"-"+item.code, item.id));//往下拉菜单里添加元素
$('#place').append(new Option(item.depositoryName + "-" + item.code, item.id));//往下拉菜单里添加元素
});
form.render();
materialName.value = d.mname;
materialId.value = d.id;
layer.close(loading2);
}
});
@ -514,18 +549,19 @@
shadeClose: true, //点击遮罩关闭层
area: ['70%', '70%'],
// content: '/selectMaterialByCard?mname='+mname+'&type=2&clickObj='+parentId,
content: '/getMaterialAll?mname='+mname+'&type=2&clickObj='+parentId,
success: function(layero, index){
content: '/getMaterialAll?mname=' + mname + '&type=2&clickObj=' + parentId,
success: function (layero, index) {
var children = layero.children();
var content = $(children[1]);
var iframeChildren = $(content.children());
content.css('height','100%');
iframeChildren.css('height','100%');
content.css('height', '100%');
iframeChildren.css('height', '100%');
},
move : '.layui-layer-title',
fixed:false,
move: '.layui-layer-title',
fixed: false,
end: function () {
var mid = materialId.value;
let loading2 = layer.open({type: 3, shade: [0.25, '#000'], icon: 2, speed: 0});
$.ajax({
url: "/material/findMatrialById?mid=" + mid,
type: "get",
@ -535,15 +571,16 @@
var material = d.data.materialById;
var placeList = d.data.placeList;
var code = material.code;
if(code === undefined){
if (code === undefined) {
code = "";
}
codeValue.value = code;
$('#place').empty();
$.each(placeList, function (index, item) {
$('#place').append(new Option(item.depositoryName+"-"+item.code, item.id));//往下拉菜单里添加元素
$('#place').append(new Option(item.depositoryName + "-" + item.code, item.id));//往下拉菜单里添加元素
});
form.render();
layer.close(loading2);
}
});
@ -566,39 +603,42 @@
var materialId = materialName.parentNode.parentNode.childNodes[3];
var req = {};
req.mname = data;
let loading2 = layer.open({type: 3, shade: [0.25, '#000'], icon: 2, speed: 0});
$.ajax({
url: "/material/findInventoryByCondition",
type: "post",
dataType: 'json',
data:JSON.stringify(req),
data: JSON.stringify(req),
contentType: "application/json;charset=utf-8",
success: function (d) {
if(d.count > 1){
layer.msg("请点击右侧搜索确定物品");
if (d.count > 1) {
layer.msg("请点击右侧搜索确定物品", {icon: 0, time: 500}, function () {
materialId.value = "";
codeValue.value = "";
layer.close(loading2);
});
return false;
}else if(d.count === 0){
layer.msg("没有该物品,请确认输入是否正确");
} else if (d.count === 0) {
layer.msg("没有该物品,请确认输入是否正确", {icon: 5, time: 500}, function () {
materialId.value = "";
codeValue.value = "";
materialName.value = "";
layer.close(loading2);
});
return false;
}
else{
} else {
var material = d.data[0];
materialName.value = material.mname;
materialId.value = material.id;
codeValue.value = material.code;
layer.close(loading2);
}
}
});
};
})
</script>
</body>

7
target/classes/templates/index.html

@ -79,10 +79,6 @@
<a href="javascript:" layuimini-content-href="/account_look" data-title="基本资料"
data-icon="fa fa-gears">基本资料<span class="layui-badge-dot"></span></a>
</dd>
<dd style="display: none">
<a href="javascript:" layuimini-content-href="/user_password" data-title="修改密码"
data-icon="fa fa-gears">修改密码</a>
</dd>
<dd>
<hr>
</dd>
@ -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';
});
}

29
target/classes/templates/pages/application/application-in_back.html

@ -162,6 +162,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",
@ -171,13 +173,18 @@
success: function (d) {
var d = d.data;
if(d == null){
layer.msg("没有该编码,请确认是否输入正确");
layer.msg("没有该编码,请确认是否输入正确",{icon:5,time:500},function () {
layer.close(loading2);
$("#openSonByMaterial").val("");
$("#mid").val("");
$("#code").val("");
});
}else{
$("#openSonByMaterial").val(d.mname);
$("#mid").val(d.id);
layer.close(loading2);
}
}
});
@ -189,6 +196,8 @@
var data = $(this).val();
var req = {};
req.mname = data;
if(data !== ""){
let loading2 = layer.open({ type: 3, shade: [0.25, '#000'], icon: 2, speed: 0});
$.ajax({
url: "/material/findMaterialByCondition",
type: "post",
@ -197,15 +206,21 @@
contentType: "application/json;charset=utf-8",
success: function (d) {
if(d.count > 1){
layer.msg("请点击右侧搜索确定物品");
layer.msg("请点击右侧搜索确定物品",{icon:0,time:500},function () {
$("#mid").val("");
$("#code").val("");
layer.close(loading2)
});
return false;
}else if(d.count === 0){
layer.msg("没有该物品,请确认输入是否正确");
layer.msg("没有该物品,请确认输入是否正确",{icon:5,time:500},function () {
$("#mid").val("");
$("#code").val("");
$("#openSonByMaterial").val("");
layer.close(loading2)
});
return false;
}
else{
@ -213,9 +228,12 @@
$("#openSonByMaterial").val(material.mname)
$("#mid").val(material.id);
$("#code").val(material.code);
layer.close(loading2)
}
}
});
}
})
$('#openSonByDepository').on('click', function () {
@ -255,6 +273,8 @@
content: '/getMaterialAll?mname=' + mname + '&type=1',
end: function () {
var mid = $("#mid").val();
let loading2 = layer.open({ type: 3, shade: [0.25, '#000'], icon: 2, speed: 0});
$.ajax({
url: "/material/findMatrialById?mid=" + mid,
type: "get",
@ -265,7 +285,8 @@
if(code === undefined){
code = "";
}
$("#code").val(code)
$("#code").val(code);
layer.close(loading2)
}
});

34
target/classes/templates/pages/application/application-in_scanQrCode.html

@ -622,6 +622,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",
@ -632,12 +634,15 @@
var d = d.data;
var idNumber = materialId.name.split("mid")[1];
if (d == null) {
layer.msg("没有该编码,请确认是否输入正确");
layer.msg("没有该编码,请确认是否输入正确",{icon:5,time:500},function () {
materialName.value = "";
materialId.value = "";
obj.value = "";
$("#barCode" + idNumber).remove();
form.render();
layer.close(loading2)
});
} else {
materialName.value = d.mname;
materialId.value = d.id;
@ -672,12 +677,14 @@
$.each(materialAndBarCodeList, function (index, item) {
$("#barCode" + idNumber).append(new Option(item.bmcode, item.id));//往下拉菜单里添加元素
});
layer.close(loading2)
form.render();
} else {
var barCode = $("#barCode" + idNumber);
if (barCode.length > 0) {
barCode.empty();
}
layer.close(loading2)
}
}
}
@ -726,6 +733,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",
@ -774,6 +782,7 @@
$("#unit" + idNumber).append(new Option(unitList[i].newUnit, unitList[i].newUnit));
}
form.render();
layer.close(loading2)
}
});
}
@ -800,6 +809,7 @@
data = data.split(",")[0];
if(data !== ""){
req.mname = data;
let loading2 = layer.open({ type: 3, shade: [0.25, '#000'], icon: 2, speed: 0});
$.ajax({
url: "/material/findMaterialByCondition",
type: "post",
@ -808,15 +818,20 @@
contentType: "application/json;charset=utf-8",
success: function (d) {
if (d.count > 1) {
layer.msg("请点击右侧搜索确定物品");
layer.msg("请点击右侧搜索确定物品",{icon:0,time:500},function () {
materialId.value = "";
codeValue.value = "";
layer.close(loading2)
});
return false;
} else if (d.count === 0) {
layer.msg("没有该物品,请确认输入是否正确");
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];
@ -841,7 +856,7 @@
$("#unit" + idNumber).append(new Option(unitList[i].newUnit, unitList[i].newUnit));
}
form.render();
layer.close(loading2)
}
}
});
@ -859,6 +874,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: "/material/qywxApplicationInScanBarCode",
type: "post",
@ -910,12 +926,14 @@
$("#unit" + idNumber).append(new Option(unitList[i].newUnit, unitList[i].newUnit));
}
form.render();
layer.close(loading2);
}
else{
layer.msg("对于编码:" + result + ",并未发现对应的物料", {
icon: 0,
time: 1000 //0.5秒关闭(如果不配置,默认是3秒)
}, function () {
layer.close(loading2)
})
}
}
@ -967,6 +985,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: "/material/qywxApplicationInScanQrCode",
type: "post",
@ -996,6 +1015,7 @@
icon: 0,
time: 1000 //0.5秒关闭(如果不配置,默认是3秒)
}, function () {
layer.close(loading2)
})
} else {
@ -1039,6 +1059,7 @@
$("#unit" + idNumber).append(new Option(unitList[i].newUnit, unitList[i].newUnit));
}
form.render();
layer.close(loading2)
}
}
})
@ -1057,6 +1078,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",
@ -1075,6 +1097,8 @@
layer.msg("并未查询到对应位置,请重新扫描",{
icon:0,
time:1000
},function () {
layer.close(loading2)
});
} else if (flag === 1) {
// 如果获取到的是库位
@ -1082,6 +1106,7 @@
placeId.value = place.id;
depositoryId.value = place.did;
depositoryName.value = place.depositoryName;
layer.close(loading2)
} else if (flag === 2) {
// 如果获取到的是仓库
@ -1089,6 +1114,7 @@
placeId.value = "0";
depositoryId.value = depository.id;
depositoryName.value = depository.dname;
layer.close(loading2)
}
}
})

44
target/classes/templates/pages/application/application-out.html

@ -778,6 +778,7 @@
req.code = code;
req.type = "out";
if (code !== "") {
let loading2 = layer.open({ type: 3, shade: [0.25, '#000'], icon: 2, speed: 0});
$.ajax({
url: "/material/findMatrialByCode",
type: "get",
@ -787,11 +788,13 @@
success: function (d) {
var d = d.data;
if (d == null) {
layer.msg("仓库中暂无该物料");
layer.msg("仓库中暂无该物料",{icon:5,time:500},function () {
materialName.value = "";
materialId.value = "";
obj.value = "";
$('#place' + objId).empty();
layer.close(loading2)
});
} else {
materialName.value = d.mname;
@ -828,11 +831,13 @@
$("#barCode" + idNumber).append(new Option(item.bmcode, item.id));//往下拉菜单里添加元素
});
form.render();
layer.close(loading2)
} else {
var barCode = $("#barCode" + idNumber);
if (barCode.length > 0) {
barCode.empty();
}
layer.close(loading2)
}
}
}
@ -859,6 +864,7 @@
let req = {};
req.code = code;
if (code !== "") {
let loading2 = layer.open({ type: 3, shade: [0.25, '#000'], icon: 2, speed: 0});
$.ajax({
url: "/group/findGroupByCode",
type: "post",
@ -881,6 +887,7 @@
childNodes[i].remove()
}
}
layer.close(loading2)
})
} else {
let childNodes = parent.childNodes;
@ -890,6 +897,7 @@
childNodes[i].remove()
}
}
layer.close(loading2)
}
// 赋值给gname
gnameItem.value = data[0].gname;
@ -898,7 +906,7 @@
CoverpageForGroup(pid, data[i]);
}
element.init();
layer.close(loading2)
}
}
});
@ -942,6 +950,7 @@
iframeChildren.css('height', '100%');
},
end: function () {
let loading2 = layer.open({ type: 3, shade: [0.25, '#000'], icon: 2, speed: 0});
var mid = materialId.value;
if (mid !== '') {
$.ajax({
@ -993,6 +1002,7 @@
barCode.empty();
}
}
layer.close(loading2);
form.render();
}
});
@ -1043,6 +1053,7 @@
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;
$.ajax({
@ -1067,6 +1078,7 @@
childNodes[i].remove()
}
}
layer.close(loading2)
})
} else {
let childNodes = parent.childNodes;
@ -1083,7 +1095,7 @@
CoverpageForGroup(pid, data[i]);
}
element.init();
layer.close(loading2)
}
}
})
@ -1111,7 +1123,7 @@
if (gname !== '') {
let loading2 = layer.open({ type: 3, shade: [0.25, '#000'], icon: 2, speed: 0});
var req = {};
req.gname = gname;
$.ajax({
@ -1136,6 +1148,7 @@
childNodes[i].remove()
}
}
layer.close(loading2);
});
} else if (d.count === 0) {
// 如果当前组合名称不存在
@ -1152,6 +1165,7 @@
childNodes[i].remove()
}
}
layer.close(loading2);
});
} else {
// 正常
@ -1171,6 +1185,7 @@
CoverpageForGroup(pid, data[i]);
}
element.init();
layer.close(loading2);
}
}
@ -1184,6 +1199,7 @@
childNodes[i].remove()
}
}
layer.close(loading2);
}
};
@ -1207,6 +1223,7 @@
data = data.split(",")[0];
if (data !== "") {
req.mname = data;
let loading2 = layer.open({ type: 3, shade: [0.25, '#000'], icon: 2, speed: 0});
$.ajax({
url: "/material/findInventoryByCondition",
type: "post",
@ -1215,15 +1232,19 @@
contentType: "application/json;charset=utf-8",
success: function (d) {
if (d.count > 1) {
layer.msg("请点击右侧搜索确定物品");
layer.msg("请点击右侧搜索确定物品",{icon:0,time:500},function () {
layer.close(loading2);
materialId.value = "";
codeValue.value = "";
});
return false;
} else if (d.count === 0) {
layer.msg("没有该物品,请确认输入是否正确");
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];
@ -1269,6 +1290,7 @@
materialName.value = material.mname;
materialId.value = material.id;
codeValue.value = material.code;
layer.close(loading2);
}
}
});
@ -1295,6 +1317,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/qywxApplicationOutScanBarCode",
type: "post",
@ -1336,12 +1359,14 @@
$("#unit" + idNumber).append(new Option(unitList[i].newUnit, unitList[i].newUnit));
}
form.render();
layer.close(loading2);
} else {
// 如果没有对应关系
layer.msg("对于编码:" + result + ",并未发现仓库中存在对应的物料", {
icon: 0,
time: 1000 //0.5秒关闭(如果不配置,默认是3秒)
}, function () {
layer.close(loading2);
})
}
@ -1370,6 +1395,7 @@
var req = {};
req.qrCode = result;
req.codeFlag = 2;
let loading2 = layer.open({ type: 3, shade: [0.25, '#000'], icon: 2, speed: 0});
$.ajax({
url: "/material/qywxApplicationOutScanQrCode",
type: "post",
@ -1383,6 +1409,7 @@
icon: 0,
time: 1000 //0.5秒关闭(如果不配置,默认是3秒)
}, function () {
layer.close(loading2);
})
} else {
// 获取对应元素
@ -1447,6 +1474,7 @@
materialName.value = data.mname;
materialId.value = data.id;
materialCode.value = data.code;
layer.close(loading2);
}
}
})
@ -1508,6 +1536,7 @@
var req = {};
req.gid = gid;
req.quantity = val;
let loading2 = layer.open({ type: 3, shade: [0.25, '#000'], icon: 2, speed: 0});
$.ajax({
url: "/group/groupQuantityIsTrue",
type: "post",
@ -1522,9 +1551,12 @@
icon: 0,
time: 1000
}, function () {
layer.close(loading2);
$("#quantityForGroup" + id).val("");
});
}else{
layer.close(loading2);
}
}
});

33
target/classes/templates/pages/application/application-out_back.html

@ -159,7 +159,8 @@
var req = {};
req.code = code;
req.type = "out";
if(code !== ""){
if (code !== "") {
let loading2 = layer.open({type: 3, shade: [0.25, '#000'], icon: 2, speed: 0});
$.ajax({
url: "/material/findMatrialByCode",
type: "get",
@ -169,9 +170,12 @@
success: function (d) {
var d = d.data;
if (d == null) {
layer.msg("没有该编码,请确认是否输入正确");
layer.msg("没有该编码,请确认是否输入正确", {icon: 0, time: 500}, function () {
$("#mname").val("");
$("#mid").val("");
layer.close(loading2);
});
} else {
req.mid = d.id;
let unitItem = $("#unit");
@ -183,6 +187,7 @@
$("#mname").val(d.mname);
$("#mid").val(d.id);
form.render();
layer.close(loading2);
}
}
})
@ -194,6 +199,8 @@
var data = $(this).val();
var req = {};
req.mname = data;
if (data !== "") {
let loading2 = layer.open({type: 3, shade: [0.25, '#000'], icon: 2, speed: 0});
$.ajax({
url: "/material/findInventoryByCondition",
type: "post",
@ -202,14 +209,19 @@
contentType: "application/json;charset=utf-8",
success: function (d) {
if (d.count > 1) {
layer.msg("请点击右侧搜索确定物品");
layer.msg("请点击右侧搜索确定物品", {icon: 0, time: 500}, function () {
$("#mid").val("");
$("#code").val("");
layer.close(loading2);
});
return false;
} else if (d.count === 0) {
layer.msg("没有该物品,请确认输入是否正确");
layer.msg("没有该物品,请确认输入是否正确", {icon: 0, time: 500}, function () {
layer.close(loading2);
$("#mid").val("");
$("#code").val("");
});
return false;
} else {
var material = d.data[0];
@ -222,9 +234,12 @@
$("#unit").append(new Option(item.newUnit, item.newUnit));
});
form.render();
layer.close(loading2);
}
}
});
}
});
$('#openSonByDepository').on('click', function () {
@ -271,6 +286,7 @@
},
end: function () {
var mid = $("#mid").val();
let loading2 = layer.open({ type: 3, shade: [0.25, '#000'], icon: 2, speed: 0});
$.ajax({
url: "/material/findMatrialById?mid=" + mid,
type: "get",
@ -288,7 +304,7 @@
$("#unit").append(new Option(item.newUnit, item.newUnit));
});
form.render();
layer.close(loading2);
}
});
@ -310,7 +326,7 @@
form.on('submit(formStep)', function (data) {
if(!flagForForm){
if (!flagForForm) {
flagForForm = true;
data = data.field;
var params = [];
@ -376,6 +392,7 @@
req.quantity = val;
req.unit = unit;
req.placeId = -1;
let loading2 = layer.open({ type: 3, shade: [0.25, '#000'], icon: 2, speed: 0});
$.ajax({
url: "/material/MaterialQuantityIsTrue",
type: "post",
@ -387,8 +404,10 @@
if (!flag) { // 如果当前数目不合适
layer.msg("当前单仓库中物料数量不足", {icon: 0, time: 500}, function () {
$("#quantity").val("");
layer.close(loading2);
});
}else{
layer.close(loading2);
}
}
});

5
target/classes/templates/pages/application/application-review.html

@ -240,7 +240,7 @@
flagForForm = true;
let data = {};
data.id = $("#id").text();
if (pass == 1) {
if (pass === 1) {
data.departmentheadPass = 1;
} else {
data.departmentheadPass = 2;
@ -248,14 +248,13 @@
data.departmentheadMessage = $("#departmentheadMessageF").val();
send(data);
}
};
check = function (pass) {
if(!flagForForm) {
flagForForm = true;
let data = {};
data.id = $("#id").text();
if (pass == 1) {
if (pass === 1) {
data.depositoryManagerPass = 1;
} else {
data.depositoryManagerPass = 2;

271
target/classes/templates/pages/application/application-transfer.html

@ -12,31 +12,39 @@
</head>
<body>
<style>
.inputdiv{
display:flex;background-color: #fff;height: 38px;line-height: 38px;border: 1px solid rgb(238, 238, 238);
.inputdiv {
display: flex;
background-color: #fff;
height: 38px;
line-height: 38px;
border: 1px solid rgb(238, 238, 238);
}
.layui-form-label{
.layui-form-label {
padding: 9px 0px;
text-align: left;
}
.layui-input-block{
.layui-input-block {
margin-left: 80px;
}
.layui-form-select{
.layui-form-select {
width: 100%;
}
.layui-card-body{
.layui-card-body {
padding: 10px 5px;
}
.lay-step{
.lay-step {
display: none;
}
</style>
<div class="layuimini-container">
<div class="layuimini-main">
<div class="layui-fluid">
<!-- 库存转移申请-->
<!-- 库存转移申请-->
<div class="layui-carousel" id="stepForm" lay-filter="stepForm" style="margin: 0 auto;">
<div carousel-item style="overflow: inherit">
@ -45,18 +53,21 @@
<div class="layui-card" id="cardParent">
<div class="layui-card-body" id="cardItem">
<hr>
<i class="layui-icon layui-icon-subtraction" style="display: inline" onclick="deleteItem(this)"></i>
<i class="layui-icon layui-icon-subtraction" style="display: inline"
onclick="deleteItem(this)"></i>
<div class="layui-form-item">
<label class="layui-form-label" style="height: 40px;">物料名称:</label>
<div class="layui-input-block">
<div class="inputdiv">
<input type="text" placeholder="请选择物料" class="layui-input" style="border-style: none"
<input type="text" placeholder="请选择物料" class="layui-input"
style="border-style: none"
id="openSonByMaterial" onblur="selectMaterialByName(this)"
lay-verify="required"/>
<i class="layui-icon layui-icon-search" style="display: inline" id="selectMaterial" onclick="selectMaterial(this)"></i>
<i class="layui-icon layui-icon-search" style="display: inline"
id="selectMaterial" onclick="selectMaterial(this)"></i>
</div>
<input type="text" name="mid" class="layui-input" id="mid"
style="display: none" lay-verify="required" />
style="display: none" lay-verify="required"/>
</div>
</div>
@ -81,7 +92,8 @@
value=""
class="layui-input"
style="border-style: none">
<img src="/static/images/search.ico" height="16" width="16" id="barCodeImg"
<img src="/static/images/search.ico" height="16" width="16"
id="barCodeImg"
style="margin-top: 10px" onclick="scanBarCode(this)">
</div>
</div>
@ -95,7 +107,9 @@
<div class="layui-form-item">
<label class="layui-form-label">物料数量:</label>
<div class="layui-input-block">
<input id="quantity" name="quantity" type="number" onblur="MaterialQuantityIsTrue(this)" placeholder="请填写入物料数量" value="" class="layui-input" lay-verify="number" required>
<input id="quantity" name="quantity" type="number"
onblur="MaterialQuantityIsTrue(this)" placeholder="请填写入物料数量" value=""
class="layui-input" lay-verify="number" required>
</div>
</div>
<div class="layui-form-item">
@ -110,10 +124,13 @@
<label class="layui-form-label" style="height: 40px;">仓库:</label>
<div class="layui-input-block">
<div class="inputdiv">
<input type="text" placeholder="请选择仓库" class="layui-input" style="border-style: none"
id="openSonByDepository" readonly onclick="openDepositoryTree(this)"
<input type="text" placeholder="请选择仓库" class="layui-input"
style="border-style: none"
id="openSonByDepository" readonly
onclick="openDepositoryTree(this)"
lay-verify="required"/>
<input type="text" name="depositoryId" class="layui-input" id="depositoryId"
<input type="text" name="depositoryId" class="layui-input"
id="depositoryId"
style="display: none" lay-verify="required"/>
<input type="text" name="placeId" class="layui-input" id="placeId"
style="display: none" lay-verify="required"/>
@ -126,15 +143,18 @@
<div class="layui-form-item">
<label class="layui-form-label">备注说明:</label>
<div class="layui-input-block">
<input name="applyRemark" placeholder="请填写相关原因及申请原因" value="" class="layui-input"/>
<input name="applyRemark" placeholder="请填写相关原因及申请原因" value=""
class="layui-input"/>
</div>
</div>
<i class="layui-icon layui-icon-addition" style="display: inline" onclick="addItem(this)"></i>
<i class="layui-icon layui-icon-addition" style="display: inline"
onclick="addItem(this)"></i>
</div>
<!-- 提交-->
<div class="layui-form-item" id="btn_sub">
<div class="layui-input-block">
<button class="layui-btn" lay-submit lay-filter="formStep" style="margin-bottom: 10px;margin-left: 15%">
<button class="layui-btn" lay-submit lay-filter="formStep"
style="margin-bottom: 10px;margin-left: 15%">
&emsp;提交&emsp;
</button>
</div>
@ -167,17 +187,29 @@
<script src="/static/js/lay-config.js?v=1.0.4" charset="utf-8"></script>
<script>
// 用于添加标签
function addItem(obj){}
function addItem(obj) {
}
// 用于删除标签
function deleteItem(obj){}
function deleteItem(obj) {
}
// 用于编码查询
function selectCode(obj){}
function selectCode(obj) {
}
// 用于点击搜索按钮
function selectMaterial(obj){}
function selectMaterial(obj) {
}
// 用于物料名称查询
function selectMaterialByName(obj){}
function selectMaterialByName(obj) {
}
// 用于加载仓库菜单
function openDepositoryTree(obj){}
function openDepositoryTree(obj) {
}
// 用于扫码转移
function scanCodeByTransfer(obj) {
}
@ -196,6 +228,7 @@
function scanLocationByQrCode() {
}
// 用于暂存卡片个数
var params = [];
let scanValue = {};
@ -203,7 +236,7 @@
var NewIdNumber = 1;
// 用于标志是否为第一次提交
let flagForForm = false;
layui.use([ 'form', 'step','layer','jquery'], function () {
layui.use(['form', 'step', 'layer', 'jquery'], function () {
var $ = layui.$,
form = layui.form,
step = layui.step;
@ -223,17 +256,17 @@
form.on('submit(formStep)', function (data) {
if(!flagForForm){
if (!flagForForm) {
flagForForm = true;
data=data.field;
data = data.field;
data.params = params;
if(data.mid === undefined){
if (data.mid === undefined) {
// 如果没有初始项
var dataKeys = Object.keys(data);
var dataKey;
for (let i = 0; i < dataKeys.length; i++) {
dataKey = dataKeys[i];
if(dataKey.includes("mid")){
if (dataKey.includes("mid")) {
break;
}
}
@ -241,33 +274,33 @@
var keyNumber = dataKey.split("mid")[1];
for (let index = 0; index < dataKeys.length; index++) {
var tempKey = dataKeys[index];
if(tempKey.includes(keyNumber)){
var key = tempKey.replace(keyNumber,"");
if (tempKey.includes(keyNumber)) {
var key = tempKey.replace(keyNumber, "");
data[key] = data[tempKey];
delete data[tempKey];
}
}
data.params = remove(data.params,Number(keyNumber));
data.params = remove(data.params, Number(keyNumber));
}
$.ajax({
url:"/depositoryRecord/transfer",
type:'put',
dataType:'json',
url: "/depositoryRecord/transfer",
type: 'put',
dataType: 'json',
contentType: "application/json;charset=utf-8",
data:JSON.stringify(data),
beforeSend:function () {
this.layerIndex = layer.load(0, { shade: [0.5, '#393D49'] });
data: JSON.stringify(data),
beforeSend: function () {
this.layerIndex = layer.load(0, {shade: [0.5, '#393D49']});
},
success:function(data){
success: function (data) {
layer.close(this.layerIndex);
if(data.status >= 300){
if (data.status >= 300) {
layer.msg(data.statusInfo.message);//失败的表情
return;
}else{
} else {
layer.msg("申请提交成功", {
icon: 6,//成功的表情
time: 500 //1秒关闭(如果不配置,默认是3秒)
}, function(){
}, function () {
step.next('#stepForm');
});
}
@ -303,7 +336,7 @@
NewIdNumber = NewIdNumber + 1;
// 物料名称栏目
var materialItem = `
<div class="layui-card-body" style="padding-right: 0px" id=`+"cardItem"+NewIdNumber+`>
<div class="layui-card-body" style="padding-right: 0px" id=` + "cardItem" + NewIdNumber + `>
<hr>
<i class="layui-icon layui-icon-subtraction" style="display: inline" onclick="deleteItem(this)"></i>
<div class="layui-form-item">
@ -314,7 +347,7 @@
id="openSonByMaterial" lay-verify="required" onblur="selectMaterialByName(this)"/>
<i class="layui-icon layui-icon-search" style="display: inline" id="selectMaterial" onclick="selectMaterial(this)"></i>
</div>
<input type="text" name=`+"mid"+NewIdNumber+` class="layui-input" id="mid"
<input type="text" name=` + "mid" + NewIdNumber + ` class="layui-input" id="mid"
style="display: none" lay-verify="required" />
</div>
</div>
@ -322,7 +355,7 @@
<label class="layui-form-label">物料编码:</label>
<div class="layui-input-block" style="margin: 0px;">
<div class="inputdiv">
<input id=`+"code"+NewIdNumber+` name=`+"code"+NewIdNumber+` type="text" placeholder="请填写入物料编码" value="" onblur="selectCode(this)"
<input id=` + "code" + NewIdNumber + ` name=` + "code" + NewIdNumber + ` type="text" placeholder="请填写入物料编码" value="" onblur="selectCode(this)"
class="layui-input" lay-verify="required" style="border-style: none">
<img src="/static/images/search.ico" height="16" width="16"
style="margin-top: 10px" onclick="scanCodeByTransfer(this)">
@ -333,9 +366,9 @@
<label class="layui-form-label">条形编码:</label>
<div class="layui-input-block" style="margin: 0px;">
<div class="inputdiv">
<input id=`+"barCode"+NewIdNumber +` name=`+"barCode"+NewIdNumber+` type="text" placeholder="请填写入物料编码" value="" onblur="selectCode(this)"
<input id=` + "barCode" + NewIdNumber + ` name=` + "barCode" + NewIdNumber + ` type="text" placeholder="请填写入物料编码" value="" onblur="selectCode(this)"
class="layui-input" style="border-style: none">
<img src="/static/images/search.ico" height="16" width="16" id=`+"barCodeImg"+NewIdNumber+`
<img src="/static/images/search.ico" height="16" width="16" id=` + "barCodeImg" + NewIdNumber + `
style="margin-top: 10px" onclick="scanBarCode(this)">
</div>
@ -344,20 +377,20 @@
<div class="layui-form-item">
<label class="layui-form-label">所处库位:</label>
<div class="layui-input-block">
<select name=`+"fromPlaceId"+NewIdNumber +` id=`+"place"+NewIdNumber +`></select>
<select name=` + "fromPlaceId" + NewIdNumber + ` id=` + "place" + NewIdNumber + `></select>
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">物料数量:</label>
<div class="layui-input-block">
<input name=`+"quantity"+NewIdNumber+` id=`+"quantity"+NewIdNumber+` type="number" placeholder="请填写入物料数量" value="" onblur="MaterialQuantityIsTrue(this)"
<input name=` + "quantity" + NewIdNumber + ` id=` + "quantity" + NewIdNumber + ` type="number" placeholder="请填写入物料数量" value="" onblur="MaterialQuantityIsTrue(this)"
class="layui-input" lay-verify="number">
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">计量单位:</label>
<div class="layui-input-block">
<select id=`+"unit"+NewIdNumber +` name=`+"unit"+NewIdNumber +`>
<select id=` + "unit" + NewIdNumber + ` name=` + "unit" + NewIdNumber + `>
</select>
</div>
@ -369,9 +402,9 @@
<input type="text" placeholder="请选择仓库" class="layui-input" style="border-style: none"
id="openSonByDepository" readonly onclick="openDepositoryTree(this)"
lay-verify="required"/>
<input type="text" name=`+"depositoryId"+NewIdNumber+` class="layui-input" id="depositoryId"
<input type="text" name=` + "depositoryId" + NewIdNumber + ` class="layui-input" id="depositoryId"
style="display: none" lay-verify="required"/>
<input type="text" name=`+"placeId"+NewIdNumber+` class="layui-input" id="placeId"
<input type="text" name=` + "placeId" + NewIdNumber + ` class="layui-input" id="placeId"
style="display: none" lay-verify="required"/>
<img src="/static/images/search.ico" height="16" width="16"
id="scanLocation"
@ -382,7 +415,7 @@
<div class="layui-form-item">
<label class="layui-form-label">备注说明:</label>
<div class="layui-input-block">
<input name=`+"applyRemark"+NewIdNumber+` placeholder="请填写相关原因及申请原因" value=""
<input name=` + "applyRemark" + NewIdNumber + ` placeholder="请填写相关原因及申请原因" value=""
class="layui-input"/>
</div>
</div>
@ -391,8 +424,8 @@
// 获取当前高度
var height = parseInt(($("#stepForm").css('height')).split("px")[0]);
params.push(NewIdNumber)
$("#stepForm").css("height",height+532 +'px');
$("#"+parentId).after(materialItem);
$("#stepForm").css("height", height + 532 + 'px');
$("#" + parentId).after(materialItem);
};
@ -405,14 +438,13 @@
// 获取祖父节点
var reparent = parent.parentNode;
var height = parseInt(($("#stepForm").css('height')).split("px")[0]);
$("#stepForm").css("height",height-532 +'px');
params = remove(params,parentId);
$("#stepForm").css("height", height - 532 + 'px');
params = remove(params, parentId);
reparent.removeChild(parent);
};
// 用于实现扫描条形码
scanBarCode = function (obj) {
parent.wx.scanQRCode({
desc: 'scanQRCode desc',
needResult: 1, // 默认为0,扫描结果由企业微信处理,1则直接返回扫描结果,
@ -423,6 +455,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/qywxApplicationOutScanBarCode",
type: "post",
@ -448,7 +481,7 @@
var materialCode = materialCodeItem.childNodes[1];
var data = d.data;
if(data!==null) {
if (data !== null) {
materialName.value = data.mname;
materialId.value = data.mid;
@ -475,13 +508,14 @@
$('#place' + codeId).append(new Option(item.depositoryName + "-" + item.code, item.id));//往下拉菜单里添加元素
});
form.render();
}
else{
layer.close(loading2);
} else {
// 如果没有对应关系
layer.msg("对于编码:" + result + ",并未发现对应的物料", {
icon: 0,
time: 1000 //0.5秒关闭(如果不配置,默认是3秒)
}, function () {
layer.close(loading2);
})
}
@ -498,7 +532,7 @@
function remove(arr, item) {
var result = [];
for (let i = 0; i < arr.length; i++) {
if(arr[i] === item){
if (arr[i] === item) {
continue;
}
result.push(arr[i]);
@ -511,13 +545,14 @@
parent.wx.scanQRCode({
desc: 'scanQRCode desc',
needResult: 1, // 默认为0,扫描结果由企业微信处理,1则直接返回扫描结果,
scanType: ["qrCode","barCode"], // 可以指定扫二维码还是条形码(一维码),默认二者都有
scanType: ["qrCode", "barCode"], // 可以指定扫二维码还是条形码(一维码),默认二者都有
success: function (res) {
// 回调
var result = res.resultStr;//当needResult为1时返回处理结果
var req = {};
req.qrCode = result;
req.codeFlag = 2;
let loading2 = layer.open({type: 3, shade: [0.25, '#000'], icon: 2, speed: 0});
$.ajax({
url: "/material/qywxApplicationOutScanQrCode",
type: "post",
@ -532,6 +567,7 @@
icon: 0,
time: 1000 //0.5秒关闭(如果不配置,默认是3秒)
}, function () {
layer.close(loading2);
})
} else {
@ -592,6 +628,7 @@
materialName.value = data.mname;
materialId.value = data.id;
materialCode.value = data.code;
layer.close(loading2);
}
}
})
@ -600,7 +637,7 @@
};
// 用于实现通过编码查询物料
selectCode = function(obj){
selectCode = function (obj) {
// 输入code
var code = obj.value;
var codeId = obj.name.split("code")[1];
@ -616,29 +653,33 @@
var req = {};
req.code = code;
req.type = "out";
if(code !== ""){
if (code !== "") {
let loading2 = layer.open({type: 3, shade: [0.25, '#000'], icon: 2, speed: 0});
$.ajax({
url: "/material/findMatrialByCode",
type: "get",
dataType: 'json',
data:req,
data: req,
contentType: "application/json;charset=utf-8",
success: function (d) {
var d = d.data;
if(d == null){
layer.msg("没有该编码,请确认是否输入正确");
if (d == null) {
layer.msg("没有该编码,请确认是否输入正确", {icon: 5, time: 500}, function () {
materialName.value = "";
materialId.value = "";
obj.value = "";
}else{
layer.close(loading2);
});
} else {
req.mid = d.id;
$.ajax({
url: "/place/findPlaceByMid",
type: "post",
dataType: 'json',
data:JSON.stringify(req),
data: JSON.stringify(req),
contentType: "application/json;charset=utf-8",
success:function (res) {
success: function (res) {
var idNumber = materialId.name.split("mid")[1];
// 获取物料与条形码的对应关系
var materialAndBarCodeList = d["materialAndBarCodeList"];
@ -684,6 +725,7 @@
form.render();
materialName.value = d.mname;
materialId.value = d.id;
layer.close(loading2);
}
});
}
@ -707,7 +749,6 @@
var mname = materialName.value;
var barCodeChildren = parent.childNodes[9];
var barCodeItem = barCodeChildren.childNodes[3];
mname = mname.split(",")[0];
layer.open({
type: 2,
@ -717,20 +758,21 @@
shadeClose: true, //点击遮罩关闭层
area: ['70%', '70%'],
// content: '/selectMaterialByCard?mname='+mname+'&type=2&clickObj='+parentId,
content: '/getMaterialAll?mname='+mname+'&type=2&clickObj='+parentId,
move : '.layui-layer-title',
fixed:false,
success: function(layero, index){
content: '/getMaterialAll?mname=' + mname + '&type=2&clickObj=' + parentId,
move: '.layui-layer-title',
fixed: false,
success: function (layero, index) {
var children = layero.children();
var content = $(children[1]);
var iframeChildren = $(content.children());
content.css('height','100%');
iframeChildren.css('height','100%');
content.css('height', '100%');
iframeChildren.css('height', '100%');
},
end: function () {
var mid = materialId.value;
let loading2 = layer.open({type: 3, shade: [0.25, '#000'], icon: 2, speed: 0});
$.ajax({
url: "/material/findMatrialById?mid=" + mid+"&type=out",
url: "/material/findMatrialById?mid=" + mid + "&type=out",
type: "get",
dataType: 'json',
contentType: "application/json;charset=utf-8",
@ -738,14 +780,14 @@
var material = d.data.materialById;
var placeList = d.data.placeList;
var code = material.code;
if(code === undefined){
if (code === undefined) {
code = "";
}
codeValue.value = code;
var idNumber = materialId.name.split("mid")[1];
$('#place'+idNumber).empty();
$('#place' + idNumber).empty();
$.each(placeList, function (index, item) {
$('#place'+idNumber).append(new Option(item.depositoryName+"-"+item.code, item.id));//往下拉菜单里添加元素
$('#place' + idNumber).append(new Option(item.depositoryName + "-" + item.code, item.id));//往下拉菜单里添加元素
});
var unit = $("#unit" + idNumber);
unit.empty();
@ -781,14 +823,14 @@
$("#barCode" + idNumber).append(new Option(item.bmcode, item.id));//往下拉菜单里添加元素
});
form.render();
}
else {
} else {
var barCode = $("#barCode" + idNumber);
if (barCode.length > 0) {
barCode.empty();
}
}
form.render();
layer.close(loading2);
}
});
@ -814,35 +856,40 @@
var barCodeItem = barCodeChildren.childNodes[3];
var req = {};
data = data.split(",")[0];
if(data !== ""){
if (data !== "") {
req.mname = data;
let loading2 = layer.open({type: 3, shade: [0.25, '#000'], icon: 2, speed: 0});
$.ajax({
url: "/material/findInventoryByCondition",
type: "post",
dataType: 'json',
data:JSON.stringify(req),
data: JSON.stringify(req),
contentType: "application/json;charset=utf-8",
success: function (d) {
if(d.count > 1){
layer.msg("请点击右侧搜索确定物品");
if (d.count > 1) {
layer.msg("请点击右侧搜索确定物品", {icon: 0, time: 500}, function () {
materialId.value = "";
codeValue.value = "";
layer.close(loading2);
})
return false;
}else if(d.count === 0){
layer.msg("没有该物品,请确认输入是否正确");
} else if (d.count === 0) {
layer.msg("没有该物品,请确认输入是否正确", {icon: 0, time: 500}, function () {
materialId.value = "";
codeValue.value = "";
materialName.value = "";
layer.close(loading2);
});
return false;
}
else{
} else {
var idNumber = materialId.name.split("mid")[1];
var material = d.data[0];
var unit = $("#unit" + idNumber);
unit.empty();
$("#unit" + idNumber).append(new Option(material.baseUnit, "-1"));
var unitList = material["splitInfoList"];
if(unitList !== null && unitList != undefined){
if (unitList !== null && unitList != undefined) {
for (let i = 0; i < unitList.length; i++) {
$("#unit" + idNumber).append(new Option(unitList[i].newUnit, unitList[i].newUnit));
}
@ -886,6 +933,7 @@
materialName.value = material.mname;
materialId.value = material.id;
codeValue.value = material.code;
layer.close(loading2);
}
}
});
@ -904,15 +952,15 @@
maxmin: true,
shadeClose: true, //点击遮罩关闭层
area: ['70%', '70%'],
move : '.layui-layer-title',
fixed:false,
content: '/selectDepositoryByCard?type=1&clickObj='+parentId,
success: function(layero, index){
move: '.layui-layer-title',
fixed: false,
content: '/selectDepositoryByCard?type=1&clickObj=' + parentId,
success: function (layero, index) {
var children = layero.children();
var content = $(children[1]);
var iframeChildren = $(content.children());
content.css('height','100%');
iframeChildren.css('height','100%');
content.css('height', '100%');
iframeChildren.css('height', '100%');
}
});
};
@ -921,12 +969,13 @@
parent.wx.scanQRCode({
desc: 'scanQRCode desc',
needResult: 1, // 默认为0,扫描结果由企业微信处理,1则直接返回扫描结果,
scanType: ["qrCode","barCode"], // 可以指定扫二维码还是条形码(一维码),默认二者都有
scanType: ["qrCode", "barCode"], // 可以指定扫二维码还是条形码(一维码),默认二者都有
success: function (res) {
// 回调
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",
@ -940,22 +989,26 @@
var depositoryName = parent.childNodes[1];
var depositoryId = parent.childNodes[3];
var placeId = parent.childNodes[5];
if(flag === 0){
if (flag === 0) {
// 如果没有获取到位置
layer.msg("当前二维码错误,请重新扫描");
}else if(flag === 1){
layer.msg("当前二维码错误,请重新扫描",{icon:5,time:500},function () {
layer.close(loading2);
});
} else if (flag === 1) {
// 如果获取到的是库位
var place = data["place"];
placeId.value = place.id;
depositoryId.value = place.did;
depositoryName.value = place.depositoryName;
layer.close(loading2);
}else if(flag === 2){
} else if (flag === 2) {
// 如果获取到的是仓库
var depository = data["depository"];
placeId.value = 0;
depositoryId.value = depository.id;
depositoryName.value = depository.dname;
layer.close(loading2);
}
}
})
@ -967,7 +1020,7 @@
MaterialQuantityIsTrue = function (obj) {
var id = obj.id.split("quantity")[1];
var mcode = $("#code" + id).val(); // 获取到当前输入的物料编码
var unit = $("#unit"+id).val();
var unit = $("#unit" + id).val();
if (mcode === "" || mcode === undefined || mcode === null) {
layer.msg("请输入物料的正确编码!", {icon: 0, time: 500}, function () {
$("#quantity" + id).val("")
@ -979,7 +1032,8 @@
req.mcode = mcode;
req.quantity = val;
req.unit = unit;
req.placeId = $("#place"+id).val();
req.placeId = $("#place" + id).val();
let loading2 = layer.open({ type: 3, shade: [0.25, '#000'], icon: 2, speed: 0});
$.ajax({
url: "/material/MaterialQuantityIsTrue",
type: "post",
@ -991,6 +1045,7 @@
if (!flag) { // 如果当前数目不合适
layer.msg("当前物料数量不足", {icon: 0, time: 500}, function () {
$("#quantity" + id).val("");
layer.close(loading2);
});
}

196
target/classes/templates/pages/application/application-transfer_back.html

@ -12,18 +12,24 @@
</head>
<body>
<style>
.inputdiv{
display:flex;background-color: #fff;height: 38px;line-height: 38px;border: 1px solid rgb(238, 238, 238);
.inputdiv {
display: flex;
background-color: #fff;
height: 38px;
line-height: 38px;
border: 1px solid rgb(238, 238, 238);
}
.layui-form-label{
.layui-form-label {
padding: 9px 0px;
text-align: left;
}
.layui-input-block{
.layui-input-block {
margin-left: 80px;
}
.lay-step{
.lay-step {
display: none;
}
@ -36,29 +42,34 @@
<div carousel-item style="overflow: inherit">
<div>
<form class="layui-form layui-form-pane" style="margin: 0 auto;max-width: 460px;padding-top: 40px;">
<form class="layui-form layui-form-pane"
style="margin: 0 auto;max-width: 460px;padding-top: 40px;">
<div class="layui-card" id="cardParent">
<div class="layui-card-body" id="cardItem1">
<hr>
<i class="layui-icon layui-icon-subtraction" style="display: inline" onclick="deleteItem(this)"></i>
<i class="layui-icon layui-icon-subtraction" style="display: inline"
onclick="deleteItem(this)"></i>
<div class="layui-form-item">
<label class="layui-form-label">物料名称:</label>
<div class="layui-input-block">
<div class="inputdiv">
<input type="text" placeholder="请选择物料" class="layui-input" style="border-style: none"
<input type="text" placeholder="请选择物料" class="layui-input"
style="border-style: none"
id="openSonByMaterial" onblur="selectMaterialByName(this)"
lay-verify="required"/>
<i class="layui-icon layui-icon-search" style="display: inline" id="selectMaterial" onclick="selectMaterial(this)"></i>
<i class="layui-icon layui-icon-search" style="display: inline"
id="selectMaterial" onclick="selectMaterial(this)"></i>
</div>
<input type="text" name="mid" class="layui-input" id="mid"
style="display: none" lay-verify="required" />
style="display: none" lay-verify="required"/>
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">物料编码:</label>
<div class="layui-input-block">
<input id="code" name="code" type="text" placeholder="请填写入物料编码" value="" onblur="selectCode(this)"
<input id="code" name="code" type="text" placeholder="请填写入物料编码" value=""
onblur="selectCode(this)"
class="layui-input" lay-verify="required">
</div>
</div>
@ -71,7 +82,8 @@
<div class="layui-form-item">
<label class="layui-form-label">物料数量:</label>
<div class="layui-input-block">
<input name="quantity" type="number" placeholder="请填写入物料数量" value="" class="layui-input" lay-verify="number" required>
<input name="quantity" type="number" placeholder="请填写入物料数量" value=""
class="layui-input" lay-verify="number" required>
</div>
</div>
<div class="layui-form-item">
@ -89,15 +101,18 @@
<div class="layui-form-item">
<label class="layui-form-label">备注说明:</label>
<div class="layui-input-block">
<input name="applyRemark" placeholder="请填写相关原因及申请原因" value="" class="layui-input"/>
<input name="applyRemark" placeholder="请填写相关原因及申请原因" value=""
class="layui-input"/>
</div>
</div>
<i class="layui-icon layui-icon-addition" style="display: inline" onclick="addItem(this)"></i>
<i class="layui-icon layui-icon-addition" style="display: inline"
onclick="addItem(this)"></i>
</div>
<!-- 提交-->
<div class="layui-form-item">
<div class="layui-input-block">
<button class="layui-btn" lay-submit lay-filter="formStep" style="margin-bottom: 10px;margin-left: 15%">
<button class="layui-btn" lay-submit lay-filter="formStep"
style="margin-bottom: 10px;margin-left: 15%">
&emsp;提交&emsp;
</button>
</div>
@ -136,24 +151,36 @@
<script src="/static/js/lay-config.js?v=1.0.4" charset="utf-8"></script>
<script>
// 用于添加标签
function addItem(obj){}
function addItem(obj) {
}
// 用于删除标签
function deleteItem(obj){}
function deleteItem(obj) {
}
// 用于编码查询
function selectCode(obj){}
function selectCode(obj) {
}
// 用于点击搜索按钮
function selectMaterial(obj){}
function selectMaterial(obj) {
}
// 用于物料名称查询
function selectMaterialByName(obj){}
function selectMaterialByName(obj) {
}
// 用于加载仓库菜单
function openDepositoryTree(obj){}
function openDepositoryTree(obj) {
}
// 用于暂存卡片个数
var params = [];
// 用于卡片编号
var NewIdNumber = 1;
// 用于标志是否为第一次提交
let flagForForm = false;
layui.use([ 'form', 'step','layer','jquery'], function () {
layui.use(['form', 'step', 'layer', 'jquery'], function () {
var $ = layui.$,
form = layui.form,
step = layui.step;
@ -173,29 +200,29 @@
form.on('submit(formStep)', function (data) {
if(!flagForForm){
if (!flagForForm) {
flagForForm = true;
data=data.field;
data = data.field;
data.params = params;
$.ajax({
url:"/depositoryRecord/transfer",
type:'put',
dataType:'json',
url: "/depositoryRecord/transfer",
type: 'put',
dataType: 'json',
contentType: "application/json;charset=utf-8",
data:JSON.stringify(data),
beforeSend:function () {
this.layerIndex = layer.load(0, { shade: [0.5, '#393D49'] });
data: JSON.stringify(data),
beforeSend: function () {
this.layerIndex = layer.load(0, {shade: [0.5, '#393D49']});
},
success:function(data){
success: function (data) {
layer.close(this.layerIndex);
if(data.status >= 300){
if (data.status >= 300) {
layer.msg(data.statusInfo.message);//失败的表情
return;
}else{
} else {
layer.msg("申请提交成功", {
icon: 6,//成功的表情
time: 500 //1秒关闭(如果不配置,默认是3秒)
}, function(){
}, function () {
step.next('#stepForm');
});
}
@ -231,7 +258,7 @@
NewIdNumber = NewIdNumber + 1;
// 物料名称栏目
var materialItem = `
<div class="layui-card-body" style="padding-right: 0px" id=`+"cardItem"+NewIdNumber+`>
<div class="layui-card-body" style="padding-right: 0px" id=` + "cardItem" + NewIdNumber + `>
<hr>
<i class="layui-icon layui-icon-subtraction" style="display: inline" onclick="deleteItem(this)"></i>
<div class="layui-form-item">
@ -242,27 +269,27 @@
id="openSonByMaterial" lay-verify="required" onblur="selectMaterialByName(this)"/>
<i class="layui-icon layui-icon-search" style="display: inline" id="selectMaterial" onclick="selectMaterial(this)"></i>
</div>
<input type="text" name=`+"mid"+NewIdNumber+` class="layui-input" id="mid"
<input type="text" name=` + "mid" + NewIdNumber + ` class="layui-input" id="mid"
style="display: none" lay-verify="required" />
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">物料编码:</label>
<div class="layui-input-block">
<input id="code" name=`+"code"+NewIdNumber+` type="text" placeholder="请填写入物料编码" value="" onblur="selectCode(this)"
<input id="code" name=` + "code" + NewIdNumber + ` type="text" placeholder="请填写入物料编码" value="" onblur="selectCode(this)"
class="layui-input" lay-verify="required">
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">所处库位:</label>
<div class="layui-input-block">
<select name=`+"placeId"+NewIdNumber +` id=`+"place"+NewIdNumber +`></select>
<select name=` + "placeId" + NewIdNumber + ` id=` + "place" + NewIdNumber + `></select>
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">物料数量:</label>
<div class="layui-input-block">
<input name=`+"quantity"+NewIdNumber+` type="number" placeholder="请填写入物料数量" value=""
<input name=` + "quantity" + NewIdNumber + ` type="number" placeholder="请填写入物料数量" value=""
class="layui-input" lay-verify="number">
</div>
</div>
@ -272,16 +299,16 @@
<input type="text" placeholder="请选择仓库" class="layui-input"
id="openSonByDepository" readonly onclick="openDepositoryTree(this)"
lay-verify="required"/>
<input type="text" name=`+"depositoryId"+NewIdNumber+` class="layui-input" id="depositoryId"
<input type="text" name=` + "depositoryId" + NewIdNumber + ` class="layui-input" id="depositoryId"
style="display: none" lay-verify="required"/>
<input type="text" name=`+"placeId"+NewIdNumber+` class="layui-input" id="placeId"
<input type="text" name=` + "placeId" + NewIdNumber + ` class="layui-input" id="placeId"
style="display: none" lay-verify="required"/>
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">备注说明:</label>
<div class="layui-input-block">
<input name=`+"applyRemark"+NewIdNumber+` placeholder="请填写相关原因及申请原因" value=""
<input name=` + "applyRemark" + NewIdNumber + ` placeholder="请填写相关原因及申请原因" value=""
class="layui-input"/>
</div>
</div>
@ -290,8 +317,8 @@
// 获取当前高度
var height = parseInt(($("#stepForm").css('height')).split("px")[0]);
params.push(NewIdNumber)
$("#stepForm").css("height",height+455 +'px');
$("#"+parentId).after(materialItem);
$("#stepForm").css("height", height + 455 + 'px');
$("#" + parentId).after(materialItem);
};
// 实现卡片删除
@ -303,8 +330,8 @@
// 获取祖父节点
var reparent = parent.parentNode;
var height = parseInt(($("#stepForm").css('height')).split("px")[0]);
$("#stepForm").css("height",height-455 +'px');
params = remove(params,parentId);
$("#stepForm").css("height", height - 455 + 'px');
params = remove(params, parentId);
reparent.removeChild(parent);
};
@ -313,7 +340,7 @@
function remove(arr, item) {
var result = [];
for (let i = 0; i < arr.length; i++) {
if(arr[i] === item){
if (arr[i] === item) {
continue;
}
result.push(arr[i]);
@ -323,7 +350,7 @@
// 用于实现通过编码查询物料
selectCode = function(obj){
selectCode = function (obj) {
// 输入code
var code = obj.value;
var id = obj.name.split("code")[1];
@ -336,36 +363,40 @@
var req = {};
req.code = code;
req.type = "out";
if(code !== ""){
if (code !== "") {
let loading2 = layer.open({type: 3, shade: [0.25, '#000'], icon: 2, speed: 0});
$.ajax({
url: "/material/findMatrialByCode",
type: "get",
dataType: 'json',
data:req,
data: req,
contentType: "application/json;charset=utf-8",
success: function (d) {
var d = d.data;
if(d == null){
layer.msg("没有该编码,请确认是否输入正确");
if (d == null) {
layer.msg("没有该编码,请确认是否输入正确", {icon: 5, time: 500}, function () {
layer.close(loading2);
materialName.value = "";
materialId.value = "";
obj.value = "";
}else{
});
} else {
req.mid = d.id;
$.ajax({
url: "/place/findPlaceByMid",
type: "post",
dataType: 'json',
data:JSON.stringify(req),
data: JSON.stringify(req),
contentType: "application/json;charset=utf-8",
success:function (res) {
$('#place'+id).empty();
success: function (res) {
$('#place' + id).empty();
$.each(res.data, function (index, item) {
$('#place'+id).append(new Option(item.depositoryName+"-"+item.code, item.id));//往下拉菜单里添加元素
$('#place' + id).append(new Option(item.depositoryName + "-" + item.code, item.id));//往下拉菜单里添加元素
});
form.render();
materialName.value = d.mname;
materialId.value = d.id;
layer.close(loading2);
}
});
}
@ -397,18 +428,19 @@
shadeClose: true, //点击遮罩关闭层
area: ['70%', '70%'],
// content: '/selectMaterialByCard?mname='+mname+'&type=2&clickObj='+parentId,
content: '/getMaterialAll?mname='+mname+'&type=2&clickObj='+parentId,
move : '.layui-layer-title',
fixed:false,
success: function(layero, index){
content: '/getMaterialAll?mname=' + mname + '&type=2&clickObj=' + parentId,
move: '.layui-layer-title',
fixed: false,
success: function (layero, index) {
var children = layero.children();
var content = $(children[1]);
var iframeChildren = $(content.children());
content.css('height','100%');
iframeChildren.css('height','100%');
content.css('height', '100%');
iframeChildren.css('height', '100%');
},
end: function () {
var mid = materialId.value;
let loading2 = layer.open({type: 3, shade: [0.25, '#000'], icon: 2, speed: 0});
$.ajax({
url: "/material/findMatrialById?mid=" + mid,
type: "get",
@ -418,15 +450,16 @@
var material = d.data.materialById;
var placeList = d.data.placeList;
var code = material.code;
if(code === undefined){
if (code === undefined) {
code = "";
}
codeValue.value = code;
$('#place').empty();
$.each(placeList, function (index, item) {
$('#place').append(new Option(item.depositoryName+"-"+item.code, item.id));//往下拉菜单里添加元素
$('#place').append(new Option(item.depositoryName + "-" + item.code, item.id));//往下拉菜单里添加元素
});
form.render();
layer.close(loading2);
}
});
@ -449,32 +482,37 @@
var materialId = materialName.parentNode.parentNode.childNodes[3];
var req = {};
data = data.split(",")[0];
if(data !== ""){
if (data !== "") {
req.mname = data;
let loading2 = layer.open({type: 3, shade: [0.25, '#000'], icon: 2, speed: 0});
$.ajax({
url: "/material/findMaterialByCondition",
type: "post",
dataType: 'json',
data:JSON.stringify(req),
data: JSON.stringify(req),
contentType: "application/json;charset=utf-8",
success: function (d) {
if(d.count > 1){
layer.msg("请点击右侧搜索确定物品");
if (d.count > 1) {
layer.msg("请点击右侧搜索确定物品", {icon: 0, time: 500}, function () {
materialId.value = "";
codeValue.value = "";
layer.close(loading2);
});
return false;
}else if(d.count === 0){
layer.msg("没有该物品,请确认输入是否正确");
} else if (d.count === 0) {
layer.msg("没有该物品,请确认输入是否正确", {icon: 5, time: 500}, function () {
materialId.value = "";
codeValue.value = "";
materialName.value = "";
layer.close(loading2);
});
return false;
}
else{
} else {
var material = d.data[0];
materialName.value = material.mname;
materialId.value = material.id;
codeValue.value = material.code;
layer.close(loading2);
}
}
});
@ -493,15 +531,15 @@
maxmin: true,
shadeClose: true, //点击遮罩关闭层
area: ['70%', '70%'],
move : '.layui-layer-title',
fixed:false,
content: '/selectDepositoryByCard?type=1&clickObj='+parentId,
success: function(layero, index){
move: '.layui-layer-title',
fixed: false,
content: '/selectDepositoryByCard?type=1&clickObj=' + parentId,
success: function (layero, index) {
var children = layero.children();
var content = $(children[1]);
var iframeChildren = $(content.children());
content.css('height','100%');
iframeChildren.css('height','100%');
content.css('height', '100%');
iframeChildren.css('height', '100%');
}
});
}

Loading…
Cancel
Save