@ -2,22 +2,37 @@
< html lang = "zh" xmlns:th = "http://www.thymeleaf.org" xmlns:shiro = "http://www.pollix.at/thymeleaf/shiro" >
< html lang = "zh" xmlns:th = "http://www.thymeleaf.org" xmlns:shiro = "http://www.pollix.at/thymeleaf/shiro" >
< head >
< head >
< th:block th:include = "include :: header('下料记录列表')" / >
< th:block th:include = "include :: header('下料记录列表')" / >
< th:block th:include = "include :: layout-latest-css" / >
< th:block th:include = "include :: ztree-css" / >
< / head >
< / head >
< body class = "gray-bg" >
< body class = "gray-bg" >
< div class = "container-div" >
< div class = "ui-layout-west" >
< div class = "box box-main" >
< div class = "box-header" >
< div class = "box-title" >
< i class = "fa icon-grid" > < / i > 设备信息
< / div >
< div class = "box-tools pull-right" >
< a type = "button" class = "btn btn-box-tool" href = "#" onclick = "deviceInfo()" title = "设备信息" > < i class = "fa fa-edit" > < / i > < / a >
< button type = "button" class = "btn btn-box-tool" id = "btnExpand" title = "展开" style = "display:none;" > < i class = "fa fa-chevron-up" > < / i > < / button >
< button type = "button" class = "btn btn-box-tool" id = "btnCollapse" title = "折叠" > < i class = "fa fa-chevron-down" > < / i > < / button >
< button type = "button" class = "btn btn-box-tool" id = "btnRefresh" title = "刷新" > < i class = "fa fa-refresh" > < / i > < / button >
< / div >
< / div >
< div class = "ui-layout-content" >
< div id = "tree" class = "ztree" > < / div >
< / div >
< / div >
< / div >
< div class = "ui-layout-center" >
< div class = "container-div" >
< div class = "row" >
< div class = "row" >
< div class = "col-sm-12 search-collapse" >
< div class = "col-sm-12 search-collapse" >
< form id = "formId" >
< form id = "formId" >
< input id = "resource" type = "text" name = "resource" hidden = "true" / >
< div class = "select-list" >
< div class = "select-list" >
< ul >
< ul >
< li >
< label > 资源编号:< / label >
< input type = "text" name = "resource" / >
< / li >
< li >
< label > 位置编号:< / label >
< input type = "text" name = "positionId" / >
< / li >
< li >
< li >
< label > rfid条码: < / label >
< label > rfid条码: < / label >
< input type = "text" name = "rfidStr" / >
< input type = "text" name = "rfidStr" / >
@ -26,10 +41,6 @@
< label > SFC编码: < / label >
< label > SFC编码: < / label >
< input type = "text" name = "sfcStr" / >
< input type = "text" name = "sfcStr" / >
< / li >
< / li >
< li >
< label > 涂布膜卷:< / label >
< input type = "text" name = "downMaterialId" / >
< / li >
< li >
< li >
< label > 是否生产:< / label >
< label > 是否生产:< / label >
< select name = "isProduction" th:with = "type=${@dict.getType('is_flag')}" >
< select name = "isProduction" th:with = "type=${@dict.getType('is_flag')}" >
@ -37,20 +48,11 @@
< option th:each = "dict : ${type}" th:text = "${dict.dictLabel}" th:value = "${dict.dictValue}" > < / option >
< option th:each = "dict : ${type}" th:text = "${dict.dictLabel}" th:value = "${dict.dictValue}" > < / option >
< / select >
< / select >
< / li >
< / li >
< li >
< li class = "select-time" >
< label > 是否完工:< / label >
< label > 日 期 : < / label >
< select name = "isFinish" th:with = "type=${@dict.getType('is_flag')}" >
< input type = "text" class = "time-input" id = "beginTime" placeholder = "开始时间" name = "params[beginReadTime]" / >
< option value = "" > 所有< / option >
< span > -< / span >
< option th:each = "dict : ${type}" th:text = "${dict.dictLabel}" th:value = "${dict.dictValue}" > < / option >
< input type = "text" class = "time-input" id = "endTime" placeholder = "结束时间" name = "params[endReadTime]" / >
< / select >
< / li >
< li >
< label > 开始时间:< / label >
< input type = "text" class = "time-input" placeholder = "请选择开始时间" name = "beginTime" / >
< / li >
< li >
< label > 结束时间:< / label >
< input type = "text" class = "time-input" placeholder = "请选择结束时间" name = "endTime" / >
< / li >
< / li >
< li >
< li >
< a class = "btn btn-primary btn-rounded btn-sm" onclick = "$.table.search()" > < i class = "fa fa-search" > < / i > 搜索< / a >
< a class = "btn btn-primary btn-rounded btn-sm" onclick = "$.table.search()" > < i class = "fa fa-search" > < / i > 搜索< / a >
@ -80,7 +82,10 @@
< / div >
< / div >
< / div >
< / div >
< / div >
< / div >
< / div >
< th:block th:include = "include :: footer" / >
< th:block th:include = "include :: footer" / >
< th:block th:include = "include :: layout-latest-js" / >
< th:block th:include = "include :: ztree-js" / >
< script th:inline = "javascript" >
< script th:inline = "javascript" >
var editFlag = [[${@permission.hasPermi('traceability:downRecord:edit')}]];
var editFlag = [[${@permission.hasPermi('traceability:downRecord:edit')}]];
var removeFlag = [[${@permission.hasPermi('traceability:downRecord:remove')}]];
var removeFlag = [[${@permission.hasPermi('traceability:downRecord:remove')}]];
@ -89,6 +94,24 @@
var prefix = ctx + "traceability/downRecord";
var prefix = ctx + "traceability/downRecord";
$(function() {
$(function() {
var panehHidden = false;
if ($(this).width() < 769 ) {
panehHidden = true;
}
$('body').layout({ initClosed: panehHidden, west__size: 185 });
// 回到顶部绑定
if ($.fn.toTop !== undefined) {
var opt = {
win:$('.ui-layout-center'),
doc:$('.ui-layout-center')
};
$('#scroll-up').toTop(opt);
}
queryReadList();
queryResourceTree();
});
function queryReadList() {
var options = {
var options = {
url: prefix + "/list",
url: prefix + "/list",
createUrl: prefix + "/add",
createUrl: prefix + "/add",
@ -99,79 +122,120 @@
columns: [{
columns: [{
checkbox: true
checkbox: true
},
},
{
{
field: 'id',
field: 'id',
title: '主键标识',
title: '主键标识',
visible: false
visible: false
},
},
{
{
field: 'machineId',
field: 'machineId',
title: '设备编号'
title: '设备编号',
},
visible: false
{
},
field: 'resource',
{
title: '资源编号'
field: 'resource',
},
title: '资源编号'
{
},
field: 'positionId',
{
title: '位置编号'
field: 'positionId',
},
title: '位置编号'
{
},
field: 'rfidStr',
{
title: 'rfid条码'
field: 'rfidStr',
},
title: 'rfid条码'
{
},
field: 'sfcStr',
{
title: 'SFC编码'
field: 'sfcStr',
},
title: 'SFC编码'
{
},
field: 'eaValue',
{
title: 'EA数量'
field: 'eaValue',
},
title: 'EA数量'
{
},
field: 'downMaterialId',
{
title: '来料膜卷'
field: 'downMaterialId',
},
title: '来料膜卷'
{
},
field: 'isProduction',
{
title: '是否生产',
field: 'isProduction',
formatter: function(value, row, index) {
title: '是否生产',
return $.table.selectDictLabel(isProductionDatas, value);
formatter: function(value, row, index) {
}
return $.table.selectDictLabel(isProductionDatas, value);
},
}
{
},
field: 'isFinish',
{
title: '是否完工',
field: 'isFinish',
visible: false,
title: '是否完工',
formatter: function(value, row, index) {
visible: false,
return $.table.selectDictLabel(isFinishDatas, value);
formatter: function(value, row, index) {
}
return $.table.selectDictLabel(isFinishDatas, value);
},
},
{
visible: false
field: 'recordTime',
},
title: '记录时间'
{
},
field: 'recordTime',
{
title: '记录时间'
field: 'beginTime',
},
title: '开始时间'
{
},
field: 'beginTime',
{
title: '开始时间'
field: 'endTime',
},
title: '结束时间'
{
},
field: 'endTime',
{
title: '结束时间'
title: '操作',
},
align: 'center',
{
formatter: function(value, row, index) {
title: '操作',
var actions = [];
align: 'center',
actions.push('< a class = "btn btn-success btn-xs ' + editFlag + '" href = "javascript:void(0)" onclick = "$.operate.edit(\'' + row.id + '\')" > < i class = "fa fa-edit" > < / i > 编辑< / a > ');
formatter: function(value, row, index) {
actions.push('< a class = "btn btn-danger btn-xs ' + removeFlag + '" href = "javascript:void(0)" onclick = "$.operate.remove(\'' + row.id + '\')" > < i class = "fa fa-remove" > < / i > 删除< / a > ');
var actions = [];
return actions.join('');
actions.push('< a class = "btn btn-success btn-xs ' + editFlag + '" href = "javascript:void(0)" onclick = "$.operate.edit(\'' + row.id + '\')" > < i class = "fa fa-edit" > < / i > 编辑< / a > ');
}
actions.push('< a class = "btn btn-danger btn-xs ' + removeFlag + '" href = "javascript:void(0)" onclick = "$.operate.remove(\'' + row.id + '\')" > < i class = "fa fa-remove" > < / i > 删除< / a > ');
}]
return actions.join('');
}
}]
};
};
$.table.init(options);
$.table.init(options);
}
function queryResourceTree()
{
var url = ctx + "traceability/deviceinfo/treeData";
var options = {
url: url,
expandLevel: 2,
onClick : zOnClick
};
$.tree.init(options);
function zOnClick(event, treeId, treeNode) {
$("#resource").val(treeNode.remark);
$.table.search();
}
}
$('#btnExpand').click(function() {
$._tree.expandAll(true);
$(this).hide();
$('#btnCollapse').show();
});
});
$('#btnCollapse').click(function() {
$._tree.expandAll(false);
$(this).hide();
$('#btnExpand').show();
});
$('#btnRefresh').click(function() {
queryReadList();
});
/* 设备信息 */
function deviceInfo() {
var url = ctx + "traceability/deviceinfo";
$.modal.openTab("设备信息", url);
}
< / script >
< / script >
< / body >
< / body >
< / html >
< / html >