Browse Source
基础资料 出差单 修改出差单列表页面，去除申请人列样式，设置列居中，新增行样式； 修改新增、详情页面表单显示效果，去除或补充字段； 新增出差单vo类，新增当前状态字段； 修改出差单列表查询controller方法； 修改出差的列表查询service方法，添加角色限制，修改按角色设置节点变量方法； 修改出差经理审批页面字段显示； 新增人事录入页面、研发总监审批页面；dev
10 changed files with 599 additions and 200 deletions
@ -0,0 +1,182 @@ |
|||||
|
<!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-baseEvectionForm-add"> |
||||
|
<input name="evectionId" th:field="*{evectionId}" type="hidden"> |
||||
|
<div class="form-group" hidden="hidden"> |
||||
|
<label class="col-sm-3 control-label">出差单编号：</label> |
||||
|
<div class="col-sm-8"> |
||||
|
<input name="evectionCode" th:field="*{evectionCode}" 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"> |
||||
|
<input readonly name="deptName" th:field="*{deptName}" class="form-control"></input> |
||||
|
</div> |
||||
|
</div> |
||||
|
<div class="form-group"> |
||||
|
<label class="col-sm-3 control-label">岗位：</label> |
||||
|
<div class="col-sm-8"> |
||||
|
<input readonly name="postName" th:field="*{postName}" class="form-control"></input> |
||||
|
</div> |
||||
|
</div> |
||||
|
<div class="form-group"> |
||||
|
<label class="col-sm-3 control-label">出差人：</label> |
||||
|
<div class="col-sm-8"> |
||||
|
<input readonly name="evectionBy" th:field="*{evectionBy}" class="form-control"></input> |
||||
|
</div> |
||||
|
</div> |
||||
|
<div class="form-group"> |
||||
|
<label class="col-sm-3 control-label">同行人：</label> |
||||
|
<div class="col-sm-8"> |
||||
|
<input name="partnerBy" th:field="*{partnerBy}" 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"> |
||||
|
<input name="evectionAddr" th:field="*{evectionAddr}" 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"> |
||||
|
<input name="evectionDetailAddr" th:field="*{evectionDetailAddr}" 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"> |
||||
|
<input name="evectionCauses" th:field="*{evectionCauses}" 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"> |
||||
|
<input disabled name="evectionBeginTime" th:field="*{evectionBeginTime}" class="form-control" placeholder="yyyy-MM-dd" type="text" readonly> |
||||
|
<span class="input-group-addon"><i class="fa fa-calendar"></i></span> |
||||
|
<span class="input-group-addon">-</span> |
||||
|
<input disabled name="evectionEndTime" th:field="*{evectionEndTime}" class="form-control" placeholder="yyyy-MM-dd" type="text" readonly> |
||||
|
<span class="input-group-addon"><i class="fa fa-calendar"></i></span> |
||||
|
</div> |
||||
|
</div> |
||||
|
</div> |
||||
|
<div class="form-group"> |
||||
|
<label class="col-sm-3 control-label">派工单号：</label> |
||||
|
<div class="col-sm-8"> |
||||
|
<input name="dispatchlistCode" th:field="*{dispatchlistCode}" 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"> |
||||
|
<input name="makeCode" th:field="*{makeCode}" class="form-control" type="text" readonly> |
||||
|
</div> |
||||
|
</div> |
||||
|
|
||||
|
<div class="col-xs-12"> |
||||
|
<div class="hr-line-dashed" style="height: 10px;border-top: 1px dashed #ddd;margin-top: 10px; /* 调整间距 */border-bottom: 1px dashed #ddd;margin-bottom: 10px;"></div> |
||||
|
</div> |
||||
|
<div class="form-group"> |
||||
|
<h3 class="col-sm-3 control-label">人事行政</h3> |
||||
|
</div> |
||||
|
<div class="form-group"> |
||||
|
</div> |
||||
|
<div class="form-group"> |
||||
|
<label class="col-sm-3 control-label">出行方式：</label> |
||||
|
<div class="col-sm-8"> |
||||
|
<input name="travelMode" 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="hotel" 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="transportationCostBudget" 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="accommodationBudget" 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="otherExpensesBudget" class="form-control" type="text"> |
||||
|
</div> |
||||
|
</div> |
||||
|
<div class="form-group"> |
||||
|
<label class="col-sm-3 control-label">实际出差时间：</label> |
||||
|
<div class="col-sm-8"> |
||||
|
<div class="input-group date"> |
||||
|
<input name="realityEvenctionBeginTime" class="form-control" placeholder="yyyy-MM-dd" type="text"> |
||||
|
<span class="input-group-addon"><i class="fa fa-calendar"></i></span> |
||||
|
<span class="input-group-addon">-</span> |
||||
|
<input name="realityEvectionEndTime" class="form-control" placeholder="yyyy-MM-dd" type="text"> |
||||
|
<span class="input-group-addon"><i class="fa fa-calendar"></i></span> |
||||
|
</div> |
||||
|
</div> |
||||
|
</div> |
||||
|
</form> |
||||
|
</div> |
||||
|
<th:block th:include="include :: footer" /> |
||||
|
<th:block th:include="include :: datetimepicker-js" /> |
||||
|
<script th:inline="javascript"> |
||||
|
var prefix = ctx + "system/baseEvectionForm" |
||||
|
$("#form-baseEvectionForm-add").validate({focusCleanup: true}); |
||||
|
$(function() { |
||||
|
getSelections(); |
||||
|
}); |
||||
|
|
||||
|
function submitHandler() { |
||||
|
if ($.validate.form()) { |
||||
|
$.operate.save(prefix + "/add", $('#form-baseEvectionForm-add').serialize()); |
||||
|
} |
||||
|
} |
||||
|
|
||||
|
$("input[name='evectionBeginTime']").datetimepicker({ |
||||
|
format: "yyyy-mm-dd", |
||||
|
minView: "month", |
||||
|
autoclose: true |
||||
|
}); |
||||
|
$("input[name='evectionEndTime']").datetimepicker({ |
||||
|
format: "yyyy-mm-dd", |
||||
|
minView: "month", |
||||
|
autoclose: true |
||||
|
}); |
||||
|
|
||||
|
$("input[name='realityEvenctionTime']").datetimepicker({ |
||||
|
format: "yyyy-mm-dd", |
||||
|
minView: "month", |
||||
|
autoclose: true |
||||
|
}); |
||||
|
function getSelections(){ |
||||
|
$.ajax({ |
||||
|
url: ctx + "system/requisitioning/getEmpUserName", |
||||
|
type: "get", |
||||
|
dataType: "json", |
||||
|
success: function (data) { |
||||
|
$("select[name='deptName']").append($('<option></option>').val(data.deptName).html(data.deptName)); |
||||
|
$("select[name='evectionBy']").append($('<option></option>').val(data.userName).html(data.userName)); |
||||
|
$("select[name='postName']").append($('<option></option>').val(data.postName).html(data.postName)); |
||||
|
} |
||||
|
}); |
||||
|
|
||||
|
} |
||||
|
</script> |
||||
|
</body> |
||||
|
</html> |
||||
@ -0,0 +1,134 @@ |
|||||
|
<!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-baseEvectionForm-yfzj" th:object="${formData}"> |
||||
|
<input name="evectionId" th:field="*{evectionId}" 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"> |
||||
|
<div class="form-group" hidden="hidden"> |
||||
|
<label class="col-sm-3 control-label">出差单编号：</label> |
||||
|
<div class="col-sm-8"> |
||||
|
<input name="evectionCode" th:field="*{evectionCode}" class="form-control" type="text"> |
||||
|
</div> |
||||
|
</div> |
||||
|
<div class="form-group"> |
||||
|
<label class="col-sm-3 control-label">部门：</label> |
||||
|
<div class="col-sm-8"> |
||||
|
<select name="deptName" th:field="*{deptName}" class="form-control"></select> |
||||
|
</div> |
||||
|
</div> |
||||
|
<div class="form-group"> |
||||
|
<label class="col-sm-3 control-label">岗位：</label> |
||||
|
<div class="col-sm-8"> |
||||
|
<select name="postName" th:field="*{postName}" class="form-control"></select> |
||||
|
</div> |
||||
|
</div> |
||||
|
<div class="form-group"> |
||||
|
<label class="col-sm-3 control-label">出差人：</label> |
||||
|
<div class="col-sm-8"> |
||||
|
<select name="evectionBy" th:field="*{evectionBy}" class="form-control"></select> |
||||
|
</div> |
||||
|
</div> |
||||
|
<div class="form-group"> |
||||
|
<label class="col-sm-3 control-label">同行人：</label> |
||||
|
<div class="col-sm-8"> |
||||
|
<input name="partnerBy" th:field="*{partnerBy}" 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="evectionAddr" th:field="*{evectionAddr}" 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="evectionDetailAddr" th:field="*{evectionDetailAddr}" 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="evectionCauses" th:field="*{evectionCauses}" class="form-control" type="text"> |
||||
|
</div> |
||||
|
</div> |
||||
|
<div class="form-group"> |
||||
|
<label class="col-sm-3 control-label">出差时间：</label> |
||||
|
<div class="col-sm-8"> |
||||
|
<div class="input-group date"> |
||||
|
<input name="evectionBeginTime" class="form-control" placeholder="yyyy-MM-dd" type="text"> |
||||
|
<span class="input-group-addon"><i class="fa fa-calendar"></i></span> |
||||
|
<span class="input-group-addon">-</span> |
||||
|
<input name="evectionEndTime" class="form-control" placeholder="yyyy-MM-dd" type="text"> |
||||
|
<span class="input-group-addon"><i class="fa fa-calendar"></i></span> |
||||
|
</div> |
||||
|
</div> |
||||
|
</div> |
||||
|
<div class="form-group"> |
||||
|
<label class="col-sm-3 control-label">派工单号：</label> |
||||
|
<div class="col-sm-8"> |
||||
|
<input name="dispatchlistCode" th:field="*{dispatchlistCode}" 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="makeCode" th:field="*{makeCode}" class="form-control" type="text"> |
||||
|
</div> |
||||
|
</div> |
||||
|
<div class="form-group"> |
||||
|
<label class="col-sm-3 control-label is-required" for="yfzjVerifyApproved">审批意见：</label> |
||||
|
<div class="col-sm-6"> |
||||
|
<select name="p_B_yfzjVerifyApproved" id="yfzjVerifyApproved" class="form-control" required> |
||||
|
<option value=""></option> |
||||
|
<option value="true">同意</option> |
||||
|
<option value="false">拒绝</option> |
||||
|
</select> |
||||
|
</div> |
||||
|
</div> |
||||
|
</form> |
||||
|
</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 taskId = [[${taskId}]]; |
||||
|
var prefix = ctx + "system/baseEvectionForm"; |
||||
|
$("#form-baseEvectionForm-yfzj").validate({focusCleanup: true}); |
||||
|
|
||||
|
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-baseEvectionForm-yfzj').serialize()); |
||||
|
} |
||||
|
} |
||||
|
|
||||
|
$("input[name='evectionBeginTime']").datetimepicker({ |
||||
|
format: "yyyy-mm-dd", |
||||
|
minView: "month", |
||||
|
autoclose: true |
||||
|
}); |
||||
|
$("input[name='evectionEndTime']").datetimepicker({ |
||||
|
format: "yyyy-mm-dd", |
||||
|
minView: "month", |
||||
|
autoclose: true |
||||
|
}); |
||||
|
|
||||
|
$("input[name='realityeEvenctionTime']").datetimepicker({ |
||||
|
format: "yyyy-mm-dd", |
||||
|
minView: "month", |
||||
|
autoclose: true |
||||
|
}); |
||||
|
</script> |
||||
|
</body> |
||||
|
</html> |
||||
Loading…
Reference in new issue