|
|
|
@ -48,19 +48,23 @@ |
|
|
|
<div class="layuimini-main"> |
|
|
|
<input style="display: none" id="gid" th:value="${gid}"> |
|
|
|
<div style="margin: 10px 10px 10px 10px"> |
|
|
|
<form class="layui-form layui-form-pane" id="stepForm" style="margin: 0 auto;max-width: 460px;"> |
|
|
|
<div class="layui-carousel" id="stepForm" lay-filter="stepForm" style="margin: 0 auto; "> |
|
|
|
<div carousel-item style="overflow: inherit"> |
|
|
|
<div> |
|
|
|
<form class="layui-form layui-form-pane" style="margin: 0 auto;max-width: 460px;"> |
|
|
|
<div class="layui-card-body" id="takingHeader" style="padding-right: 0px"> |
|
|
|
<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" id="gname" name="gname" lay-verify="required"> |
|
|
|
<input type="text" placeholder="请输入组合名称" class="layui-input" id="gname" th:value="${gid == -1?'':group?.getGname()}" |
|
|
|
name="gname" lay-verify="required"> |
|
|
|
</div> |
|
|
|
</div> |
|
|
|
</div> |
|
|
|
<label class="layui-form-label">备注说明:</label> |
|
|
|
<div class="layui-input-block"> |
|
|
|
<input name="applyRemark" placeholder="请填写相关原因及申请原因" value="" |
|
|
|
<input name="applyRemark" placeholder="请填写相关原因及申请原因" th:value="${gid == -1?'':group?.getRemark()}" |
|
|
|
class="layui-input"/> |
|
|
|
</div> |
|
|
|
</div> |
|
|
|
@ -140,9 +144,9 @@ |
|
|
|
</div> |
|
|
|
</fieldset> |
|
|
|
<!-- 提交按钮--> |
|
|
|
<div class="layui-form-item" id="btn_sub" style="margin-top: 10px" > |
|
|
|
<div class="layui-form-item" id="btn_sub" style="margin-top: 10px"> |
|
|
|
<div class="layui-input-block"> |
|
|
|
<button class="layui-btn" lay-submit lay-filter="formStep" |
|
|
|
<button class="layui-btn" lay-submit lay-filter="formStep" type="button" |
|
|
|
style="margin-bottom: 30px;margin-left: 15%"> |
|
|
|
 提交  |
|
|
|
</button> |
|
|
|
@ -151,37 +155,62 @@ |
|
|
|
</div> |
|
|
|
</form> |
|
|
|
</div> |
|
|
|
<div> |
|
|
|
<form class="layui-form" style="margin: 0 auto;max-width: 460px;padding-top: 40px;"> |
|
|
|
<div style="text-align: center;margin-top: 90px;"> |
|
|
|
<i class="layui-icon layui-circle" |
|
|
|
style="color: white;font-size:30px;font-weight:bold;background: #52C41A;padding: 20px;line-height: 80px;"></i> |
|
|
|
<div style="font-size: 24px;color: #333;font-weight: 500;margin-top: 30px;"> |
|
|
|
创建成功 |
|
|
|
</div> |
|
|
|
<div style="text-align: center;margin-top: 50px;"> |
|
|
|
<button class="layui-btn next" >再创建一次</button> |
|
|
|
</div> |
|
|
|
</div> |
|
|
|
|
|
|
|
</form> |
|
|
|
</div> |
|
|
|
</div> |
|
|
|
</div> |
|
|
|
</div> |
|
|
|
</div> |
|
|
|
</div> |
|
|
|
<script src="/static/lib/layui-v2.6.3/layui.js" charset="utf-8"></script> |
|
|
|
<script src="/static/js/lay-config.js?v=1.0.4" charset="utf-8"></script> |
|
|
|
|
|
|
|
<script> |
|
|
|
// 实现卡片添加 |
|
|
|
function addItem(){ |
|
|
|
function addItem() { |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
// 实现卡片删除 |
|
|
|
function deleteItem(){ |
|
|
|
function deleteItem() { |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
// 扫描物料条码 |
|
|
|
function scanBarCode(){ |
|
|
|
function scanBarCode() { |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
// 用于扫码功能 |
|
|
|
function scanCodeForMaterial(){ |
|
|
|
function scanCodeForMaterial() { |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
// 用于实现点击搜索按钮 |
|
|
|
function selectMaterial(){ |
|
|
|
function selectMaterial() { |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
// 用于实现通过编码查询物料 |
|
|
|
function selectCode(){ |
|
|
|
function selectCode() { |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
// 用于实现物料名称搜索 |
|
|
|
function selectMaterialByName(){ |
|
|
|
function selectMaterialByName() { |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
@ -190,19 +219,38 @@ |
|
|
|
// 用于卡片编号 |
|
|
|
var NewIdNumber = 1; |
|
|
|
|
|
|
|
layui.use(['form', 'layer', 'dropdown', 'tree', 'laydate'], function () { |
|
|
|
layui.use(['form', 'layer', 'tree', 'step'], function () { |
|
|
|
var $ = layui.jquery, |
|
|
|
form = layui.form; |
|
|
|
form = layui.form, |
|
|
|
step = layui.step; |
|
|
|
|
|
|
|
let gid = $("#gid").val(); |
|
|
|
|
|
|
|
step.render({ |
|
|
|
elem: '#stepForm', |
|
|
|
filter: 'stepForm', |
|
|
|
width: '100%', //设置容器宽度 |
|
|
|
height: '600px', |
|
|
|
stepItems: [{ |
|
|
|
title: '填写信息' |
|
|
|
}, { |
|
|
|
title: '创建成功' |
|
|
|
}] |
|
|
|
}); |
|
|
|
|
|
|
|
// 提交（组合出库） |
|
|
|
form.on('submit(formStep)', function (data) { |
|
|
|
data = data.field; |
|
|
|
data.len = NewIdNumber; |
|
|
|
data.params = params; |
|
|
|
if("-1" !== gid){ |
|
|
|
data.gid = gid; |
|
|
|
} |
|
|
|
$.ajax({ |
|
|
|
url:"/group/addGroup", |
|
|
|
data:JSON.stringify(data), |
|
|
|
dataType:"json", |
|
|
|
type:"post", |
|
|
|
url: "/group/addGroup", |
|
|
|
data: JSON.stringify(data), |
|
|
|
dataType: "json", |
|
|
|
type: "post", |
|
|
|
contentType: "application/json;charset=utf-8", |
|
|
|
beforeSend: function () { |
|
|
|
this.layerIndex = layer.load(0, {shade: [0.5, '#393D49']}); |
|
|
|
@ -215,7 +263,9 @@ |
|
|
|
} else { |
|
|
|
layer.msg("创建成功", { |
|
|
|
icon: 6,//成功的表情 |
|
|
|
time: 500 //1秒关闭（如果不配置，默认是3秒） |
|
|
|
time: 1000 //1秒关闭（如果不配置，默认是3秒） |
|
|
|
}, function () { |
|
|
|
step.next('#stepForm'); |
|
|
|
}); |
|
|
|
} |
|
|
|
}, |
|
|
|
@ -225,6 +275,14 @@ |
|
|
|
}) |
|
|
|
}); |
|
|
|
|
|
|
|
$('.pre').click(function () { |
|
|
|
step.pre('#stepForm'); |
|
|
|
}); |
|
|
|
|
|
|
|
$('.next').click(function () { |
|
|
|
step.next('#stepForm'); |
|
|
|
}); |
|
|
|
|
|
|
|
// 实现卡片添加 |
|
|
|
addItem = function (obj) { |
|
|
|
// 获取父元素id |
|
|
|
@ -243,7 +301,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"+NewIdNumber+` |
|
|
|
style="display: none" lay-verify="required" /> |
|
|
|
</div> |
|
|
|
</div> |
|
|
|
@ -284,7 +342,7 @@ |
|
|
|
<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> |
|
|
|
@ -364,7 +422,7 @@ |
|
|
|
var data = d.data; |
|
|
|
if (data !== null) { |
|
|
|
materialName.value = data.mname; |
|
|
|
materialId.value = data.iid; |
|
|
|
materialId.value = data.mid; |
|
|
|
materialCode.value = data.mcode; |
|
|
|
var barCodeInput = barCodeItem.childNodes[1].childNodes[1]; |
|
|
|
barCodeInput.value = result; |
|
|
|
@ -462,14 +520,14 @@ |
|
|
|
$.each(data.placePList, function (index, item) { |
|
|
|
$('#place' + idNumber).append(new Option(item.depositoryName + "-" + item.code, item.id));//往下拉菜单里添加元素 |
|
|
|
}); |
|
|
|
$("#unit"+idNumber).empty(); |
|
|
|
$("#unit"+idNumber).append(new Option(data.unit,"-1")); |
|
|
|
$.each(data.splitInfoList,function (index,item) { |
|
|
|
$("#unit"+idNumber).append(new Option(item.newUnit,item.newUnit)); |
|
|
|
$("#unit" + idNumber).empty(); |
|
|
|
$("#unit" + idNumber).append(new Option(data.unit, "-1")); |
|
|
|
$.each(data.splitInfoList, function (index, item) { |
|
|
|
$("#unit" + idNumber).append(new Option(item.newUnit, item.newUnit)); |
|
|
|
}); |
|
|
|
form.render(); |
|
|
|
materialName.value = data.mname; |
|
|
|
materialId.value = data.id; |
|
|
|
materialId.value = data.mid; |
|
|
|
materialCode.value = data.code; |
|
|
|
} |
|
|
|
}) |
|
|
|
@ -514,7 +572,7 @@ |
|
|
|
}, |
|
|
|
end: function () { |
|
|
|
var mid = materialId.value; |
|
|
|
if(mid !== '') { |
|
|
|
if (mid !== '') { |
|
|
|
$.ajax({ |
|
|
|
url: "/material/findMatrialById?mid=" + mid, |
|
|
|
type: "get", |
|
|
|
@ -607,7 +665,7 @@ |
|
|
|
|
|
|
|
} else { |
|
|
|
materialName.value = d.mname; |
|
|
|
materialId.value = d.id; |
|
|
|
materialId.value = d.mid; |
|
|
|
var idNumber = materialId.name.split("mid")[1]; |
|
|
|
// 获取物料与条形码的对应关系 |
|
|
|
var materialAndBarCodeList = d["materialAndBarCodeList"]; |
|
|
|
@ -693,7 +751,7 @@ |
|
|
|
unit.empty(); |
|
|
|
$("#unit" + idNumber).append(new Option(material.unit, "-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)); |
|
|
|
} |
|
|
|
@ -736,7 +794,6 @@ |
|
|
|
}; |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
}) |
|
|
|
</script> |
|
|
|
|
|
|
|
|
