|
|
|
@ -17,62 +17,72 @@ |
|
|
|
|
|
|
|
<script id="toolbarDemo" type="text/html"> |
|
|
|
<div class="layui-btn-container"> |
|
|
|
<button class="layui-btn layui-btn-normal layui-btn-sm data-add-btn" lay-event="add" th:style="'display:'+${display}">创建</button> |
|
|
|
<button class="layui-btn layui-btn-danger layui-btn-sm data-delete-btn" lay-event="delete" th:style="'display:'+${display}">删除</button> |
|
|
|
<button class="layui-btn layui-btn-normal layui-btn-sm data-add-btn" lay-event="add" |
|
|
|
th:style="'display:'+${display}">创建 |
|
|
|
</button> |
|
|
|
<button class="layui-btn layui-btn-danger layui-btn-sm data-delete-btn" lay-event="delete" |
|
|
|
th:style="'display:'+${display}">删除 |
|
|
|
</button> |
|
|
|
<button class="layui-btn layui-btn-sm " lay-event="applicationOutAdd">添加</button> |
|
|
|
<button class="layui-btn layui-btn-warm layui-btn-sm " lay-event="dispose">处理</button> |
|
|
|
</div> |
|
|
|
</script> |
|
|
|
<fieldset class="table-search-fieldset"> |
|
|
|
<legend>搜索信息</legend> |
|
|
|
<div style="margin: 10px 10px 10px 10px"> |
|
|
|
<form class="layui-form layui-form-pane" action=""> |
|
|
|
<div class="layui-form-item"> |
|
|
|
|
|
|
|
|
|
|
|
<div class="layui-inline"> |
|
|
|
<label class="layui-form-label">创建日期</label> |
|
|
|
<div class="layui-input-block"> |
|
|
|
<input type="text" name="createTime" id="date" placeholder="请选择创建日期" |
|
|
|
autocomplete="off" class="layui-input"> |
|
|
|
<div class="layui-collapse"> |
|
|
|
<div class="layui-colla-item"> |
|
|
|
<h2 class="layui-colla-title">搜索</h2> |
|
|
|
<div class="layui-colla-content"> |
|
|
|
<div style="margin: 10px 10px 10px 10px"> |
|
|
|
<form class="layui-form layui-form-pane" action=""> |
|
|
|
<div class="layui-form-item"> |
|
|
|
|
|
|
|
|
|
|
|
<div class="layui-inline"> |
|
|
|
<label class="layui-form-label">创建日期</label> |
|
|
|
<div class="layui-input-block"> |
|
|
|
<input type="text" name="createTime" id="date" placeholder="请选择创建日期" |
|
|
|
autocomplete="off" class="layui-input"> |
|
|
|
</div> |
|
|
|
</div> |
|
|
|
|
|
|
|
<div class="layui-inline"> |
|
|
|
<label class="layui-form-label">组合名称</label> |
|
|
|
<div class="layui-input-block"> |
|
|
|
<input type="text" name="name" autocomplete="off" class="layui-input" |
|
|
|
placeholder="请输入组合名称"> |
|
|
|
</div> |
|
|
|
</div> |
|
|
|
|
|
|
|
|
|
|
|
<div class="layui-inline"> |
|
|
|
<label class="layui-form-label">组合编码</label> |
|
|
|
<div class="layui-input-block"> |
|
|
|
<input type="text" name="code" autocomplete="off" class="layui-input" |
|
|
|
placeholder="请输入组合编码"> |
|
|
|
</div> |
|
|
|
</div> |
|
|
|
|
|
|
|
<div class="layui-inline"> |
|
|
|
<label class="layui-form-label">状态</label> |
|
|
|
<div class="layui-input-block"> |
|
|
|
<select id="state" name="state"> |
|
|
|
<option value="" selected>请选择状态</option> |
|
|
|
<option value="1">启用</option> |
|
|
|
<option value="2">禁用</option> |
|
|
|
</select> |
|
|
|
</div> |
|
|
|
</div> |
|
|
|
|
|
|
|
<div class="layui-inline"> |
|
|
|
<button type="submit" class="layui-btn layui-btn-primary" lay-submit |
|
|
|
lay-filter="data-search-btn"><i class="layui-icon"></i> 搜 索 |
|
|
|
</button> |
|
|
|
</div> |
|
|
|
</div> |
|
|
|
</div> |
|
|
|
|
|
|
|
<div class="layui-inline"> |
|
|
|
<label class="layui-form-label">组合名称</label> |
|
|
|
<div class="layui-input-block"> |
|
|
|
<input type="text" name="name" autocomplete="off" class="layui-input" placeholder="请输入组合名称"> |
|
|
|
</div> |
|
|
|
</div> |
|
|
|
|
|
|
|
|
|
|
|
<div class="layui-inline"> |
|
|
|
<label class="layui-form-label">组合编码</label> |
|
|
|
<div class="layui-input-block"> |
|
|
|
<input type="text" name="code" autocomplete="off" class="layui-input" placeholder="请输入组合编码"> |
|
|
|
</div> |
|
|
|
</div> |
|
|
|
|
|
|
|
<div class="layui-inline"> |
|
|
|
<label class="layui-form-label">状态</label> |
|
|
|
<div class="layui-input-block"> |
|
|
|
<select id="state" name="state"> |
|
|
|
<option value="" selected>请选择状态</option> |
|
|
|
<option value="1">启用</option> |
|
|
|
<option value="2">禁用</option> |
|
|
|
</select> |
|
|
|
</div> |
|
|
|
</div> |
|
|
|
|
|
|
|
<div class="layui-inline"> |
|
|
|
<button type="submit" class="layui-btn layui-btn-primary" lay-submit |
|
|
|
lay-filter="data-search-btn"><i class="layui-icon"></i> 搜 索 |
|
|
|
</button> |
|
|
|
</div> |
|
|
|
</form> |
|
|
|
</div> |
|
|
|
</form> |
|
|
|
</div> |
|
|
|
</div> |
|
|
|
</fieldset> |
|
|
|
</div> |
|
|
|
|
|
|
|
|
|
|
|
<!-- 状态展示--> |
|
|
|
@ -88,7 +98,8 @@ |
|
|
|
|
|
|
|
<script type="text/html" id="currentTableBar"> |
|
|
|
<a class="layui-btn layui-btn-normal layui-btn-xs data-count-edit" lay-event="detail">详情</a> |
|
|
|
<a class="layui-btn layui-btn-xs layui-btn-danger data-count-delete" lay-event="delete" th:style="'display:'+${display}">删除</a> |
|
|
|
<a class="layui-btn layui-btn-xs layui-btn-danger data-count-delete" lay-event="delete" |
|
|
|
th:style="'display:'+${display}">删除</a> |
|
|
|
<a class="layui-btn layui-btn-xs layui-btn-danger data-count-delete" th:style="'display:'+${display}" id="display" |
|
|
|
lay-event="realDelete">彻底删除</a> |
|
|
|
</script> |
|
|
|
@ -101,9 +112,10 @@ |
|
|
|
<script src="/static/lib/layui-v2.8.6/layui.js" charset="utf-8"></script> |
|
|
|
<script> |
|
|
|
// 用于查看并修改组合中的物料信息 |
|
|
|
function checkSeeGroup(){ |
|
|
|
function checkSeeGroup() { |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
layui.use(['form', 'table', 'laydate'], function () { |
|
|
|
var $ = layui.jquery, |
|
|
|
form = layui.form, |
|
|
|
@ -127,7 +139,7 @@ |
|
|
|
"data": res.data //解析数据列表 |
|
|
|
}; |
|
|
|
}, |
|
|
|
height: 'full-255',//固定高度-即固定表头固定第一行首行 |
|
|
|
height: 'full-60',//固定高度-即固定表头固定第一行首行 |
|
|
|
request: { |
|
|
|
pageName: 'page', //页码的参数名称，默认：page |
|
|
|
limitName: 'size' //每页数据量的参数名，默认：limit |
|
|
|
@ -143,7 +155,7 @@ |
|
|
|
cols: [ |
|
|
|
[ |
|
|
|
{type: "checkbox", width: 50}, |
|
|
|
{field: 'gname', width: 150, title: '组合名称',edit:'gname'}, |
|
|
|
{field: 'gname', width: 150, title: '组合名称', edit: 'gname'}, |
|
|
|
{field: 'code', width: 150, title: '组合编码'}, |
|
|
|
{field: 'remark', width: 150, title: '组合备注'}, |
|
|
|
{title: '拥有物料', width: 700, align: "center"}, |
|
|
|
@ -154,8 +166,8 @@ |
|
|
|
{title: '操作', minWidth: 200, toolbar: '#currentTableBar', align: "center"}, |
|
|
|
] |
|
|
|
], |
|
|
|
limits: [10, 15, 20, 25, 50, 100], |
|
|
|
limit: 10, |
|
|
|
limits: [15, 30, 45, 60, 100], |
|
|
|
limit: 15, |
|
|
|
page: true, |
|
|
|
skin: 'line', |
|
|
|
done: function (res, curr, count) { |
|
|
|
@ -164,15 +176,15 @@ |
|
|
|
let materialSimple = j["materialSimple"]; |
|
|
|
let gid = j["id"]; |
|
|
|
let keys = Object.keys(materialSimple); |
|
|
|
let rowItem = $("[lay-id='currentTableId'] tr:eq(" + (i+1) + ")"); |
|
|
|
let rowItem = $("[lay-id='currentTableId'] tr:eq(" + (i + 1) + ")"); |
|
|
|
var materialItem = rowItem.children()[4]; |
|
|
|
var nameItem = rowItem.children()[1]; |
|
|
|
if(display === "none"){ |
|
|
|
if (display === "none") { |
|
|
|
$(nameItem).removeAttr("data-edit"); |
|
|
|
} |
|
|
|
var aItem = materialItem.childNodes[0]; |
|
|
|
for (let k = 0; k < keys.length; k++) { |
|
|
|
$(aItem).append('<button id='+ gid+' class="layui-btn layui-btn-primary layui-btn-xs" onclick="checkSeeGroup(this)" value='+materialSimple[keys[k]]+'>'+keys[k]+'</button>') |
|
|
|
$(aItem).append('<button id=' + gid + ' class="layui-btn layui-btn-primary layui-btn-xs" onclick="checkSeeGroup(this)" value=' + materialSimple[keys[k]] + '>' + keys[k] + '</button>') |
|
|
|
} |
|
|
|
}) |
|
|
|
} |
|
|
|
@ -185,13 +197,13 @@ |
|
|
|
if (data.code !== '') { |
|
|
|
req.code = data.code; |
|
|
|
} |
|
|
|
if(data.createTime !== ''){ |
|
|
|
if (data.createTime !== '') { |
|
|
|
req.createTime = data.createTime; |
|
|
|
} |
|
|
|
if(data.state !== ''){ |
|
|
|
if (data.state !== '') { |
|
|
|
req.state = data.state; |
|
|
|
} |
|
|
|
if(data.name !== ''){ |
|
|
|
if (data.name !== '') { |
|
|
|
req.gname = data.name; |
|
|
|
} |
|
|
|
|
|
|
|
@ -208,20 +220,20 @@ |
|
|
|
|
|
|
|
|
|
|
|
// 用于监视表格编辑 |
|
|
|
table.on('edit(currentTableFilter)', function(obj){ //注：edit是固定事件名，test是table原始容器的属性 lay-filter="对应的值" |
|
|
|
table.on('edit(currentTableFilter)', function (obj) { //注：edit是固定事件名，test是table原始容器的属性 lay-filter="对应的值" |
|
|
|
|
|
|
|
let display = $("#display").css("display"); |
|
|
|
if(display !== "none"){ |
|
|
|
if (display !== "none") { |
|
|
|
let gid = obj.data.id; |
|
|
|
let gname = obj.value; |
|
|
|
let req = {}; |
|
|
|
req.id = gid; |
|
|
|
req.gname = gname; |
|
|
|
$.ajax({ |
|
|
|
url:'/group/editGroupInfo', |
|
|
|
dataType:"json", |
|
|
|
type:"post", |
|
|
|
data:JSON.stringify(req), |
|
|
|
url: '/group/editGroupInfo', |
|
|
|
dataType: "json", |
|
|
|
type: "post", |
|
|
|
data: JSON.stringify(req), |
|
|
|
contentType: "application/json;charset=utf-8", |
|
|
|
success: function (data) { |
|
|
|
if (data.status >= 300) { |
|
|
|
@ -257,8 +269,8 @@ |
|
|
|
maxmin: true, |
|
|
|
shadeClose: true, |
|
|
|
area: ['100%', '100%'], |
|
|
|
content: '/group_edit?id='+data.id, |
|
|
|
end:function () { |
|
|
|
content: '/group_edit?id=' + data.id, |
|
|
|
end: function () { |
|
|
|
table.reloadData('currentTableId', { |
|
|
|
url: '/group/findAllGroup', |
|
|
|
page: { |
|
|
|
@ -270,16 +282,15 @@ |
|
|
|
$(window).on("resize", function () { |
|
|
|
layer.full(index); |
|
|
|
}); |
|
|
|
} |
|
|
|
else if (obj.event === 'delete') { |
|
|
|
} else if (obj.event === 'delete') { |
|
|
|
var req = {}; |
|
|
|
req.id = data.id; |
|
|
|
layer.confirm('真的删除么', {icon: 2, title: '提示'}, function (index) { |
|
|
|
$.ajax({ |
|
|
|
url:"/group/delGroup", |
|
|
|
type:"post", |
|
|
|
dataType:"json", |
|
|
|
data:JSON.stringify(req), |
|
|
|
url: "/group/delGroup", |
|
|
|
type: "post", |
|
|
|
dataType: "json", |
|
|
|
data: JSON.stringify(req), |
|
|
|
contentType: "application/json;charset=utf-8", |
|
|
|
success: function (data) { |
|
|
|
layer.close(this.layerIndex); |
|
|
|
@ -303,16 +314,15 @@ |
|
|
|
} |
|
|
|
}) |
|
|
|
}); |
|
|
|
} |
|
|
|
else if (obj.event === 'realDelete') { //彻底删除 |
|
|
|
} else if (obj.event === 'realDelete') { //彻底删除 |
|
|
|
layer.confirm('该操作将无法挽回', {icon: 2, title: '提示'}, function (index) { |
|
|
|
var req = {}; |
|
|
|
req.id = data.id; |
|
|
|
$.ajax({ |
|
|
|
url:"/group/realDelGroup", |
|
|
|
type:"post", |
|
|
|
dataType:"json", |
|
|
|
data:JSON.stringify(req), |
|
|
|
url: "/group/realDelGroup", |
|
|
|
type: "post", |
|
|
|
dataType: "json", |
|
|
|
data: JSON.stringify(req), |
|
|
|
contentType: "application/json;charset=utf-8", |
|
|
|
success: function (data) { |
|
|
|
layer.close(this.layerIndex); |
|
|
|
@ -334,10 +344,9 @@ |
|
|
|
return false; |
|
|
|
} |
|
|
|
} |
|
|
|
}) |
|
|
|
}) |
|
|
|
}) |
|
|
|
} |
|
|
|
else if (obj.event === 'applicationOut'){ |
|
|
|
} else if (obj.event === 'applicationOut') { |
|
|
|
let gid = data.id; |
|
|
|
|
|
|
|
var index1 = layer.open({ |
|
|
|
@ -347,13 +356,12 @@ |
|
|
|
maxmin: true, |
|
|
|
shadeClose: true, |
|
|
|
area: ['100%', '100%'], |
|
|
|
content: '/applicationOutForGroup?gid='+gid+'&type=one', |
|
|
|
content: '/applicationOutForGroup?gid=' + gid + '&type=one', |
|
|
|
}); |
|
|
|
$(window).on("resize", function () { |
|
|
|
layer.full(index1); |
|
|
|
}); |
|
|
|
} |
|
|
|
else if (obj.event === 'applicationIn'){ |
|
|
|
} else if (obj.event === 'applicationIn') { |
|
|
|
let gid = data.id; |
|
|
|
|
|
|
|
var index2 = layer.open({ |
|
|
|
@ -363,7 +371,7 @@ |
|
|
|
maxmin: true, |
|
|
|
shadeClose: true, |
|
|
|
area: ['100%', '100%'], |
|
|
|
content: '/applicationInForGroup?gid='+gid+'&type=one', |
|
|
|
content: '/applicationInForGroup?gid=' + gid + '&type=one', |
|
|
|
}); |
|
|
|
$(window).on("resize", function () { |
|
|
|
layer.full(index2); |
|
|
|
@ -385,8 +393,8 @@ |
|
|
|
area: ['100%', '100%'], |
|
|
|
move: '.layui-layer-title', |
|
|
|
fixed: false, |
|
|
|
content: '/materialForGroup?mid='+mid+'&gid='+gid, |
|
|
|
end:function () { |
|
|
|
content: '/materialForGroup?mid=' + mid + '&gid=' + gid, |
|
|
|
end: function () { |
|
|
|
table.reloadData('currentTableId', { |
|
|
|
url: '/group/findAllGroup', |
|
|
|
page: { |
|
|
|
@ -401,7 +409,7 @@ |
|
|
|
//监听状态操作 |
|
|
|
form.on('switch(changeState)', function (obj) { |
|
|
|
let display = $("#display").css("display"); |
|
|
|
if(display !== "none"){ |
|
|
|
if (display !== "none") { |
|
|
|
var req = new Map; |
|
|
|
if (obj.elem.checked) { |
|
|
|
req["state"] = 1 |
|
|
|
@ -450,7 +458,7 @@ |
|
|
|
move: '.layui-layer-title', |
|
|
|
fixed: false, |
|
|
|
content: '/group_add', |
|
|
|
end:function () { |
|
|
|
end: function () { |
|
|
|
table.reloadData('currentTableId', { |
|
|
|
url: '/group/findAllGroup', |
|
|
|
page: { |
|
|
|
@ -460,8 +468,7 @@ |
|
|
|
} |
|
|
|
|
|
|
|
}); |
|
|
|
} |
|
|
|
else if(obj.event === 'delete') { |
|
|
|
} else if (obj.event === 'delete') { |
|
|
|
var checkStatus = table.checkStatus('currentTableId') |
|
|
|
, data = checkStatus.data; |
|
|
|
var req = {}; |
|
|
|
@ -472,10 +479,10 @@ |
|
|
|
if (req.ids.length > 0) { |
|
|
|
layer.confirm('真的删除么', {icon: 2, title: '提示'}, function (index) { |
|
|
|
$.ajax({ |
|
|
|
url:"/group/delGroup", |
|
|
|
type:"post", |
|
|
|
dataType:"json", |
|
|
|
data:JSON.stringify(req), |
|
|
|
url: "/group/delGroup", |
|
|
|
type: "post", |
|
|
|
dataType: "json", |
|
|
|
data: JSON.stringify(req), |
|
|
|
contentType: "application/json;charset=utf-8", |
|
|
|
success: function (data) { |
|
|
|
layer.close(this.layerIndex); |
|
|
|
@ -499,12 +506,11 @@ |
|
|
|
} |
|
|
|
}) |
|
|
|
}) |
|
|
|
}else{ |
|
|
|
} else { |
|
|
|
layer.msg("未选中记录，请确认！"); |
|
|
|
return false; |
|
|
|
} |
|
|
|
} |
|
|
|
else if(obj.event === 'applicationOutAdd'){ |
|
|
|
} else if (obj.event === 'applicationOutAdd') { |
|
|
|
// 如果点击的是添加出库记录 |
|
|
|
var checkStatus = table.checkStatus('currentTableId') |
|
|
|
, data = checkStatus.data; |
|
|
|
@ -550,11 +556,11 @@ |
|
|
|
} |
|
|
|
} |
|
|
|
}) |
|
|
|
}else{ |
|
|
|
} else { |
|
|
|
layer.msg("未选中记录，请确认！"); |
|
|
|
return false; |
|
|
|
} |
|
|
|
}else if(obj.event === 'dispose'){ |
|
|
|
} else if (obj.event === 'dispose') { |
|
|
|
// 如果点击的是处理 |
|
|
|
var index = layer.open({ |
|
|
|
title: '处理', |
|
|
|
|
