Browse Source
修改开发修改单领料前端页面：去掉前端添加、删除、修改按钮； 开发修改单Controller新增 通过开发修改单号查询开发修改单详情集合后端接口；新增 加载审批弹窗后端接口；新增 自动绑定页面字段后端接口；新增 审批完成任务后端接口；新增 查找开发修改领料详情信息列表后端接口； 开发修改单领料详情新增：通过bomId和领料单号查询领料单详情集合后端接口； 新增工程经理审批开发修改单领料前端页面 新增工程主管审批开发修改单领料前端页面 新增驳回调整开发修改单领料前端页面dev
11 changed files with 1224 additions and 12 deletions
@ -0,0 +1,338 @@ |
|||
<!DOCTYPE html> |
|||
<html lang="zh" xmlns:th="http://www.thymeleaf.org" > |
|||
<head> |
|||
<th:block th:include="include :: header('修改开发修改单领料')" /> |
|||
<th:block th:include="include :: datetimepicker-css" /> |
|||
</head> |
|||
<body class="white-bg"> |
|||
<div class="wrapper wrapper-content animated fadeInRight ibox-content"> |
|||
<form class="form-horizontal m" id="form-developModifyorderPicking-gcjl" th:object="${formData}"> |
|||
<input name="developOrderPickingId" th:field="*{developOrderPickingId}" type="hidden"> |
|||
<input name="taskId" th:field="*{taskId}" type="hidden"> |
|||
<input name="taskName" th:field="*{taskName}" type="hidden"> |
|||
<input name="instanceId" th:field="*{instanceId}" type="hidden"> |
|||
<input name="instanceType" th:field="*{instanceType}" type="hidden"> |
|||
<input type="hidden" name="p_COM_comment" /> |
|||
<div class="form-group"> |
|||
<label class="col-sm-3 control-label">开发修改单领料单号：</label> |
|||
<div class="col-sm-8"> |
|||
<input name="pickingOrderCode" th:field="*{pickingOrderCode}" class="form-control" type="text"> |
|||
</div> |
|||
</div> |
|||
<div class="form-group"> |
|||
<label class="col-sm-3 control-label">关联生产单号：</label> |
|||
<div class="col-sm-8"> |
|||
<input name="makeNo" th:field="*{makeNo}" class="form-control" type="text"> |
|||
</div> |
|||
</div> |
|||
<div class="form-group"> |
|||
<label class="col-sm-3 control-label">领料员：</label> |
|||
<div class="col-sm-8"> |
|||
<input name="pickUser" th:field="*{pickUser}" class="form-control" type="text"> |
|||
</div> |
|||
</div> |
|||
<div class="form-group"> |
|||
<label class="col-sm-3 control-label">订单类型：</label> |
|||
<div class="col-sm-8"> |
|||
<input name="orderType" th:field="*{orderType}" class="form-control" type="text"> |
|||
</div> |
|||
</div> |
|||
<div class="form-group"> |
|||
<label class="col-sm-3 control-label is-required" for="gcjlVerifyApproved">审批意见：</label> |
|||
<div class="col-sm-8"> |
|||
<select name="p_B_gcjlVerifyApproved" id="gcjlVerifyApproved" class="form-control" required> |
|||
<option value=""></option> |
|||
<option value="true">同意</option> |
|||
<option value="false">拒绝</option> |
|||
</select> |
|||
</div> |
|||
</div> |
|||
</form> |
|||
|
|||
<div class="container"> |
|||
<div class="row"> |
|||
<div class="col-sm-12 select-table table-striped"> |
|||
<table id="bootstrap-table-picking"></table> |
|||
</div> |
|||
</div> |
|||
</div> |
|||
</div> |
|||
<th:block th:include="include :: footer" /> |
|||
<th:block th:include="include :: datetimepicker-js" /> |
|||
<script th:src="@{/js/activiti.js}"></script> |
|||
<script th:inline="javascript"> |
|||
var prefix = ctx + "erp/developModifyorderPicking"; |
|||
|
|||
var sysUnitClassDatas = [[${@dict.getType('sys_unit_class')}]]; |
|||
var materialTypeDatas = [[${@category.getChildByCode('materialType')}]]; |
|||
var levelDatas = [[${@dict.getType('bomLevel')}]]; |
|||
var bomLevelSelectDatas = [[${@dict.getTypeSelect('bomLevel')}]]; |
|||
|
|||
|
|||
var processMethodDatas = [[${@dict.getType('processMethod')}]]; |
|||
|
|||
var developOrderCode = [[${developOrderCode}]] |
|||
|
|||
$("#form-developModifyorderPicking-gcjl").validate({ |
|||
focusCleanup: true |
|||
}); |
|||
|
|||
function submitHandler() { |
|||
if ($('textarea[name="comment"]').val()) { |
|||
$('input[name="p_COM_comment"]').val($('textarea[name="comment"]').val()); |
|||
} |
|||
var taskId = [[${taskId}]]; |
|||
// 发送 AJAX 请求到后端接口 |
|||
$.operate.save(prefix + "/complete/" + taskId, $('#form-developModifyorderPicking-gcjl').serialize()); |
|||
} |
|||
|
|||
$("input[name='applyTime']").datetimepicker({ |
|||
format: "yyyy-mm-dd", |
|||
minView: "month", |
|||
autoclose: true |
|||
}); |
|||
|
|||
|
|||
|
|||
|
|||
// 选择采购物料 |
|||
$(function(){ |
|||
var options = { |
|||
id: 'bootstrap-table-picking', |
|||
url: prefix + "/getDevelopModifyorderListByCode", |
|||
showSearch: false, |
|||
showRefresh: false, |
|||
showToggle: false, |
|||
showColumns: false, |
|||
uniqueId: "id", |
|||
pagination: false, // 设置不分页 |
|||
sidePagination: "client", |
|||
detailView: true, |
|||
queryParams: queryParams, |
|||
onExpandRow : function(index, row, $detail) { |
|||
initChildTable(index, row, $detail); |
|||
}, |
|||
columns: [ |
|||
{ |
|||
field: 'developOrderDetailId', |
|||
title: '主键id', |
|||
visible: false |
|||
}, |
|||
{ |
|||
field: 'bomId', |
|||
title: 'bom主键Id', |
|||
}, |
|||
{ |
|||
field: 'materialNo', |
|||
align: 'center', |
|||
title: '料号' |
|||
}, |
|||
{ |
|||
field: 'materialName', |
|||
align: 'center', |
|||
title: '物料名称', |
|||
}, |
|||
{ |
|||
field: 'materialType', |
|||
align: 'center', |
|||
title: '物料类型', |
|||
formatter: function(value, row, index) { |
|||
return $.table.selectCategoryLabel(materialTypeDatas, value); |
|||
} |
|||
}, |
|||
{ |
|||
field: 'materialUnit', |
|||
align: 'center', |
|||
title: '单位', |
|||
}, |
|||
{ |
|||
field: 'materialBrand', |
|||
align: 'center', |
|||
title: '品牌' |
|||
}, |
|||
{ |
|||
field: 'materialDescribe', |
|||
align: 'center', |
|||
title: '描述' |
|||
}, |
|||
{ |
|||
field: 'materialProcessMethod', |
|||
align: 'center', |
|||
title: '物料加工方式', |
|||
formatter: function(value, row, index) { |
|||
return $.table.selectDictLabel(processMethodDatas, value); |
|||
} |
|||
}, |
|||
{ |
|||
field: 'materialNum', |
|||
align: 'center', |
|||
title: '订单数量', |
|||
}, |
|||
|
|||
{ |
|||
field: 'warehouseDept', |
|||
align: 'center', |
|||
title: '入库部门', |
|||
visible: false |
|||
}, |
|||
] |
|||
}; |
|||
$.table.init(options); |
|||
}) |
|||
|
|||
initChildTable = function(index, row, $detail) { |
|||
var parentRow = row; |
|||
var childTableId = 'child_table_'+index; |
|||
$detail.html('<table id="'+childTableId+'"></table>'); |
|||
// 将 parentRow 保存为表格的数据属性 |
|||
$('#' + childTableId).data('parentRow', parentRow); |
|||
// BOM展示 |
|||
$('#' + childTableId).bootstrapTable({ |
|||
url: prefix + "/getPickingDetailListByIdAndCode", |
|||
method: 'post', |
|||
sidePagination: "server", |
|||
contentType: "application/x-www-form-urlencoded", |
|||
queryParams: { |
|||
parentId: parentRow.bomId, |
|||
pickingOrderCode: $("#pickingOrderCode").val() |
|||
}, |
|||
columns: [ |
|||
|
|||
{ |
|||
field: 'id', |
|||
title: '主键id', |
|||
visible: false |
|||
}, |
|||
{ |
|||
field: 'bomId', |
|||
title: 'BOM的Id', |
|||
visible: false, |
|||
formatter: function (value, row, index) { |
|||
var parentRow = $('#' + childTableId).data('parentRow'); // 从表格的数据属性中获取 parentRow |
|||
var curIndex = row.sortNo - 1; |
|||
return '<input class="hidden form-control" data-id="bomId_' + curIndex + '" name="developModifyorderPickingDetails[' + curIndex + '].bomId" value="' + parentRow.bomId + '">'; |
|||
} |
|||
}, |
|||
{ |
|||
field: 'level', |
|||
title: '阶层', |
|||
formatter: function (value, row, index) { |
|||
return $.table.selectDictLabel(levelDatas, value); |
|||
} |
|||
}, |
|||
{ |
|||
field: 'bomNo', |
|||
title: 'BOM号', |
|||
formatter: function (value, row, index) { |
|||
if (value == null || value == '') { |
|||
return '/'; |
|||
} else { |
|||
return value |
|||
} |
|||
} |
|||
}, |
|||
{ |
|||
field: 'materialNo', |
|||
align: 'center', |
|||
title: '料号' |
|||
}, |
|||
{ |
|||
field: 'materialName', |
|||
align: 'center', |
|||
title: '物料名称', |
|||
}, |
|||
{ |
|||
field: 'materialType', |
|||
align: 'center', |
|||
title: '物料类型', |
|||
formatter: function(value, row, index) { |
|||
return $.table.selectCategoryLabel(materialTypeDatas, value); |
|||
} |
|||
}, |
|||
{ |
|||
field: 'materialUnit', |
|||
align: 'center', |
|||
title: '单位', |
|||
}, |
|||
{ |
|||
field: 'materialBrand', |
|||
align: 'center', |
|||
title: '品牌' |
|||
}, |
|||
{ |
|||
field: 'materialDescribe', |
|||
align: 'center', |
|||
title: '描述' |
|||
}, |
|||
{ |
|||
field: 'materialProcessMethod', |
|||
align: 'center', |
|||
title: '物料加工方式', |
|||
formatter: function(value, row, index) { |
|||
return $.table.selectDictLabel(processMethodDatas, value); |
|||
} |
|||
}, |
|||
{ |
|||
field: 'warehouseDept', |
|||
align: 'center', |
|||
title: '入库部门', |
|||
visible: false |
|||
}, |
|||
{ |
|||
field: 'useNum', |
|||
title: '用量', |
|||
formatter: function (value, row, index) { |
|||
if (value == null || value == '') { |
|||
return '/'; |
|||
} else { |
|||
return value |
|||
} |
|||
} |
|||
}, |
|||
{ |
|||
field: 'lossRate', |
|||
title: '损耗率', |
|||
}, |
|||
{ |
|||
field: 'orderUseNum', |
|||
title: '订单用量', |
|||
}, |
|||
|
|||
{ |
|||
field: 'availableStockNum', |
|||
title: '可用库存数', |
|||
}, |
|||
{ |
|||
field: 'hasPickNum', |
|||
title: '已领料数', |
|||
}, |
|||
{ |
|||
field: 'pickNum', |
|||
title: '本次领料数', |
|||
}, |
|||
{ |
|||
field: 'sortNo', |
|||
title: '排序', |
|||
visible: false |
|||
}], |
|||
// 当所有数据被加载时触发 |
|||
onLoadSuccess: function (data) { |
|||
|
|||
}, |
|||
}); |
|||
} |
|||
|
|||
function queryParams(params) { |
|||
var curParams = { |
|||
// 传递参数查询参数 |
|||
developOrderCode: developOrderCode |
|||
}; |
|||
console.log(curParams); |
|||
return curParams; |
|||
} |
|||
|
|||
|
|||
|
|||
</script> |
|||
</body> |
|||
</html> |
|||
@ -0,0 +1,338 @@ |
|||
<!DOCTYPE html> |
|||
<html lang="zh" xmlns:th="http://www.thymeleaf.org" > |
|||
<head> |
|||
<th:block th:include="include :: header('修改开发修改单领料')" /> |
|||
<th:block th:include="include :: datetimepicker-css" /> |
|||
</head> |
|||
<body class="white-bg"> |
|||
<div class="wrapper wrapper-content animated fadeInRight ibox-content"> |
|||
<form class="form-horizontal m" id="form-developModifyorderPicking-gczg" th:object="${formData}"> |
|||
<input name="developOrderPickingId" th:field="*{developOrderPickingId}" type="hidden"> |
|||
<input name="taskId" th:field="*{taskId}" type="hidden"> |
|||
<input name="taskName" th:field="*{taskName}" type="hidden"> |
|||
<input name="instanceId" th:field="*{instanceId}" type="hidden"> |
|||
<input name="instanceType" th:field="*{instanceType}" type="hidden"> |
|||
<input type="hidden" name="p_COM_comment" /> |
|||
<div class="form-group"> |
|||
<label class="col-sm-3 control-label">开发修改单领料单号：</label> |
|||
<div class="col-sm-8"> |
|||
<input name="pickingOrderCode" th:field="*{pickingOrderCode}" class="form-control" type="text"> |
|||
</div> |
|||
</div> |
|||
<div class="form-group"> |
|||
<label class="col-sm-3 control-label">关联生产单号：</label> |
|||
<div class="col-sm-8"> |
|||
<input name="makeNo" th:field="*{makeNo}" class="form-control" type="text"> |
|||
</div> |
|||
</div> |
|||
<div class="form-group"> |
|||
<label class="col-sm-3 control-label">领料员：</label> |
|||
<div class="col-sm-8"> |
|||
<input name="pickUser" th:field="*{pickUser}" class="form-control" type="text"> |
|||
</div> |
|||
</div> |
|||
<div class="form-group"> |
|||
<label class="col-sm-3 control-label">订单类型：</label> |
|||
<div class="col-sm-8"> |
|||
<input name="orderType" th:field="*{orderType}" class="form-control" type="text"> |
|||
</div> |
|||
</div> |
|||
<div class="form-group"> |
|||
<label class="col-sm-3 control-label is-required" for="gczgVerifyApproved">审批意见：</label> |
|||
<div class="col-sm-8"> |
|||
<select name="p_B_gczgVerifyApproved" id="gczgVerifyApproved" class="form-control" required> |
|||
<option value=""></option> |
|||
<option value="true">同意</option> |
|||
<option value="false">拒绝</option> |
|||
</select> |
|||
</div> |
|||
</div> |
|||
</form> |
|||
|
|||
<div class="container"> |
|||
<div class="row"> |
|||
<div class="col-sm-12 select-table table-striped"> |
|||
<table id="bootstrap-table-picking"></table> |
|||
</div> |
|||
</div> |
|||
</div> |
|||
</div> |
|||
<th:block th:include="include :: footer" /> |
|||
<th:block th:include="include :: datetimepicker-js" /> |
|||
<script th:src="@{/js/activiti.js}"></script> |
|||
<script th:inline="javascript"> |
|||
var prefix = ctx + "erp/developModifyorderPicking"; |
|||
|
|||
var sysUnitClassDatas = [[${@dict.getType('sys_unit_class')}]]; |
|||
var materialTypeDatas = [[${@category.getChildByCode('materialType')}]]; |
|||
var levelDatas = [[${@dict.getType('bomLevel')}]]; |
|||
var bomLevelSelectDatas = [[${@dict.getTypeSelect('bomLevel')}]]; |
|||
|
|||
|
|||
var processMethodDatas = [[${@dict.getType('processMethod')}]]; |
|||
|
|||
var developOrderCode = [[${developOrderCode}]] |
|||
|
|||
$("#form-developModifyorderPicking-gczg").validate({ |
|||
focusCleanup: true |
|||
}); |
|||
|
|||
function submitHandler() { |
|||
if ($('textarea[name="comment"]').val()) { |
|||
$('input[name="p_COM_comment"]').val($('textarea[name="comment"]').val()); |
|||
} |
|||
var taskId = [[${taskId}]]; |
|||
// 发送 AJAX 请求到后端接口 |
|||
$.operate.save(prefix + "/complete/" + taskId, $('#form-developModifyorderPicking-gczg').serialize()); |
|||
} |
|||
|
|||
$("input[name='applyTime']").datetimepicker({ |
|||
format: "yyyy-mm-dd", |
|||
minView: "month", |
|||
autoclose: true |
|||
}); |
|||
|
|||
|
|||
|
|||
|
|||
// 选择采购物料 |
|||
$(function(){ |
|||
var options = { |
|||
id: 'bootstrap-table-picking', |
|||
url: prefix + "/getDevelopModifyorderListByCode", |
|||
showSearch: false, |
|||
showRefresh: false, |
|||
showToggle: false, |
|||
showColumns: false, |
|||
uniqueId: "id", |
|||
pagination: false, // 设置不分页 |
|||
sidePagination: "client", |
|||
detailView: true, |
|||
queryParams: queryParams, |
|||
onExpandRow : function(index, row, $detail) { |
|||
initChildTable(index, row, $detail); |
|||
}, |
|||
columns: [ |
|||
{ |
|||
field: 'developOrderDetailId', |
|||
title: '主键id', |
|||
visible: false |
|||
}, |
|||
{ |
|||
field: 'bomId', |
|||
title: 'bom主键Id', |
|||
}, |
|||
{ |
|||
field: 'materialNo', |
|||
align: 'center', |
|||
title: '料号' |
|||
}, |
|||
{ |
|||
field: 'materialName', |
|||
align: 'center', |
|||
title: '物料名称', |
|||
}, |
|||
{ |
|||
field: 'materialType', |
|||
align: 'center', |
|||
title: '物料类型', |
|||
formatter: function(value, row, index) { |
|||
return $.table.selectCategoryLabel(materialTypeDatas, value); |
|||
} |
|||
}, |
|||
{ |
|||
field: 'materialUnit', |
|||
align: 'center', |
|||
title: '单位', |
|||
}, |
|||
{ |
|||
field: 'materialBrand', |
|||
align: 'center', |
|||
title: '品牌' |
|||
}, |
|||
{ |
|||
field: 'materialDescribe', |
|||
align: 'center', |
|||
title: '描述' |
|||
}, |
|||
{ |
|||
field: 'materialProcessMethod', |
|||
align: 'center', |
|||
title: '物料加工方式', |
|||
formatter: function(value, row, index) { |
|||
return $.table.selectDictLabel(processMethodDatas, value); |
|||
} |
|||
}, |
|||
{ |
|||
field: 'materialNum', |
|||
align: 'center', |
|||
title: '订单数量', |
|||
}, |
|||
|
|||
{ |
|||
field: 'warehouseDept', |
|||
align: 'center', |
|||
title: '入库部门', |
|||
visible: false |
|||
}, |
|||
] |
|||
}; |
|||
$.table.init(options); |
|||
}) |
|||
|
|||
initChildTable = function(index, row, $detail) { |
|||
var parentRow = row; |
|||
var childTableId = 'child_table_'+index; |
|||
$detail.html('<table id="'+childTableId+'"></table>'); |
|||
// 将 parentRow 保存为表格的数据属性 |
|||
$('#' + childTableId).data('parentRow', parentRow); |
|||
// BOM展示 |
|||
$('#' + childTableId).bootstrapTable({ |
|||
url: prefix + "/getPickingDetailListByIdAndCode", |
|||
method: 'post', |
|||
sidePagination: "server", |
|||
contentType: "application/x-www-form-urlencoded", |
|||
queryParams: { |
|||
parentId: parentRow.bomId, |
|||
pickingOrderCode: $("#pickingOrderCode").val() |
|||
}, |
|||
columns: [ |
|||
|
|||
{ |
|||
field: 'id', |
|||
title: '主键id', |
|||
visible: false |
|||
}, |
|||
{ |
|||
field: 'bomId', |
|||
title: 'BOM的Id', |
|||
visible: false, |
|||
formatter: function (value, row, index) { |
|||
var parentRow = $('#' + childTableId).data('parentRow'); // 从表格的数据属性中获取 parentRow |
|||
var curIndex = row.sortNo - 1; |
|||
return '<input class="hidden form-control" data-id="bomId_' + curIndex + '" name="developModifyorderPickingDetails[' + curIndex + '].bomId" value="' + parentRow.bomId + '">'; |
|||
} |
|||
}, |
|||
{ |
|||
field: 'level', |
|||
title: '阶层', |
|||
formatter: function (value, row, index) { |
|||
return $.table.selectDictLabel(levelDatas, value); |
|||
} |
|||
}, |
|||
{ |
|||
field: 'bomNo', |
|||
title: 'BOM号', |
|||
formatter: function (value, row, index) { |
|||
if (value == null || value == '') { |
|||
return '/'; |
|||
} else { |
|||
return value |
|||
} |
|||
} |
|||
}, |
|||
{ |
|||
field: 'materialNo', |
|||
align: 'center', |
|||
title: '料号' |
|||
}, |
|||
{ |
|||
field: 'materialName', |
|||
align: 'center', |
|||
title: '物料名称', |
|||
}, |
|||
{ |
|||
field: 'materialType', |
|||
align: 'center', |
|||
title: '物料类型', |
|||
formatter: function(value, row, index) { |
|||
return $.table.selectCategoryLabel(materialTypeDatas, value); |
|||
} |
|||
}, |
|||
{ |
|||
field: 'materialUnit', |
|||
align: 'center', |
|||
title: '单位', |
|||
}, |
|||
{ |
|||
field: 'materialBrand', |
|||
align: 'center', |
|||
title: '品牌' |
|||
}, |
|||
{ |
|||
field: 'materialDescribe', |
|||
align: 'center', |
|||
title: '描述' |
|||
}, |
|||
{ |
|||
field: 'materialProcessMethod', |
|||
align: 'center', |
|||
title: '物料加工方式', |
|||
formatter: function(value, row, index) { |
|||
return $.table.selectDictLabel(processMethodDatas, value); |
|||
} |
|||
}, |
|||
{ |
|||
field: 'warehouseDept', |
|||
align: 'center', |
|||
title: '入库部门', |
|||
visible: false |
|||
}, |
|||
{ |
|||
field: 'useNum', |
|||
title: '用量', |
|||
formatter: function (value, row, index) { |
|||
if (value == null || value == '') { |
|||
return '/'; |
|||
} else { |
|||
return value |
|||
} |
|||
} |
|||
}, |
|||
{ |
|||
field: 'lossRate', |
|||
title: '损耗率', |
|||
}, |
|||
{ |
|||
field: 'orderUseNum', |
|||
title: '订单用量', |
|||
}, |
|||
|
|||
{ |
|||
field: 'availableStockNum', |
|||
title: '可用库存数', |
|||
}, |
|||
{ |
|||
field: 'hasPickNum', |
|||
title: '已领料数', |
|||
}, |
|||
{ |
|||
field: 'pickNum', |
|||
title: '本次领料数', |
|||
}, |
|||
{ |
|||
field: 'sortNo', |
|||
title: '排序', |
|||
visible: false |
|||
}], |
|||
// 当所有数据被加载时触发 |
|||
onLoadSuccess: function (data) { |
|||
|
|||
}, |
|||
}); |
|||
} |
|||
|
|||
function queryParams(params) { |
|||
var curParams = { |
|||
// 传递参数查询参数 |
|||
developOrderCode: developOrderCode |
|||
}; |
|||
console.log(curParams); |
|||
return curParams; |
|||
} |
|||
|
|||
|
|||
|
|||
</script> |
|||
</body> |
|||
</html> |
|||
@ -0,0 +1,337 @@ |
|||
<!DOCTYPE html> |
|||
<html lang="zh" xmlns:th="http://www.thymeleaf.org" > |
|||
<head> |
|||
<th:block th:include="include :: header('驳回调整')" /> |
|||
<th:block th:include="include :: datetimepicker-css" /> |
|||
</head> |
|||
<body class="white-bg"> |
|||
<div class="wrapper wrapper-content animated fadeInRight ibox-content"> |
|||
<form class="form-horizontal m" id="form-developModifyorderPicking-modifyApply" th:object="${formData}"> |
|||
<input name="developOrderPickingId" th:field="*{developOrderPickingId}" type="hidden"> |
|||
<input name="taskId" th:field="*{taskId}" type="hidden"> |
|||
<input name="taskName" th:field="*{taskName}" type="hidden"> |
|||
<input name="instanceId" th:field="*{instanceId}" type="hidden"> |
|||
<input name="instanceType" th:field="*{instanceType}" type="hidden"> |
|||
<input type="hidden" name="p_COM_comment" /> |
|||
<div class="form-group"> |
|||
<label class="col-sm-3 control-label">开发修改单领料单号：</label> |
|||
<div class="col-sm-8"> |
|||
<input name="pickingOrderCode" th:field="*{pickingOrderCode}" class="form-control" type="text"> |
|||
</div> |
|||
</div> |
|||
<div class="form-group"> |
|||
<label class="col-sm-3 control-label">关联生产单号：</label> |
|||
<div class="col-sm-8"> |
|||
<input name="makeNo" th:field="*{makeNo}" class="form-control" type="text"> |
|||
</div> |
|||
</div> |
|||
<div class="form-group"> |
|||
<label class="col-sm-3 control-label">领料员：</label> |
|||
<div class="col-sm-8"> |
|||
<input name="pickUser" th:field="*{pickUser}" class="form-control" type="text"> |
|||
</div> |
|||
</div> |
|||
<div class="form-group"> |
|||
<label class="col-sm-3 control-label">订单类型：</label> |
|||
<div class="col-sm-8"> |
|||
<input name="orderType" th:field="*{orderType}" class="form-control" type="text"> |
|||
</div> |
|||
</div> |
|||
<div class="form-group"> |
|||
<label class="col-sm-3 control-label" for="reApply">是否继续申请：</label> |
|||
<div class="col-sm-8"> |
|||
<select id="reApply" name="p_B_reApply" class="form-control m-b"> |
|||
<option value="true">重新申请</option> |
|||
<option value="false">结束流程</option> |
|||
</select> |
|||
</div> |
|||
</div> |
|||
</form> |
|||
|
|||
<div class="container"> |
|||
<div class="row"> |
|||
<div class="col-sm-12 select-table table-striped"> |
|||
<table id="bootstrap-table-picking"></table> |
|||
</div> |
|||
</div> |
|||
</div> |
|||
</div> |
|||
<th:block th:include="include :: footer" /> |
|||
<th:block th:include="include :: datetimepicker-js" /> |
|||
<script th:src="@{/js/activiti.js}"></script> |
|||
<script th:inline="javascript"> |
|||
var prefix = ctx + "erp/developModifyorderPicking"; |
|||
|
|||
var sysUnitClassDatas = [[${@dict.getType('sys_unit_class')}]]; |
|||
var materialTypeDatas = [[${@category.getChildByCode('materialType')}]]; |
|||
var levelDatas = [[${@dict.getType('bomLevel')}]]; |
|||
var bomLevelSelectDatas = [[${@dict.getTypeSelect('bomLevel')}]]; |
|||
|
|||
|
|||
var processMethodDatas = [[${@dict.getType('processMethod')}]]; |
|||
|
|||
var developOrderCode = [[${developOrderCode}]] |
|||
|
|||
$("#form-developModifyorderPicking-modifyApply").validate({ |
|||
focusCleanup: true |
|||
}); |
|||
|
|||
function submitHandler() { |
|||
if ($('textarea[name="comment"]').val()) { |
|||
$('input[name="p_COM_comment"]').val($('textarea[name="comment"]').val()); |
|||
} |
|||
var taskId = [[${taskId}]]; |
|||
// 发送 AJAX 请求到后端接口 |
|||
$.operate.save(prefix + "/complete/" + taskId, $('#form-developModifyorderPicking-modifyApply').serialize()); |
|||
} |
|||
|
|||
$("input[name='applyTime']").datetimepicker({ |
|||
format: "yyyy-mm-dd", |
|||
minView: "month", |
|||
autoclose: true |
|||
}); |
|||
|
|||
|
|||
|
|||
|
|||
// 选择采购物料 |
|||
$(function(){ |
|||
var options = { |
|||
id: 'bootstrap-table-picking', |
|||
url: prefix + "/getDevelopModifyorderListByCode", |
|||
showSearch: false, |
|||
showRefresh: false, |
|||
showToggle: false, |
|||
showColumns: false, |
|||
uniqueId: "id", |
|||
pagination: false, // 设置不分页 |
|||
sidePagination: "client", |
|||
detailView: true, |
|||
queryParams: queryParams, |
|||
onExpandRow : function(index, row, $detail) { |
|||
initChildTable(index, row, $detail); |
|||
}, |
|||
columns: [ |
|||
{ |
|||
field: 'developOrderDetailId', |
|||
title: '主键id', |
|||
visible: false |
|||
}, |
|||
{ |
|||
field: 'bomId', |
|||
title: 'bom主键Id', |
|||
}, |
|||
{ |
|||
field: 'materialNo', |
|||
align: 'center', |
|||
title: '料号' |
|||
}, |
|||
{ |
|||
field: 'materialName', |
|||
align: 'center', |
|||
title: '物料名称', |
|||
}, |
|||
{ |
|||
field: 'materialType', |
|||
align: 'center', |
|||
title: '物料类型', |
|||
formatter: function(value, row, index) { |
|||
return $.table.selectCategoryLabel(materialTypeDatas, value); |
|||
} |
|||
}, |
|||
{ |
|||
field: 'materialUnit', |
|||
align: 'center', |
|||
title: '单位', |
|||
}, |
|||
{ |
|||
field: 'materialBrand', |
|||
align: 'center', |
|||
title: '品牌' |
|||
}, |
|||
{ |
|||
field: 'materialDescribe', |
|||
align: 'center', |
|||
title: '描述' |
|||
}, |
|||
{ |
|||
field: 'materialProcessMethod', |
|||
align: 'center', |
|||
title: '物料加工方式', |
|||
formatter: function(value, row, index) { |
|||
return $.table.selectDictLabel(processMethodDatas, value); |
|||
} |
|||
}, |
|||
{ |
|||
field: 'materialNum', |
|||
align: 'center', |
|||
title: '订单数量', |
|||
}, |
|||
|
|||
{ |
|||
field: 'warehouseDept', |
|||
align: 'center', |
|||
title: '入库部门', |
|||
visible: false |
|||
}, |
|||
] |
|||
}; |
|||
$.table.init(options); |
|||
}) |
|||
|
|||
initChildTable = function(index, row, $detail) { |
|||
var parentRow = row; |
|||
var childTableId = 'child_table_'+index; |
|||
$detail.html('<table id="'+childTableId+'"></table>'); |
|||
// 将 parentRow 保存为表格的数据属性 |
|||
$('#' + childTableId).data('parentRow', parentRow); |
|||
// BOM展示 |
|||
$('#' + childTableId).bootstrapTable({ |
|||
url: prefix + "/getPickingDetailListByIdAndCode", |
|||
method: 'post', |
|||
sidePagination: "server", |
|||
contentType: "application/x-www-form-urlencoded", |
|||
queryParams: { |
|||
parentId: parentRow.bomId, |
|||
pickingOrderCode: $("#pickingOrderCode").val() |
|||
}, |
|||
columns: [ |
|||
|
|||
{ |
|||
field: 'id', |
|||
title: '主键id', |
|||
visible: false |
|||
}, |
|||
{ |
|||
field: 'bomId', |
|||
title: 'BOM的Id', |
|||
visible: false, |
|||
formatter: function (value, row, index) { |
|||
var parentRow = $('#' + childTableId).data('parentRow'); // 从表格的数据属性中获取 parentRow |
|||
var curIndex = row.sortNo - 1; |
|||
return '<input class="hidden form-control" data-id="bomId_' + curIndex + '" name="developModifyorderPickingDetails[' + curIndex + '].bomId" value="' + parentRow.bomId + '">'; |
|||
} |
|||
}, |
|||
{ |
|||
field: 'level', |
|||
title: '阶层', |
|||
formatter: function (value, row, index) { |
|||
return $.table.selectDictLabel(levelDatas, value); |
|||
} |
|||
}, |
|||
{ |
|||
field: 'bomNo', |
|||
title: 'BOM号', |
|||
formatter: function (value, row, index) { |
|||
if (value == null || value == '') { |
|||
return '/'; |
|||
} else { |
|||
return value |
|||
} |
|||
} |
|||
}, |
|||
{ |
|||
field: 'materialNo', |
|||
align: 'center', |
|||
title: '料号' |
|||
}, |
|||
{ |
|||
field: 'materialName', |
|||
align: 'center', |
|||
title: '物料名称', |
|||
}, |
|||
{ |
|||
field: 'materialType', |
|||
align: 'center', |
|||
title: '物料类型', |
|||
formatter: function(value, row, index) { |
|||
return $.table.selectCategoryLabel(materialTypeDatas, value); |
|||
} |
|||
}, |
|||
{ |
|||
field: 'materialUnit', |
|||
align: 'center', |
|||
title: '单位', |
|||
}, |
|||
{ |
|||
field: 'materialBrand', |
|||
align: 'center', |
|||
title: '品牌' |
|||
}, |
|||
{ |
|||
field: 'materialDescribe', |
|||
align: 'center', |
|||
title: '描述' |
|||
}, |
|||
{ |
|||
field: 'materialProcessMethod', |
|||
align: 'center', |
|||
title: '物料加工方式', |
|||
formatter: function(value, row, index) { |
|||
return $.table.selectDictLabel(processMethodDatas, value); |
|||
} |
|||
}, |
|||
{ |
|||
field: 'warehouseDept', |
|||
align: 'center', |
|||
title: '入库部门', |
|||
visible: false |
|||
}, |
|||
{ |
|||
field: 'useNum', |
|||
title: '用量', |
|||
formatter: function (value, row, index) { |
|||
if (value == null || value == '') { |
|||
return '/'; |
|||
} else { |
|||
return value |
|||
} |
|||
} |
|||
}, |
|||
{ |
|||
field: 'lossRate', |
|||
title: '损耗率', |
|||
}, |
|||
{ |
|||
field: 'orderUseNum', |
|||
title: '订单用量', |
|||
}, |
|||
|
|||
{ |
|||
field: 'availableStockNum', |
|||
title: '可用库存数', |
|||
}, |
|||
{ |
|||
field: 'hasPickNum', |
|||
title: '已领料数', |
|||
}, |
|||
{ |
|||
field: 'pickNum', |
|||
title: '本次领料数', |
|||
}, |
|||
{ |
|||
field: 'sortNo', |
|||
title: '排序', |
|||
visible: false |
|||
}], |
|||
// 当所有数据被加载时触发 |
|||
onLoadSuccess: function (data) { |
|||
|
|||
}, |
|||
}); |
|||
} |
|||
|
|||
function queryParams(params) { |
|||
var curParams = { |
|||
// 传递参数查询参数 |
|||
developOrderCode: developOrderCode |
|||
}; |
|||
console.log(curParams); |
|||
return curParams; |
|||
} |
|||
|
|||
|
|||
|
|||
</script> |
|||
</body> |
|||
</html> |
|||
Loading…
Reference in new issue