|
|
@ -82,16 +82,17 @@ |
|
|
|
|
|
|
|
|
<div class="fairy-tag-container" style="border-style: none"> |
|
|
<div class="fairy-tag-container" style="border-style: none"> |
|
|
<div class="inputdiv"> |
|
|
<div class="inputdiv"> |
|
|
<input type="text" id="departmentManager" style="display: none" |
|
|
<input type="text" id="departmentManager" style="display: none" |
|
|
th:value="${departmentHeadName}"/> |
|
|
th:value="${departmentHeadName}"/> |
|
|
<i class="layui-icon layui-icon-search" style="display: inline;right: 0;position: absolute;" |
|
|
<i class="layui-icon layui-icon-search" |
|
|
id="selectdepartmentManager"></i> |
|
|
style="display: inline;right: 0;position: absolute;" |
|
|
<input type="text" id="departmentManagerId" |
|
|
id="selectdepartmentManager"></i> |
|
|
name="departmentManagerId" |
|
|
<input type="text" id="departmentManagerId" |
|
|
th:value="${departmentHeadId}" |
|
|
name="departmentManagerId" |
|
|
class="layui-input" style="display: none" |
|
|
th:value="${departmentHeadId}" |
|
|
lay-verify="required"/> |
|
|
class="layui-input" style="display: none" |
|
|
</div> |
|
|
lay-verify="required"/> |
|
|
|
|
|
</div> |
|
|
</div> |
|
|
</div> |
|
|
</div> |
|
|
</div> |
|
|
</div> |
|
|
</div> |
|
|
@ -354,23 +355,22 @@ |
|
|
let tagData = []; |
|
|
let tagData = []; |
|
|
let tempData = $("#departmentManager").val().split(","); |
|
|
let tempData = $("#departmentManager").val().split(","); |
|
|
$.each(tempData, function (index, item) { |
|
|
$.each(tempData, function (index, item) { |
|
|
if(item !== ""){ |
|
|
if (item !== "") { |
|
|
tagData.push(item) |
|
|
tagData.push(item) |
|
|
} |
|
|
} |
|
|
}); |
|
|
}); |
|
|
$("#departmentManager").val(""); |
|
|
$("#departmentManager").val(""); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
let tagLabel = inputTag.render({ |
|
|
let tagLabel= inputTag.render({ |
|
|
|
|
|
elem: '#departmentManager', |
|
|
elem: '#departmentManager', |
|
|
data: tagData,//初始值 |
|
|
data: tagData,//初始值 |
|
|
removeKeyNum: 8,//删除按键编号 默认，BackSpace 键 |
|
|
removeKeyNum: 8,//删除按键编号 默认，BackSpace 键 |
|
|
createKeyNum: 13,//创建按键编号 默认，Enter 键 |
|
|
createKeyNum: 13,//创建按键编号 默认，Enter 键 |
|
|
onChange: function (data, value, type,index) { |
|
|
onChange: function (data, value, type, index) { |
|
|
if(type === "remove"){ |
|
|
if (type === "remove") { |
|
|
let split = departmentManagerId.split(","); |
|
|
let split = departmentManagerId.split(","); |
|
|
split.splice(index,1); |
|
|
split.splice(index, 1); |
|
|
departmentManagerId = split.toString(); |
|
|
departmentManagerId = split.toString(); |
|
|
$("#departmentManagerId").val(departmentManagerId); |
|
|
$("#departmentManagerId").val(departmentManagerId); |
|
|
} |
|
|
} |
|
|
@ -647,7 +647,7 @@ |
|
|
parent.wx.scanQRCode({ |
|
|
parent.wx.scanQRCode({ |
|
|
desc: 'scanQRCode desc', |
|
|
desc: 'scanQRCode desc', |
|
|
needResult: 1, // 默认为0，扫描结果由企业微信处理，1则直接返回扫描结果， |
|
|
needResult: 1, // 默认为0，扫描结果由企业微信处理，1则直接返回扫描结果， |
|
|
scanType: ["qrCode","barCode"], // 可以指定扫二维码还是条形码（一维码），默认二者都有 |
|
|
scanType: ["qrCode", "barCode"], // 可以指定扫二维码还是条形码（一维码），默认二者都有 |
|
|
success: function (res) { |
|
|
success: function (res) { |
|
|
// 回调 |
|
|
// 回调 |
|
|
var result = res.resultStr;//当needResult为1时返回处理结果 |
|
|
var result = res.resultStr;//当needResult为1时返回处理结果 |
|
|
@ -665,7 +665,10 @@ |
|
|
var flag = data["flag"]; |
|
|
var flag = data["flag"]; |
|
|
if (flag === 0) { |
|
|
if (flag === 0) { |
|
|
// 如果没有获取到位置 |
|
|
// 如果没有获取到位置 |
|
|
layer.msg("当前二维码错误，请重新扫描"); |
|
|
layer.msg("并未查询到对应位置，请重新扫描", { |
|
|
|
|
|
icon: 0, |
|
|
|
|
|
time: 1000 |
|
|
|
|
|
}); |
|
|
} else if (flag === 1) { |
|
|
} else if (flag === 1) { |
|
|
// 如果获取到的是库位 |
|
|
// 如果获取到的是库位 |
|
|
var place = data["place"]; |
|
|
var place = data["place"]; |
|
|
@ -1247,90 +1250,99 @@ |
|
|
contentType: "application/json;charset=utf-8", |
|
|
contentType: "application/json;charset=utf-8", |
|
|
success: function (d) { |
|
|
success: function (d) { |
|
|
var data = d.data; |
|
|
var data = d.data; |
|
|
var parent = obj.parentNode.parentNode.parentNode.parentNode; |
|
|
if (data == null) { |
|
|
var parentId = parent.id; |
|
|
layer.msg("对于编码：" + result + ",并未发现对应的物料", { |
|
|
// 物料编码父级 |
|
|
icon: 0, |
|
|
var codeChildren = parent.childNodes[7]; |
|
|
time: 1000 //0.5秒关闭（如果不配置，默认是3秒） |
|
|
// 物料名称父级 |
|
|
}, function () { |
|
|
var materialChildren = parent.childNodes[5]; |
|
|
|
|
|
|
|
|
|
|
|
// 物料类型父级 |
|
|
|
|
|
var typeChildren = parent.childNodes[11]; |
|
|
|
|
|
// 材质父级 |
|
|
|
|
|
var textureChildren = parent.childNodes[13]; |
|
|
|
|
|
// 规格型号父级 |
|
|
|
|
|
var versionChildren = parent.childNodes[15]; |
|
|
|
|
|
// 计量单位父级 |
|
|
|
|
|
var unitChildren = parent.childNodes[17]; |
|
|
|
|
|
// 库存数量父级 |
|
|
|
|
|
var inventoryChildren = parent.childNodes[21]; |
|
|
|
|
|
|
|
|
|
|
|
// 条形码父级 |
|
|
|
|
|
var barCodeChildren = parent.childNodes[9]; |
|
|
|
|
|
// 编码条目 |
|
|
|
|
|
var codeItem = codeChildren.childNodes[3].childNodes[1]; |
|
|
|
|
|
// 具体条码 |
|
|
|
|
|
var codeValue = codeItem.childNodes[1]; |
|
|
|
|
|
|
|
|
|
|
|
// 物料条目 |
|
|
|
|
|
var materialItem = materialChildren.childNodes[3].childNodes; |
|
|
|
|
|
// 物料名称 |
|
|
|
|
|
var materialName = materialItem[1].childNodes[1]; |
|
|
|
|
|
// 物料编码 |
|
|
|
|
|
var materialId = materialItem[3]; |
|
|
|
|
|
// 物料种类条目 |
|
|
|
|
|
var materialTypeItem = typeChildren.childNodes[3].childNodes; |
|
|
|
|
|
|
|
|
|
|
|
// 条形码条目 |
|
|
|
|
|
var barCodeItem = barCodeChildren.childNodes[3]; |
|
|
|
|
|
|
|
|
|
|
|
materialName.value = data.mname; |
|
|
|
|
|
materialId.value = data.id; |
|
|
|
|
|
|
|
|
|
|
|
materialTypeItem[1].value = data.typeName; |
|
|
|
|
|
materialTypeItem[3].value = data.typeId; |
|
|
|
|
|
codeValue.value = data.code; |
|
|
|
|
|
textureChildren.childNodes[3].childNodes[1].value = data.texture === null || data.texture === undefined ? '' : data.texture; |
|
|
|
|
|
versionChildren.childNodes[3].childNodes[1].value = data.version === null || data.version === undefined ? '' : data.version; |
|
|
|
|
|
unitChildren.childNodes[3].childNodes[1].value = data.unit === null || data.unit === undefined ? '' : data.unit; |
|
|
|
|
|
inventoryChildren.childNodes[3].childNodes[1].value = data.quantity; |
|
|
|
|
|
// 获取物料与条形码的对应关系 |
|
|
|
|
|
var materialAndBarCodeList = data["materialAndBarCodeList"]; |
|
|
|
|
|
var idNumber = materialId.name.split("mid")[1]; |
|
|
|
|
|
$("#barCode" + idNumber).empty(); |
|
|
|
|
|
if (materialAndBarCodeList !== null && materialAndBarCodeList.length > 0) { |
|
|
|
|
|
var barCodeInput = barCodeItem.childNodes[1].childNodes[1]; |
|
|
|
|
|
var barCodeImg = barCodeItem.childNodes[1].childNodes[3]; |
|
|
|
|
|
var id = barCodeInput.id; |
|
|
|
|
|
form.render(); |
|
|
|
|
|
$.each(materialAndBarCodeList, function (index, item) { |
|
|
|
|
|
$("#barCode" + idNumber).append(new Option(item.bmcode, item.id));//往下拉菜单里添加元素 |
|
|
|
|
|
}); |
|
|
|
|
|
form.render(); |
|
|
|
|
|
} |
|
|
|
|
|
var unitItem = $("#unit" + idNumber); |
|
|
|
|
|
unitItem.empty(); |
|
|
|
|
|
unitItem.append(new Option(data.unit, "-1")); |
|
|
|
|
|
let splitInfoList = data.splitInfoList; |
|
|
|
|
|
if (splitInfoList.length > 0) { |
|
|
|
|
|
$.each(splitInfoList, function (index, item) { |
|
|
|
|
|
unitItem.append(new Option(item.newUnit, item.newUnit)); |
|
|
|
|
|
}) |
|
|
}) |
|
|
} |
|
|
} else { |
|
|
form.render(); |
|
|
|
|
|
var shelfLife = data.shelfLife; |
|
|
var parent = obj.parentNode.parentNode.parentNode.parentNode; |
|
|
if (shelfLife !== null && shelfLife !== undefined) { |
|
|
var parentId = parent.id; |
|
|
$("#" + "producedDateItem" + idNumber).show(); |
|
|
// 物料编码父级 |
|
|
var producedDateList = data['producedDateList']; |
|
|
var codeChildren = parent.childNodes[7]; |
|
|
if (producedDateList !== null && producedDateList !== undefined && producedDateList.length > 0) { |
|
|
// 物料名称父级 |
|
|
$.each(producedDateList, function (index, item) { |
|
|
var materialChildren = parent.childNodes[5]; |
|
|
$("#" + "producedDate" + idNumber).append(new Option(item, item)); |
|
|
|
|
|
|
|
|
// 物料类型父级 |
|
|
|
|
|
var typeChildren = parent.childNodes[11]; |
|
|
|
|
|
// 材质父级 |
|
|
|
|
|
var textureChildren = parent.childNodes[13]; |
|
|
|
|
|
// 规格型号父级 |
|
|
|
|
|
var versionChildren = parent.childNodes[15]; |
|
|
|
|
|
// 计量单位父级 |
|
|
|
|
|
var unitChildren = parent.childNodes[17]; |
|
|
|
|
|
// 库存数量父级 |
|
|
|
|
|
var inventoryChildren = parent.childNodes[21]; |
|
|
|
|
|
|
|
|
|
|
|
// 条形码父级 |
|
|
|
|
|
var barCodeChildren = parent.childNodes[9]; |
|
|
|
|
|
// 编码条目 |
|
|
|
|
|
var codeItem = codeChildren.childNodes[3].childNodes[1]; |
|
|
|
|
|
// 具体条码 |
|
|
|
|
|
var codeValue = codeItem.childNodes[1]; |
|
|
|
|
|
|
|
|
|
|
|
// 物料条目 |
|
|
|
|
|
var materialItem = materialChildren.childNodes[3].childNodes; |
|
|
|
|
|
// 物料名称 |
|
|
|
|
|
var materialName = materialItem[1].childNodes[1]; |
|
|
|
|
|
// 物料编码 |
|
|
|
|
|
var materialId = materialItem[3]; |
|
|
|
|
|
// 物料种类条目 |
|
|
|
|
|
var materialTypeItem = typeChildren.childNodes[3].childNodes; |
|
|
|
|
|
|
|
|
|
|
|
// 条形码条目 |
|
|
|
|
|
var barCodeItem = barCodeChildren.childNodes[3]; |
|
|
|
|
|
|
|
|
|
|
|
materialName.value = data.mname; |
|
|
|
|
|
materialId.value = data.id; |
|
|
|
|
|
|
|
|
|
|
|
materialTypeItem[1].value = data.typeName; |
|
|
|
|
|
materialTypeItem[3].value = data.typeId; |
|
|
|
|
|
codeValue.value = data.code; |
|
|
|
|
|
textureChildren.childNodes[3].childNodes[1].value = data.texture === null || data.texture === undefined ? '' : data.texture; |
|
|
|
|
|
versionChildren.childNodes[3].childNodes[1].value = data.version === null || data.version === undefined ? '' : data.version; |
|
|
|
|
|
unitChildren.childNodes[3].childNodes[1].value = data.unit === null || data.unit === undefined ? '' : data.unit; |
|
|
|
|
|
inventoryChildren.childNodes[3].childNodes[1].value = data.quantity; |
|
|
|
|
|
// 获取物料与条形码的对应关系 |
|
|
|
|
|
var materialAndBarCodeList = data["materialAndBarCodeList"]; |
|
|
|
|
|
var idNumber = materialId.name.split("mid")[1]; |
|
|
|
|
|
$("#barCode" + idNumber).empty(); |
|
|
|
|
|
if (materialAndBarCodeList !== null && materialAndBarCodeList.length > 0) { |
|
|
|
|
|
var barCodeInput = barCodeItem.childNodes[1].childNodes[1]; |
|
|
|
|
|
var barCodeImg = barCodeItem.childNodes[1].childNodes[3]; |
|
|
|
|
|
var id = barCodeInput.id; |
|
|
|
|
|
form.render(); |
|
|
|
|
|
$.each(materialAndBarCodeList, function (index, item) { |
|
|
|
|
|
$("#barCode" + idNumber).append(new Option(item.bmcode, item.id));//往下拉菜单里添加元素 |
|
|
|
|
|
}); |
|
|
|
|
|
form.render(); |
|
|
|
|
|
} |
|
|
|
|
|
var unitItem = $("#unit" + idNumber); |
|
|
|
|
|
unitItem.empty(); |
|
|
|
|
|
unitItem.append(new Option(data.unit, "-1")); |
|
|
|
|
|
let splitInfoList = data.splitInfoList; |
|
|
|
|
|
if (splitInfoList.length > 0) { |
|
|
|
|
|
$.each(splitInfoList, function (index, item) { |
|
|
|
|
|
unitItem.append(new Option(item.newUnit, item.newUnit)); |
|
|
}) |
|
|
}) |
|
|
} |
|
|
} |
|
|
form.render(); |
|
|
form.render(); |
|
|
} else { |
|
|
var shelfLife = data.shelfLife; |
|
|
$("#" + "producedDateItem" + idNumber).hide(); |
|
|
if (shelfLife !== null && shelfLife !== undefined) { |
|
|
form.render(); |
|
|
$("#" + "producedDateItem" + idNumber).show(); |
|
|
|
|
|
var producedDateList = data['producedDateList']; |
|
|
|
|
|
if (producedDateList !== null && producedDateList !== undefined && producedDateList.length > 0) { |
|
|
|
|
|
$.each(producedDateList, function (index, item) { |
|
|
|
|
|
$("#" + "producedDate" + idNumber).append(new Option(item, item)); |
|
|
|
|
|
}) |
|
|
|
|
|
} |
|
|
|
|
|
form.render(); |
|
|
|
|
|
} else { |
|
|
|
|
|
$("#" + "producedDateItem" + idNumber).hide(); |
|
|
|
|
|
form.render(); |
|
|
|
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
}) |
|
|
}) |
|
|
|
