|
|
@ -413,6 +413,11 @@ |
|
|
// 用于卡片编号 |
|
|
// 用于卡片编号 |
|
|
var NewIdNumber = 1; |
|
|
var NewIdNumber = 1; |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// 用于标志当前表单是否第一次提交 |
|
|
|
|
|
let flagForForm = false; |
|
|
|
|
|
let GroupflagForForm = false; |
|
|
|
|
|
|
|
|
// 用于暂存卡片个数(组合) |
|
|
// 用于暂存卡片个数(组合) |
|
|
var params2 = []; |
|
|
var params2 = []; |
|
|
layui.use(['form', 'step', 'flow', 'laydate', 'element'], function () { |
|
|
layui.use(['form', 'step', 'flow', 'laydate', 'element'], function () { |
|
|
@ -449,6 +454,8 @@ |
|
|
|
|
|
|
|
|
// 用于提交操作 |
|
|
// 用于提交操作 |
|
|
form.on('submit(formStep)', function (data) { |
|
|
form.on('submit(formStep)', function (data) { |
|
|
|
|
|
if(!flagForForm){ |
|
|
|
|
|
flagForForm = true; |
|
|
data = data.field; |
|
|
data = data.field; |
|
|
data.type = 1; |
|
|
data.type = 1; |
|
|
data.params = params; |
|
|
data.params = params; |
|
|
@ -501,10 +508,14 @@ |
|
|
layer.close(this.layerIndex); |
|
|
layer.close(this.layerIndex); |
|
|
} |
|
|
} |
|
|
}); |
|
|
}); |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
return false; |
|
|
return false; |
|
|
}); |
|
|
}); |
|
|
// 用于提交操作(组合) |
|
|
// 用于提交操作(组合) |
|
|
form.on('submit(formStep2)', function (data) { |
|
|
form.on('submit(formStep2)', function (data) { |
|
|
|
|
|
if(!GroupflagForForm){ |
|
|
|
|
|
GroupflagForForm = true; |
|
|
data = data.field; |
|
|
data = data.field; |
|
|
data.type = 1; |
|
|
data.type = 1; |
|
|
data.params = params2; |
|
|
data.params = params2; |
|
|
@ -535,6 +546,8 @@ |
|
|
layer.close(this.layerIndex); |
|
|
layer.close(this.layerIndex); |
|
|
} |
|
|
} |
|
|
}); |
|
|
}); |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
}); |
|
|
}); |
|
|
|
|
|
|
|
|
$('.pre').click(function () { |
|
|
$('.pre').click(function () { |
|
|
@ -700,6 +713,8 @@ |
|
|
req.code = code; |
|
|
req.code = code; |
|
|
req.type = "in"; |
|
|
req.type = "in"; |
|
|
if(code !== ""){ |
|
|
if(code !== ""){ |
|
|
|
|
|
// 展示遮盖层 |
|
|
|
|
|
let loading2 = layer.open({ type: 3, shade: [0.25, '#000'], icon: 2, speed: 0}); |
|
|
$.ajax({ |
|
|
$.ajax({ |
|
|
url: "/material/findMatrialByCode", |
|
|
url: "/material/findMatrialByCode", |
|
|
type: "get", |
|
|
type: "get", |
|
|
@ -710,15 +725,21 @@ |
|
|
var d = d.data; |
|
|
var d = d.data; |
|
|
var idNumber = materialId.name.split("mid")[1]; |
|
|
var idNumber = materialId.name.split("mid")[1]; |
|
|
if (d == null) { |
|
|
if (d == null) { |
|
|
layer.msg("没有该编码,请确认是否输入正确"); |
|
|
layer.msg("没有该编码,请确认是否输入正确",{ |
|
|
|
|
|
icon:0, |
|
|
|
|
|
time:500 |
|
|
|
|
|
},function () { |
|
|
|
|
|
layer.close(loading2) |
|
|
materialName.value = ""; |
|
|
materialName.value = ""; |
|
|
materialId.value = ""; |
|
|
materialId.value = ""; |
|
|
obj.value = ""; |
|
|
obj.value = ""; |
|
|
$("#barCode" + idNumber).empty(); |
|
|
$("#barCode" + idNumber).empty(); |
|
|
$("#unit" + idNumber).empty(); |
|
|
$("#unit" + idNumber).empty(); |
|
|
form.render(); |
|
|
form.render(); |
|
|
|
|
|
}); |
|
|
|
|
|
|
|
|
} else { |
|
|
} else { |
|
|
|
|
|
|
|
|
materialName.value = d.mname; |
|
|
materialName.value = d.mname; |
|
|
materialId.value = d.mid; |
|
|
materialId.value = d.mid; |
|
|
// 获取物料与条形码的对应关系 |
|
|
// 获取物料与条形码的对应关系 |
|
|
@ -761,9 +782,11 @@ |
|
|
if (shelfLife !== null && shelfLife !== undefined) { |
|
|
if (shelfLife !== null && shelfLife !== undefined) { |
|
|
$("#" + "producedDateItem" + idNumber).show(); |
|
|
$("#" + "producedDateItem" + idNumber).show(); |
|
|
$("#" + "producedDate" + idNumber).attr("lay-verify", "required"); |
|
|
$("#" + "producedDate" + idNumber).attr("lay-verify", "required"); |
|
|
} else { |
|
|
} |
|
|
|
|
|
else { |
|
|
$("#" + "producedDateItem" + idNumber).hide(); |
|
|
$("#" + "producedDateItem" + idNumber).hide(); |
|
|
} |
|
|
} |
|
|
|
|
|
layer.close(loading2) |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
}); |
|
|
}); |
|
|
@ -810,6 +833,7 @@ |
|
|
end: function () { |
|
|
end: function () { |
|
|
var mid = materialId.value; |
|
|
var mid = materialId.value; |
|
|
if (mid !== '') { |
|
|
if (mid !== '') { |
|
|
|
|
|
let loading2 = layer.open({ type: 3, shade: [0.25, '#000'], icon: 2, speed: 0}); |
|
|
$.ajax({ |
|
|
$.ajax({ |
|
|
url: "/material/findMatrialById?mid=" + mid, |
|
|
url: "/material/findMatrialById?mid=" + mid, |
|
|
type: "get", |
|
|
type: "get", |
|
|
@ -859,6 +883,7 @@ |
|
|
$("#unit" + idNumber).append(new Option(unitList[i].newUnit, unitList[i].newUnit)); |
|
|
$("#unit" + idNumber).append(new Option(unitList[i].newUnit, unitList[i].newUnit)); |
|
|
} |
|
|
} |
|
|
form.render(); |
|
|
form.render(); |
|
|
|
|
|
layer.close(loading2) |
|
|
} |
|
|
} |
|
|
}); |
|
|
}); |
|
|
} |
|
|
} |
|
|
@ -883,6 +908,7 @@ |
|
|
var req = {}; |
|
|
var req = {}; |
|
|
data = data.split(",")[0]; |
|
|
data = data.split(",")[0]; |
|
|
if(data !== ""){ |
|
|
if(data !== ""){ |
|
|
|
|
|
let loading2 = layer.open({ type: 3, shade: [0.25, '#000'], icon: 2, speed: 0}); |
|
|
req.mname = data; |
|
|
req.mname = data; |
|
|
$.ajax({ |
|
|
$.ajax({ |
|
|
url: "/material/findMaterialByCondition", |
|
|
url: "/material/findMaterialByCondition", |
|
|
@ -892,15 +918,25 @@ |
|
|
contentType: "application/json;charset=utf-8", |
|
|
contentType: "application/json;charset=utf-8", |
|
|
success: function (d) { |
|
|
success: function (d) { |
|
|
if (d.count > 1) { |
|
|
if (d.count > 1) { |
|
|
layer.msg("请点击右侧搜索确定物品"); |
|
|
layer.msg("请点击右侧搜索确定物品",{ |
|
|
|
|
|
icon:0, |
|
|
|
|
|
time:500 |
|
|
|
|
|
},function () { |
|
|
materialId.value = ""; |
|
|
materialId.value = ""; |
|
|
codeValue.value = ""; |
|
|
codeValue.value = ""; |
|
|
|
|
|
layer.close(loading2) |
|
|
|
|
|
}); |
|
|
return false; |
|
|
return false; |
|
|
} else if (d.count === 0) { |
|
|
} else if (d.count === 0) { |
|
|
layer.msg("没有该物品,请确认输入是否正确"); |
|
|
layer.msg("没有该物品,请确认输入是否正确",{ |
|
|
|
|
|
icon:5, |
|
|
|
|
|
time:500 |
|
|
|
|
|
},function() { |
|
|
materialId.value = ""; |
|
|
materialId.value = ""; |
|
|
codeValue.value = ""; |
|
|
codeValue.value = ""; |
|
|
materialName.value = ""; |
|
|
materialName.value = ""; |
|
|
|
|
|
layer.close(loading2) |
|
|
|
|
|
}); |
|
|
return false; |
|
|
return false; |
|
|
} else { |
|
|
} else { |
|
|
var idNumber = materialId.name.split("mid")[1]; |
|
|
var idNumber = materialId.name.split("mid")[1]; |
|
|
@ -923,6 +959,7 @@ |
|
|
for (let i = 0; i < unitList.length; i++) { |
|
|
for (let i = 0; i < unitList.length; i++) { |
|
|
$("#unit" + idNumber).append(new Option(unitList[i].newUnit, unitList[i].newUnit)); |
|
|
$("#unit" + idNumber).append(new Option(unitList[i].newUnit, unitList[i].newUnit)); |
|
|
} |
|
|
} |
|
|
|
|
|
layer.close(loading2) |
|
|
form.render(); |
|
|
form.render(); |
|
|
|
|
|
|
|
|
} |
|
|
} |
|
|
@ -952,6 +989,7 @@ |
|
|
req.qrCode = result; |
|
|
req.qrCode = result; |
|
|
req.codeFlag = 2; |
|
|
req.codeFlag = 2; |
|
|
$("#qrCode" + obj.id.split("qrCodeImg")[1]).val(result); |
|
|
$("#qrCode" + obj.id.split("qrCodeImg")[1]).val(result); |
|
|
|
|
|
let loading2 = layer.open({ type: 3, shade: [0.25, '#000'], icon: 2, speed: 0}); |
|
|
$.ajax({ |
|
|
$.ajax({ |
|
|
url: "/material/qywxApplicationInScanQrCode", |
|
|
url: "/material/qywxApplicationInScanQrCode", |
|
|
type: "post", |
|
|
type: "post", |
|
|
@ -980,6 +1018,7 @@ |
|
|
icon: 0, |
|
|
icon: 0, |
|
|
time: 1000 //0.5秒关闭(如果不配置,默认是3秒) |
|
|
time: 1000 //0.5秒关闭(如果不配置,默认是3秒) |
|
|
}, function () { |
|
|
}, function () { |
|
|
|
|
|
layer.close(loading2) |
|
|
}) |
|
|
}) |
|
|
} else { |
|
|
} else { |
|
|
var code = data.code; |
|
|
var code = data.code; |
|
|
@ -1029,6 +1068,7 @@ |
|
|
for (let i = 0; i < unitList.length; i++) { |
|
|
for (let i = 0; i < unitList.length; i++) { |
|
|
$("#unit" + idNumber).append(new Option(unitList[i].newUnit, unitList[i].newUnit)); |
|
|
$("#unit" + idNumber).append(new Option(unitList[i].newUnit, unitList[i].newUnit)); |
|
|
} |
|
|
} |
|
|
|
|
|
layer.close(loading2) |
|
|
form.render(); |
|
|
form.render(); |
|
|
|
|
|
|
|
|
} |
|
|
} |
|
|
@ -1061,6 +1101,7 @@ |
|
|
var req = {}; |
|
|
var req = {}; |
|
|
req.qrCode = result; |
|
|
req.qrCode = result; |
|
|
req.codeFlag = 1; |
|
|
req.codeFlag = 1; |
|
|
|
|
|
let loading2 = layer.open({ type: 3, shade: [0.25, '#000'], icon: 2, speed: 0}); |
|
|
$.ajax({ |
|
|
$.ajax({ |
|
|
url: "/material/qywxApplicationInScanBarCode", |
|
|
url: "/material/qywxApplicationInScanBarCode", |
|
|
type: "post", |
|
|
type: "post", |
|
|
@ -1113,14 +1154,17 @@ |
|
|
for (let i = 0; i < unitList.length; i++) { |
|
|
for (let i = 0; i < unitList.length; i++) { |
|
|
$("#unit" + idNumber).append(new Option(unitList[i].newUnit, unitList[i].newUnit)); |
|
|
$("#unit" + idNumber).append(new Option(unitList[i].newUnit, unitList[i].newUnit)); |
|
|
} |
|
|
} |
|
|
|
|
|
layer.close(loading2) |
|
|
form.render(); |
|
|
form.render(); |
|
|
|
|
|
|
|
|
} else { |
|
|
} |
|
|
|
|
|
else { |
|
|
// 如果没有对应关系 |
|
|
// 如果没有对应关系 |
|
|
layer.msg("对于编码:" + result + ",并未发现对应的物料", { |
|
|
layer.msg("对于编码:" + result + ",并未发现对应的物料", { |
|
|
icon: 0, |
|
|
icon: 0, |
|
|
time: 1000 //0.5秒关闭(如果不配置,默认是3秒) |
|
|
time: 1000 //0.5秒关闭(如果不配置,默认是3秒) |
|
|
}, function () { |
|
|
}, function () { |
|
|
|
|
|
layer.close(loading2) |
|
|
}) |
|
|
}) |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
@ -1203,6 +1247,7 @@ |
|
|
var result = res.resultStr;//当needResult为1时返回处理结果 |
|
|
var result = res.resultStr;//当needResult为1时返回处理结果 |
|
|
var req = {}; |
|
|
var req = {}; |
|
|
req.qrCode = result; |
|
|
req.qrCode = result; |
|
|
|
|
|
let loading2 = layer.open({ type: 3, shade: [0.25, '#000'], icon: 2, speed: 0}); |
|
|
$.ajax({ |
|
|
$.ajax({ |
|
|
url: "/place/qywxApplicationInScanQrCode", |
|
|
url: "/place/qywxApplicationInScanQrCode", |
|
|
type: "post", |
|
|
type: "post", |
|
|
@ -1221,6 +1266,8 @@ |
|
|
layer.msg("并未查询到对应位置,请重新扫描",{ |
|
|
layer.msg("并未查询到对应位置,请重新扫描",{ |
|
|
icon:0, |
|
|
icon:0, |
|
|
time:1000 |
|
|
time:1000 |
|
|
|
|
|
},function () { |
|
|
|
|
|
layer.close(loading2) |
|
|
}); |
|
|
}); |
|
|
} else if (flag === 1) { |
|
|
} else if (flag === 1) { |
|
|
// 如果获取到的是库位 |
|
|
// 如果获取到的是库位 |
|
|
@ -1228,6 +1275,7 @@ |
|
|
placeId.value = place.id; |
|
|
placeId.value = place.id; |
|
|
depositoryId.value = place.did; |
|
|
depositoryId.value = place.did; |
|
|
depositoryName.value = place.depositoryName; |
|
|
depositoryName.value = place.depositoryName; |
|
|
|
|
|
layer.close(loading2) |
|
|
|
|
|
|
|
|
} else if (flag === 2) { |
|
|
} else if (flag === 2) { |
|
|
// 如果获取到的是仓库 |
|
|
// 如果获取到的是仓库 |
|
|
@ -1235,6 +1283,7 @@ |
|
|
placeId.value = "0"; |
|
|
placeId.value = "0"; |
|
|
depositoryId.value = depository.id; |
|
|
depositoryId.value = depository.id; |
|
|
depositoryName.value = depository.dname; |
|
|
depositoryName.value = depository.dname; |
|
|
|
|
|
layer.close(loading2) |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
}) |
|
|
}) |
|
|
@ -1260,6 +1309,7 @@ |
|
|
let req = {}; |
|
|
let req = {}; |
|
|
if(code !== ""){ |
|
|
if(code !== ""){ |
|
|
req.code = code; |
|
|
req.code = code; |
|
|
|
|
|
let loading2 = layer.open({ type: 3, shade: [0.25, '#000'], icon: 2, speed: 0}); |
|
|
$.ajax({ |
|
|
$.ajax({ |
|
|
url: "/group/findGroupByCodeForIn", |
|
|
url: "/group/findGroupByCodeForIn", |
|
|
type: "post", |
|
|
type: "post", |
|
|
@ -1282,6 +1332,7 @@ |
|
|
childNodes[i].remove() |
|
|
childNodes[i].remove() |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
|
|
|
layer.close(loading2) |
|
|
}) |
|
|
}) |
|
|
} else { |
|
|
} else { |
|
|
let childNodes = parent.childNodes; |
|
|
let childNodes = parent.childNodes; |
|
|
@ -1299,6 +1350,7 @@ |
|
|
CoverpageForGroup(pid, data[i]); |
|
|
CoverpageForGroup(pid, data[i]); |
|
|
} |
|
|
} |
|
|
element.init(); |
|
|
element.init(); |
|
|
|
|
|
layer.close(loading2) |
|
|
|
|
|
|
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
@ -1349,6 +1401,8 @@ |
|
|
end: function () { |
|
|
end: function () { |
|
|
let gid = gidItem.value; |
|
|
let gid = gidItem.value; |
|
|
if (gid !== '') { |
|
|
if (gid !== '') { |
|
|
|
|
|
let loading2 = layer.open({ type: 3, shade: [0.25, '#000'], icon: 2, speed: 0}); |
|
|
|
|
|
|
|
|
let req = {}; |
|
|
let req = {}; |
|
|
req.gid = gid; |
|
|
req.gid = gid; |
|
|
req.type = "in"; |
|
|
req.type = "in"; |
|
|
@ -1374,6 +1428,7 @@ |
|
|
childNodes[i].remove() |
|
|
childNodes[i].remove() |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
|
|
|
layer.close(loading2) |
|
|
}) |
|
|
}) |
|
|
} else { |
|
|
} else { |
|
|
let childNodes = parent.childNodes; |
|
|
let childNodes = parent.childNodes; |
|
|
@ -1390,7 +1445,7 @@ |
|
|
CoverpageForGroup(pid, data[i]); |
|
|
CoverpageForGroup(pid, data[i]); |
|
|
} |
|
|
} |
|
|
element.init(); |
|
|
element.init(); |
|
|
|
|
|
layer.close(loading2) |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
}) |
|
|
}) |
|
|
@ -1418,6 +1473,7 @@ |
|
|
|
|
|
|
|
|
if (gname !== '') { |
|
|
if (gname !== '') { |
|
|
|
|
|
|
|
|
|
|
|
let loading2 = layer.open({ type: 3, shade: [0.25, '#000'], icon: 2, speed: 0}); |
|
|
|
|
|
|
|
|
var req = {}; |
|
|
var req = {}; |
|
|
req.gname = gname; |
|
|
req.gname = gname; |
|
|
@ -1443,6 +1499,7 @@ |
|
|
childNodes[i].remove() |
|
|
childNodes[i].remove() |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
|
|
|
layer.close(loading2) |
|
|
}); |
|
|
}); |
|
|
} else if (d.count === 0) { |
|
|
} else if (d.count === 0) { |
|
|
// 如果当前组合名称不存在 |
|
|
// 如果当前组合名称不存在 |
|
|
@ -1459,6 +1516,7 @@ |
|
|
childNodes[i].remove() |
|
|
childNodes[i].remove() |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
|
|
|
layer.close(loading2) |
|
|
}); |
|
|
}); |
|
|
} else { |
|
|
} else { |
|
|
// 正常 |
|
|
// 正常 |
|
|
@ -1478,6 +1536,7 @@ |
|
|
CoverpageForGroup(pid, data[i]); |
|
|
CoverpageForGroup(pid, data[i]); |
|
|
} |
|
|
} |
|
|
element.init(); |
|
|
element.init(); |
|
|
|
|
|
layer.close(loading2) |
|
|
|
|
|
|
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
@ -1491,6 +1550,7 @@ |
|
|
childNodes[i].remove() |
|
|
childNodes[i].remove() |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
|
|
|
layer.close(loading2) |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
}; |
|
|
}; |
|
|
@ -1514,6 +1574,8 @@ |
|
|
var result = res.resultStr;//当needResult为1时返回处理结果 |
|
|
var result = res.resultStr;//当needResult为1时返回处理结果 |
|
|
var req = {}; |
|
|
var req = {}; |
|
|
req.qrCode = result; |
|
|
req.qrCode = result; |
|
|
|
|
|
let loading2 = layer.open({ type: 3, shade: [0.25, '#000'], icon: 2, speed: 0}); |
|
|
|
|
|
|
|
|
$.ajax({ |
|
|
$.ajax({ |
|
|
url: "/material/qywxApplicationOutScanQrCode", |
|
|
url: "/material/qywxApplicationOutScanQrCode", |
|
|
type: "post", |
|
|
type: "post", |
|
|
@ -1582,6 +1644,7 @@ |
|
|
materialName.value = data.mname; |
|
|
materialName.value = data.mname; |
|
|
materialId.value = data.id; |
|
|
materialId.value = data.id; |
|
|
materialCode.value = data.code; |
|
|
materialCode.value = data.code; |
|
|
|
|
|
layer.close(loading2) |
|
|
} |
|
|
} |
|
|
}) |
|
|
}) |
|
|
} |
|
|
} |
|
|
|