Browse Source
基础资料 请购单 修改请购单列表页面，去除申请人显示效果，设置列居中显示； 修改请购经理、主管、副总经理、总经理审批页面字段显示； 修改请购单service分角色设置节点变量方法； 修改请购单列表查询mapper方法，截取日期判断； 新增研发总监审批页面；dev
8 changed files with 281 additions and 61 deletions
@ -0,0 +1,199 @@ |
|||||
|
<!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-requisitioning-yfzj-audit" th:object="${formData}"> |
||||
|
<input name="requisitioningId" th:field="*{requisitioningId}" 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="applyUserName" th:field="*{applyUserName}" class="form-control" type="text" readonly> |
||||
|
</div> |
||||
|
</div> |
||||
|
<div class="form-group"> |
||||
|
<label class="col-sm-3 control-label">申请时间：</label> |
||||
|
<div class="col-sm-8"> |
||||
|
<div class="input-group date"> |
||||
|
<span class="input-group-addon"><i class="fa fa-calendar"></i></span> |
||||
|
<input name="applyTime" th:value="${#dates.format(formData.applyTime, 'yyyy-MM-dd HH:mm')}" class="form-control" type="text" disabled> |
||||
|
</div> |
||||
|
</div> |
||||
|
</div> |
||||
|
<div class="form-group"> |
||||
|
<label class="col-sm-3 control-label">标题：</label> |
||||
|
<div class="col-sm-8"> |
||||
|
<input name="title" th:field="*{applyTitle}" class="form-control" type="text" readonly> |
||||
|
</div> |
||||
|
</div> |
||||
|
<div class="form-group" hidden="hidden"> |
||||
|
<label class="col-sm-3 control-label">请购单号：</label> |
||||
|
<div class="col-sm-8"> |
||||
|
<input name="requisitioningCode" th:field="*{requisitioningCode}" 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="deptName" th:field="*{deptName}" class="form-control" disabled></input> |
||||
|
</div> |
||||
|
</div> |
||||
|
<div class="form-group"> |
||||
|
<label class="col-sm-3 control-label">岗位：</label> |
||||
|
<div class="col-sm-8"> |
||||
|
<input name="postName" th:field="*{postName}" class="form-control" disabled></input> |
||||
|
</div> |
||||
|
</div> |
||||
|
<!-- <div class="form-group">--> |
||||
|
<!-- <label class="col-sm-3 control-label">姓名：</label>--> |
||||
|
<!-- <div class="col-sm-8">--> |
||||
|
<!-- <select name="userName" th:field="*{userName}" class="form-control" disabled></select>--> |
||||
|
<!-- </div>--> |
||||
|
<!-- </div>--> |
||||
|
<div class="form-group"> |
||||
|
<label class="col-sm-3 control-label">关联单号：</label> |
||||
|
<div class="col-sm-8"> |
||||
|
<input name="correlationCode" th:field="*{correlationCode}" class="form-control" type="text"> |
||||
|
</div> |
||||
|
</div> |
||||
|
<div class="form-group"> |
||||
|
<label class="col-sm-3 control-label" for="yfzjVerifyApproved"><span style="color: red; ">*</span>审批意见：</label> |
||||
|
<div class="col-sm-8"> |
||||
|
<select name="p_B_yfzjVerifyApproved" id="yfzjVerifyApproved" class="form-control m-b" required> |
||||
|
<option value=""></option> |
||||
|
<option value="true">同意</option> |
||||
|
<option value="false">拒绝</option> |
||||
|
</select> |
||||
|
</div> |
||||
|
</div> |
||||
|
<div class="form-group"> |
||||
|
<label class="col-sm-3 control-label">批注：</label> |
||||
|
<div class="col-sm-8"> |
||||
|
<textarea name="comment" class="form-control"></textarea> |
||||
|
</div> |
||||
|
</div> |
||||
|
</form> |
||||
|
<div class="container"> |
||||
|
<div class="form-row"> |
||||
|
<div class="btn-group-sm" id="toolbar" role="group"> |
||||
|
<span>请购物料信息</span> |
||||
|
</div> |
||||
|
</div> |
||||
|
<div class="row"> |
||||
|
<div class="col-sm-12 select-table table-striped"> |
||||
|
<table id="bootstrap-sub-table-requisitionChild"></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 + "system/requisitioning"; |
||||
|
var taskId = [[${taskId}]]; |
||||
|
var requisitioningCode = [[${formData.requisitioningCode}]]; |
||||
|
var materialTypeDatas = [[${@category.getChildByCode('materialType')}]]; |
||||
|
var auditStatusDatas = [[${@dict.getType('auditStatus')}]]; |
||||
|
var sysUnitClassDatas = [[${@dict.getType('sys_unit_class')}]]; |
||||
|
var processMethodDatas = [[${@dict.getType('processMethod')}]]; |
||||
|
var warehouseDeptDatas = [[${@dict.getType('warehouseDept')}]]; |
||||
|
$("#form-requisitioning-yfzj-audit").validate({focusCleanup: true}); |
||||
|
|
||||
|
$(function() { |
||||
|
var options = { |
||||
|
id:'bootstrap-sub-table-requisitionChild', |
||||
|
url: ctx + "system/requisitioningChild/list", |
||||
|
pagination: false, |
||||
|
showSearch: false, |
||||
|
showColumns: false, |
||||
|
sidePagination: "client", |
||||
|
queryParams: queryParams, |
||||
|
model: "请购物料信息", |
||||
|
columns: [ |
||||
|
{title: '物料索引id',field: 'materialId',align: 'center',visible: false}, |
||||
|
{title: '料号',field: 'materialCode',align: 'center'}, |
||||
|
{title: '物料名称',field: 'materialName',align: 'center'}, |
||||
|
{title: '图片',field: 'photoUrl', |
||||
|
formatter: function(value, row, index) { |
||||
|
return $.table.imageView(value); |
||||
|
} |
||||
|
}, |
||||
|
{title: '物料类型',field: 'materialType',align: 'center', |
||||
|
formatter: function(value, row, index) { |
||||
|
return $.table.selectCategoryLabel(materialTypeDatas, value); |
||||
|
} |
||||
|
}, |
||||
|
{ title: '描述',field: 'describe',align: 'center'}, |
||||
|
{title: '品牌',field: 'brand',align: 'center'}, |
||||
|
{ title: '单位',field: 'unit',align: 'center',}, |
||||
|
{title: '加工方式',field: 'processMethod',align: 'center', |
||||
|
formatter: function(value, row, index) { |
||||
|
return $.table.selectDictLabel(processMethodDatas, value); |
||||
|
} |
||||
|
}, |
||||
|
{title: '入库部门',field: 'warehouseDept',align: 'center', |
||||
|
formatter:function(value, row, index){ |
||||
|
return $.table.selectDictLabel(warehouseDeptDatas, value); |
||||
|
} |
||||
|
}, |
||||
|
{title: '物料的数量', field: 'materialNum',align: 'center',}, |
||||
|
{title: '预估单价(RMB)',field: 'materialRmb',align: 'center', |
||||
|
footerFormatter: function (value) { |
||||
|
var sum = 0; |
||||
|
for (var i in value) { |
||||
|
sum += parseFloat(value[i].materialRmb) || 0; |
||||
|
} |
||||
|
return "总预估单价: " + sum.toFixed(2); |
||||
|
} |
||||
|
}, |
||||
|
{title: '预估总价(RMB)',field: 'materialRmbSum',align: 'center', |
||||
|
footerFormatter: function (value) { |
||||
|
var sum = 0; |
||||
|
for (var i in value) { |
||||
|
sum += parseFloat(value[i].materialRmbSum) || 0; |
||||
|
} |
||||
|
return "总预估总价: " + sum.toFixed(2); |
||||
|
} |
||||
|
}, |
||||
|
{title: '物料的不含税单价(RMB)',field: 'materialNoRmb',align: 'center',visible: false}, |
||||
|
{title: '物料的不含税总价(RMB)',field: 'materialNoRmbSum',align: 'center',visible: false}, |
||||
|
{title: '录入人',field: 'createBy',align: 'center',visible: false}, |
||||
|
{title: '录入时间',field: 'createTime',align: 'center',visible: false }, |
||||
|
{title: '更新人',field: 'updateBy',align: 'center',visible: false}, |
||||
|
{title: '上次更新时间',field: 'updateTime',align: 'center',visible: false}, |
||||
|
{title: '备注',field: 'remark',align: 'center'}, |
||||
|
] |
||||
|
}; |
||||
|
$.table.init(options); |
||||
|
}); |
||||
|
function queryParams(params) { |
||||
|
var curParams = { |
||||
|
// 传递参数查询参数 |
||||
|
pageSize: params.limit, |
||||
|
pageNum: params.offset / params.limit + 1, |
||||
|
requisitioningCode: requisitioningCode |
||||
|
}; |
||||
|
return curParams; |
||||
|
} |
||||
|
function submitHandler() { |
||||
|
if ($.validate.form()) { |
||||
|
if ($('textarea[name="comment"]').val()) { |
||||
|
$('input[name="p_COM_comment"]').val($('textarea[name="comment"]').val()); |
||||
|
} |
||||
|
$.operate.save(prefix + "/complete/"+taskId, $('#form-requisitioning-yfzj-audit').serialize()); |
||||
|
} |
||||
|
} |
||||
|
|
||||
|
</script> |
||||
|
</body> |
||||
|
</html> |
||||
Loading…
Reference in new issue