|
|
|
@ -2,8 +2,6 @@ |
|
|
|
<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro"> |
|
|
|
<head> |
|
|
|
<th:block th:include="include :: header('bom列表')" /> |
|
|
|
<th:block th:include="include :: select2-css" /> |
|
|
|
<th:block th:include="include :: bootstrap-table-fixed-columns-css" /> |
|
|
|
</head> |
|
|
|
<body class="gray-bg"> |
|
|
|
<div class="container-div"> |
|
|
|
@ -98,10 +96,7 @@ |
|
|
|
</div> |
|
|
|
</div> |
|
|
|
<th:block th:include="include :: footer" /> |
|
|
|
<th:block th:include="include :: select2-js" /> |
|
|
|
<script th:src="@{/js/activiti.js}"></script> |
|
|
|
<script th:src="@{/ajax/libs/vue/vue.js}"></script> |
|
|
|
<script th:src="@{/ajax/libs/element-ui/element-ui.js}"></script> |
|
|
|
<script th:inline="javascript"> |
|
|
|
var editFlag = [[${@permission.hasPermi('erp:bom:edit')}]]; |
|
|
|
var removeFlag = [[${@permission.hasPermi('erp:bom:remove')}]]; |
|
|
|
@ -117,10 +112,6 @@ |
|
|
|
var loginName = currentUser.loginName; |
|
|
|
var prefix = ctx + "erp/bom"; |
|
|
|
$(function() { |
|
|
|
// $('#selectMaterialType').on('select2:select', function (e) { |
|
|
|
// var data = e.params.data; |
|
|
|
// $("#materialType").val(data.id); |
|
|
|
// }); |
|
|
|
var options = { |
|
|
|
url: prefix + "/list", |
|
|
|
createUrl: prefix + "/add", |
|
|
|
@ -134,8 +125,9 @@ |
|
|
|
importTemplateUrl: prefix + "/importTemplate", |
|
|
|
modalName: "bom", |
|
|
|
detailView: true, |
|
|
|
rightFixedColumns: true, // 是否启用冻结列（右侧） |
|
|
|
fixedRightNumber: 1, |
|
|
|
fixedColumns: true, // 启用冻结列 |
|
|
|
rightFixedColumns:1, |
|
|
|
fixedRightNumber: 1, // 冻结右列个数 |
|
|
|
//指定父id列 |
|
|
|
onExpandRow : function(index, row, $detail) { |
|
|
|
$detail.html('<h4>一阶</h4><table class="table-container" id="one_level_table_'+row.id+'"></table>' + |
|
|
|
@ -149,35 +141,12 @@ |
|
|
|
columns: [{ |
|
|
|
checkbox: true |
|
|
|
}, |
|
|
|
{ |
|
|
|
field: 'id', |
|
|
|
title: '主键ID' |
|
|
|
}, |
|
|
|
{ |
|
|
|
field: 'instanceId', |
|
|
|
title: '流程实例ID', |
|
|
|
visible: false |
|
|
|
}, |
|
|
|
{ |
|
|
|
field: 'submitInstanceId', |
|
|
|
title: '流程提交实例ID', |
|
|
|
visible: false |
|
|
|
}, |
|
|
|
{ |
|
|
|
field: 'cancelInstanceId', |
|
|
|
title: '流程作废实例ID', |
|
|
|
visible: false |
|
|
|
}, |
|
|
|
{ |
|
|
|
field: 'restoreInstanceId', |
|
|
|
title: '流程恢复实例ID', |
|
|
|
visible: false |
|
|
|
}, |
|
|
|
{ |
|
|
|
field: 'instanceTypeName', |
|
|
|
title: '流程实例类型', |
|
|
|
visible: false |
|
|
|
}, |
|
|
|
{title: '主键ID',field: 'id'}, |
|
|
|
{ title: '流程实例ID',field: 'instanceId',visible: false}, |
|
|
|
{ title: '流程提交实例ID',field: 'submitInstanceId',visible: false}, |
|
|
|
{title: '流程作废实例ID', field: 'cancelInstanceId',visible: false}, |
|
|
|
{ title: '流程恢复实例ID',field: 'restoreInstanceId',visible: false}, |
|
|
|
{ title: '流程实例类型',field: 'instanceTypeName', visible: false}, |
|
|
|
{ |
|
|
|
field: 'applyUser', |
|
|
|
title: '申请人ID', |
|
|
|
@ -226,39 +195,9 @@ |
|
|
|
return $.table.selectDictLabel(useStatusDatas, value); |
|
|
|
} |
|
|
|
}, |
|
|
|
{ |
|
|
|
field: 'createBy', |
|
|
|
title: '工程员', |
|
|
|
formatter: function(value, row, index) { |
|
|
|
if (value == null || value == ''){ |
|
|
|
return '/'; |
|
|
|
}else{ |
|
|
|
return value; |
|
|
|
} |
|
|
|
} |
|
|
|
}, |
|
|
|
{ |
|
|
|
field: 'bomNo', |
|
|
|
title: 'bom号', |
|
|
|
formatter:function (value,row,index){ |
|
|
|
if (value == null || value == ''){ |
|
|
|
return '/'; |
|
|
|
}else{ |
|
|
|
return value; |
|
|
|
} |
|
|
|
} |
|
|
|
}, |
|
|
|
{ |
|
|
|
field: 'materialNo', |
|
|
|
title: '关联料号', |
|
|
|
formatter:function (value,row,index){ |
|
|
|
if (value == null || value == ''){ |
|
|
|
return '/'; |
|
|
|
}else{ |
|
|
|
return value; |
|
|
|
} |
|
|
|
} |
|
|
|
}, |
|
|
|
{title: '工程员',field: 'createBy'}, |
|
|
|
{title: 'bom号',field: 'bomNo',}, |
|
|
|
{title: '关联料号',field: 'materialNo'}, |
|
|
|
{ |
|
|
|
field: 'photoUrl', |
|
|
|
title: '图片', |
|
|
|
@ -266,17 +205,7 @@ |
|
|
|
return $.table.imageView(value); |
|
|
|
} |
|
|
|
}, |
|
|
|
{ |
|
|
|
field: 'materialName', |
|
|
|
title: '物料名称', |
|
|
|
formatter:function (value,row,index){ |
|
|
|
if (value == null || value == ''){ |
|
|
|
return '/'; |
|
|
|
}else{ |
|
|
|
return value; |
|
|
|
} |
|
|
|
} |
|
|
|
}, |
|
|
|
{ title: '物料名称',field: 'materialName'}, |
|
|
|
{ |
|
|
|
field: 'materialType', |
|
|
|
title: '物料类型', |
|
|
|
@ -294,50 +223,11 @@ |
|
|
|
{ |
|
|
|
field: 'unit', |
|
|
|
title: '单位', |
|
|
|
formatter:function (value,row,index){ |
|
|
|
if (value == null || value == ''){ |
|
|
|
return '/'; |
|
|
|
}else{ |
|
|
|
return value; |
|
|
|
} |
|
|
|
} |
|
|
|
}, |
|
|
|
{ |
|
|
|
field: 'brand', |
|
|
|
title: '品牌', |
|
|
|
formatter:function (value,row,index){ |
|
|
|
if (value == null || value == ''){ |
|
|
|
return '/'; |
|
|
|
}else{ |
|
|
|
return value; |
|
|
|
} |
|
|
|
} |
|
|
|
}, |
|
|
|
{ |
|
|
|
field: 'describe', |
|
|
|
title: '描述', |
|
|
|
formatter:function (value,row,index){ |
|
|
|
if (value == null || value == ''){ |
|
|
|
return '/'; |
|
|
|
}else{ |
|
|
|
return value; |
|
|
|
} |
|
|
|
} |
|
|
|
}, |
|
|
|
{ |
|
|
|
field: 'useNum', |
|
|
|
title: '用量', |
|
|
|
formatter:function (value,row,index){ |
|
|
|
if (value == null || value == ''){ |
|
|
|
return '/'; |
|
|
|
}else{ |
|
|
|
return value; |
|
|
|
} |
|
|
|
} |
|
|
|
}, |
|
|
|
{ |
|
|
|
field: 'lossRate', |
|
|
|
title: '损耗率', |
|
|
|
{ title: '品牌',field: 'brand'}, |
|
|
|
{title: '描述',field: 'describe'}, |
|
|
|
{title: '用量',field: 'useNum'}, |
|
|
|
{title: '损耗率',field: 'lossRate', |
|
|
|
formatter:function (value,row,index){ |
|
|
|
if (value == null || value == ''){ |
|
|
|
return '/'; |
|
|
|
@ -405,7 +295,6 @@ |
|
|
|
}] |
|
|
|
}; |
|
|
|
$.table.init(options); |
|
|
|
|
|
|
|
}); |
|
|
|
initOneLevelTable = function(index, row, $detail) { |
|
|
|
$("#"+"one_level_table_"+row.id).bootstrapTable({ |
|
|
|
|
zhangsiqi
7 months ago