|
|
|
@ -176,6 +176,15 @@ |
|
|
|
</select> |
|
|
|
</div> |
|
|
|
</div> |
|
|
|
<div class="layui-form-item" id="depositoryId" |
|
|
|
th:style="'display:'+${display}"> |
|
|
|
<label class="layui-form-label">仓库:</label> |
|
|
|
<div class="layui-input-block"> |
|
|
|
<select name="depositoryId" id="showDepository"> |
|
|
|
|
|
|
|
</select> |
|
|
|
</div> |
|
|
|
</div> |
|
|
|
<div class="layui-form-item"> |
|
|
|
<label class="layui-form-label">项目:</label> |
|
|
|
<div class="layui-input-block"> |
|
|
|
@ -462,13 +471,14 @@ |
|
|
|
element = layui.element, |
|
|
|
step = layui.step; |
|
|
|
|
|
|
|
let depositoryDisplay = $("#depositoryId").css("display"); |
|
|
|
|
|
|
|
// 用于分步表单加载 |
|
|
|
step.render({ |
|
|
|
elem: '#stepForm', |
|
|
|
filter: 'stepForm', |
|
|
|
width: '100%', //设置容器宽度 |
|
|
|
height: '700px', |
|
|
|
height: '750px', |
|
|
|
stepItems: [{ |
|
|
|
title: '填写信息' |
|
|
|
}, { |
|
|
|
@ -680,6 +690,14 @@ |
|
|
|
<div class="layui-input-block"> |
|
|
|
<select id=` + "unit" + NewIdNumber + ` name=` + "unit" + NewIdNumber + `> |
|
|
|
|
|
|
|
</select> |
|
|
|
</div> |
|
|
|
</div> |
|
|
|
<div class="layui-form-item" id=` + "depositoryId" + NewIdNumber + ` style="display:` + depositoryDisplay + `" > |
|
|
|
<label class="layui-form-label">仓库:</label> |
|
|
|
<div class="layui-input-block"> |
|
|
|
<select id=` + "showDepository" + NewIdNumber + ` name=` + "depositoryId" + NewIdNumber + `> |
|
|
|
|
|
|
|
</select> |
|
|
|
</div> |
|
|
|
</div> |
|
|
|
@ -695,7 +713,12 @@ |
|
|
|
// 获取当前高度 |
|
|
|
var height = parseInt(($("#stepForm").css('height')).split("px")[0]); |
|
|
|
params.push(NewIdNumber); |
|
|
|
$("#stepForm").css("height", height + 387 + 'px'); |
|
|
|
if (depositoryDisplay === "none") { |
|
|
|
$("#stepForm").css("height", height + 387 + 'px'); |
|
|
|
} else { |
|
|
|
$("#stepForm").css("height", height + 435 + 'px'); |
|
|
|
|
|
|
|
} |
|
|
|
$("#" + parentId).after(materialItem); |
|
|
|
}; |
|
|
|
|
|
|
|
@ -837,7 +860,13 @@ |
|
|
|
// 获取祖父节点 |
|
|
|
var reparent = parent.parentNode; |
|
|
|
var height = parseInt(($("#stepForm").css('height')).split("px")[0]); |
|
|
|
$("#stepForm").css("height", height - 387 + 'px'); |
|
|
|
if (depositoryDisplay === "none") { |
|
|
|
|
|
|
|
$("#stepForm").css("height", height - 387 + 'px'); |
|
|
|
} else { |
|
|
|
$("#stepForm").css("height", height - 435 + 'px'); |
|
|
|
|
|
|
|
} |
|
|
|
params = remove(params, parentId); |
|
|
|
reparent.removeChild(parent); |
|
|
|
}; |
|
|
|
@ -918,7 +947,7 @@ |
|
|
|
for (let i = 0; i < unitList.length; i++) { |
|
|
|
$("#unit" + idNumber).append(new Option(unitList[i].newUnit, unitList[i].newUnit)); |
|
|
|
} |
|
|
|
form.render(); |
|
|
|
|
|
|
|
if (materialAndBarCodeList.length > 0) { |
|
|
|
// 如果有对应的条形码 |
|
|
|
var barCodeInput = barCodeItem.childNodes[1].childNodes[1]; |
|
|
|
@ -946,6 +975,16 @@ |
|
|
|
barCode.empty(); |
|
|
|
} |
|
|
|
} |
|
|
|
if (depositoryDisplay !== "none") { |
|
|
|
$("#showDepository" + idNumber).empty(); |
|
|
|
let depositoryList = d.depositoryList; |
|
|
|
if(depositoryList !== null) { |
|
|
|
for (let i = 0; i < depositoryList.length; i++) { |
|
|
|
$("#showDepository" + idNumber).append(new Option(depositoryList[i].dname, depositoryList[i].id)); |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
form.render(); |
|
|
|
layer.close(loading2); |
|
|
|
} |
|
|
|
} |
|
|
|
@ -1103,12 +1142,22 @@ |
|
|
|
$("#barCode" + idNumber).append(new Option(item.bmcode, item.id));//往下拉菜单里添加元素 |
|
|
|
}); |
|
|
|
form.render(); |
|
|
|
} else { |
|
|
|
} |
|
|
|
else { |
|
|
|
var barCode = $("#barCode" + idNumber); |
|
|
|
if (barCode.length > 0) { |
|
|
|
barCode.empty(); |
|
|
|
} |
|
|
|
} |
|
|
|
if (depositoryDisplay !== "none") { |
|
|
|
$("#showDepository" + idNumber).empty(); |
|
|
|
let depositoryList = material.depositoryList; |
|
|
|
if(depositoryList !== null) { |
|
|
|
for (let i = 0; i < depositoryList.length; i++) { |
|
|
|
$("#showDepository" + idNumber).append(new Option(depositoryList[i].dname, depositoryList[i].id)); |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
form.render(); |
|
|
|
layer.close(loading2); |
|
|
|
} |
|
|
|
@ -1387,7 +1436,8 @@ |
|
|
|
$("#barCode" + idNumber).append(new Option(item.bmcode, item.id));//往下拉菜单里添加元素 |
|
|
|
}); |
|
|
|
form.render(); |
|
|
|
} else { |
|
|
|
} |
|
|
|
else { |
|
|
|
var barCode = $("#barCode" + idNumber); |
|
|
|
if (barCode.length > 0) { |
|
|
|
barCode.empty(); |
|
|
|
@ -1396,6 +1446,16 @@ |
|
|
|
materialName.value = material.mname; |
|
|
|
materialId.value = material.id; |
|
|
|
codeValue.value = material.code; |
|
|
|
if (depositoryDisplay !== "none") { |
|
|
|
$("#showDepository" + idNumber).empty(); |
|
|
|
let depositoryList = material.depositoryList; |
|
|
|
if(depositoryList !== null){ |
|
|
|
for (let i = 0; i < depositoryList.length; i++) { |
|
|
|
$("#showDepository" + idNumber).append(new Option(depositoryList[i].dname, depositoryList[i].id)); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
layer.close(loading2); |
|
|
|
} |
|
|
|
} |
|
|
|
@ -1413,7 +1473,75 @@ |
|
|
|
} else { |
|
|
|
wxScan = wxScan.wx; |
|
|
|
} |
|
|
|
wxScan.scanQRCode({ |
|
|
|
var result = "1646432177297334272";//当needResult为1时返回处理结果 |
|
|
|
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", |
|
|
|
dataType: 'json', |
|
|
|
data: JSON.stringify(req), |
|
|
|
contentType: "application/json;charset=utf-8", |
|
|
|
success: function (d) { |
|
|
|
// 获取对应元素 |
|
|
|
var parent = obj.parentNode.parentNode.parentNode.parentNode; |
|
|
|
|
|
|
|
var MaterialChildren = parent.childNodes[5]; |
|
|
|
var materialItem = MaterialChildren.childNodes[3].childNodes[1].childNodes; |
|
|
|
|
|
|
|
var barCodeChildren = parent.childNodes[9]; |
|
|
|
|
|
|
|
var materialName = materialItem[1]; |
|
|
|
var materialId = materialName.parentNode.parentNode.childNodes[3]; |
|
|
|
// 条形码条码 |
|
|
|
var barCodeItem = barCodeChildren.childNodes[3]; |
|
|
|
// 物料编码 |
|
|
|
var materialCodeItem = parent.childNodes[7].childNodes[3].childNodes[1].childNodes; |
|
|
|
|
|
|
|
|
|
|
|
var materialCode = materialCodeItem[1]; |
|
|
|
|
|
|
|
var data = d.data; |
|
|
|
if (data !== null) { |
|
|
|
materialName.value = data.mname; |
|
|
|
materialId.value = data.iid; |
|
|
|
materialCode.value = data.mcode; |
|
|
|
var barCodeInput = barCodeItem.childNodes[1].childNodes[1]; |
|
|
|
barCodeInput.value = result; |
|
|
|
var idNumber = materialId.name.split("mid")[1]; |
|
|
|
var unit = $("#unit" + idNumber); |
|
|
|
unit.empty(); |
|
|
|
$("#unit" + idNumber).append(new Option(data.unit, "-1")); |
|
|
|
var unitList = data["splitInfoList"]; |
|
|
|
for (let i = 0; i < unitList.length; i++) { |
|
|
|
$("#unit" + idNumber).append(new Option(unitList[i].newUnit, unitList[i].newUnit)); |
|
|
|
} |
|
|
|
if (depositoryDisplay !== "none") { |
|
|
|
$("#showDepository" + idNumber).empty(); |
|
|
|
let depositoryList = data.depositoryList; |
|
|
|
if(depositoryList !== null) { |
|
|
|
for (let i = 0; i < depositoryList.length; i++) { |
|
|
|
$("#showDepository" + idNumber).append(new Option(depositoryList[i].dname, depositoryList[i].id)); |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
form.render(); |
|
|
|
layer.close(loading2); |
|
|
|
} else { |
|
|
|
// 如果没有对应关系 |
|
|
|
layer.msg("对于编码:" + result + ",并未发现仓库中存在对应的物料", { |
|
|
|
icon: 0, |
|
|
|
time: 1000 //0.5秒关闭(如果不配置,默认是3秒) |
|
|
|
}, function () { |
|
|
|
layer.close(loading2); |
|
|
|
}) |
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
}) |
|
|
|
/* wxScan.scanQRCode({ |
|
|
|
desc: 'scanQRCode desc', |
|
|
|
needResult: 1, // 默认为0,扫描结果由企业微信处理,1则直接返回扫描结果, |
|
|
|
scanType: ["barCode"], // 可以指定扫二维码还是条形码(一维码),默认二者都有 |
|
|
|
@ -1464,6 +1592,15 @@ |
|
|
|
for (let i = 0; i < unitList.length; i++) { |
|
|
|
$("#unit" + idNumber).append(new Option(unitList[i].newUnit, unitList[i].newUnit)); |
|
|
|
} |
|
|
|
if (depositoryDisplay !== "none") { |
|
|
|
$("#showDepository" + idNumber).empty(); |
|
|
|
let depositoryList = data.depositoryList; |
|
|
|
if(depositoryList !== null) { |
|
|
|
for (let i = 0; i < depositoryList.length; i++) { |
|
|
|
$("#showDepository" + idNumber).append(new Option(depositoryList[i].dname, depositoryList[i].id)); |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
form.render(); |
|
|
|
layer.close(loading2); |
|
|
|
} else { |
|
|
|
@ -1479,7 +1616,7 @@ |
|
|
|
} |
|
|
|
}) |
|
|
|
} |
|
|
|
}) |
|
|
|
})*/ |
|
|
|
|
|
|
|
|
|
|
|
}; |
|
|
|
@ -1493,6 +1630,7 @@ |
|
|
|
} else { |
|
|
|
wxScan = wxScan.wx; |
|
|
|
} |
|
|
|
|
|
|
|
wxScan.scanQRCode({ |
|
|
|
desc: 'scanQRCode desc', |
|
|
|
needResult: 1, // 默认为0,扫描结果由企业微信处理,1则直接返回扫描结果, |
|
|
|
@ -1582,6 +1720,16 @@ |
|
|
|
materialName.value = data.mname; |
|
|
|
materialId.value = data.id; |
|
|
|
materialCode.value = data.code; |
|
|
|
if (depositoryDisplay !== "none") { |
|
|
|
$("#showDepository" + idNumber).empty(); |
|
|
|
let depositoryList = data.depositoryList; |
|
|
|
if(depositoryList !== null) { |
|
|
|
for (let i = 0; i < depositoryList.length; i++) { |
|
|
|
$("#showDepository" + idNumber).append(new Option(depositoryList[i].dname, depositoryList[i].id)); |
|
|
|
} |
|
|
|
form.render(); |
|
|
|
} |
|
|
|
} |
|
|
|
layer.close(loading2); |
|
|
|
} |
|
|
|
} |
|
|
|
@ -1749,10 +1897,22 @@ |
|
|
|
}; |
|
|
|
|
|
|
|
form.on('select()', function (data) { |
|
|
|
let unit = data.value; |
|
|
|
|
|
|
|
let id = data.elem.id; |
|
|
|
let idNum = id.split("unit")[1]; |
|
|
|
let mcode = $("#code" + idNum).val(); |
|
|
|
let unit = ""; |
|
|
|
let mcode = ""; |
|
|
|
let depositoryId = "-1"; |
|
|
|
if (id.indexOf('unit') !== -1) { |
|
|
|
unit = data.value; |
|
|
|
} else { |
|
|
|
// 获取当前选中的仓库id |
|
|
|
depositoryId = data.value; |
|
|
|
idNum = id.split('showDepository')[1]; |
|
|
|
unit = $("#unit" + idNum).val(); |
|
|
|
|
|
|
|
} |
|
|
|
mcode = $("#code" + idNum).val(); |
|
|
|
if (mcode === "" || mcode === undefined || mcode === null) { |
|
|
|
layer.msg("请输入物料的正确编码!", {icon: 0, time: 500}, function () { |
|
|
|
$("#quantity" + idNum).val("") |
|
|
|
@ -1765,6 +1925,9 @@ |
|
|
|
req.quantity = val; |
|
|
|
req.unit = unit; |
|
|
|
req.placeId = -1; |
|
|
|
if (depositoryId !== "-1") { |
|
|
|
req.depositoryId = depositoryId; |
|
|
|
} |
|
|
|
let loading2 = layer.open({type: 3, shade: [0.25, '#000'], icon: 2, speed: 0}); |
|
|
|
$.ajax({ |
|
|
|
url: "/material/MaterialQuantityIsTrue", |
|
|
|
@ -1789,13 +1952,8 @@ |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
}); |
|
|
|
|
|
|
|
$('body').on('click', '[data-refresh]', function () { |
|
|
|
location.reload(); |
|
|
|
}) |
|
|
|
|
|
|
|
|
|
|
|
}); |
|
|
|
}) |
|
|
|
</script> |
|
|
|
</body> |
|
|
|
|