Browse Source
基础资料 员工领料单 修改mapper文件返回实体类字段，更新、插入记录的方法 修改员工领料新增、更新方法，修改查询领料信息方法，新增同时查询领料详情列表的功能； 修改添加员工领料单页面，新增审核相关内容； 修改员工领料单详情类，添加审核相关字段； 修改员工领料单详情mapper，新增按领料单号批量查询详情信息的方法； 修改员工领料后端接口，新增加载审核弹窗、完成任务的处理方法； 修改员工领料详情页，增加显示领料单关联子表信息的方法； [feat] 基础资料 员工领料单 新增员工领料VO实体类 新增委外领料委外经理、委外主管审核页面dev
15 changed files with 793 additions and 91 deletions
@ -0,0 +1,33 @@ |
|||||
|
package com.ruoyi.system.domain.Vo; |
||||
|
|
||||
|
import com.ruoyi.system.domain.BaseEmpRequisiteOrder; |
||||
|
import lombok.Data; |
||||
|
|
||||
|
import java.util.Date; |
||||
|
|
||||
|
@Data |
||||
|
public class BaseEmpRequisiteOrderVO extends BaseEmpRequisiteOrder { |
||||
|
|
||||
|
private static final long serialVersionUID = 1L; |
||||
|
/** 申请人姓名 */ |
||||
|
private String applyUserName; |
||||
|
/** 任务ID */ |
||||
|
private String taskId; |
||||
|
/** 任务名称 */ |
||||
|
private String taskName; |
||||
|
/** 办理时间 */ |
||||
|
private Date doneTime; |
||||
|
/** 创建人 */ |
||||
|
private String createUserName; |
||||
|
/** 流程实例状态 1 激活 2 挂起 */ |
||||
|
private String suspendState; |
||||
|
/** 待办用户id */ |
||||
|
private String todoUserId; |
||||
|
/** 流程实例类型名称 */ |
||||
|
private String instanceTypeName; |
||||
|
|
||||
|
/** |
||||
|
* 关键词 |
||||
|
*/ |
||||
|
private String keyword; |
||||
|
} |
||||
@ -0,0 +1,153 @@ |
|||||
|
<!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" /> |
||||
|
<th:block th:include="include :: summernote-css" /> |
||||
|
</head> |
||||
|
<body class="white-bg"> |
||||
|
<div class="wrapper wrapper-content animated fadeInRight ibox-content"> |
||||
|
<form class="form-horizontal m" id="form-empRequisition-scjl" th:object="${formData}"> |
||||
|
<input name="requisiteId" th:field="*{requisiteId}" 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="requisitieCode" th:field="*{requisitieCode}" 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="correlationCode" th:field="*{correlationCode}" 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="remark" th:field="*{remark}" class="form-control" type="text"> |
||||
|
</div> |
||||
|
</div> |
||||
|
<div class="form-group"> |
||||
|
<label class="col-sm-3 control-label is-required" for="scjlVerifyApproved">审批意见：</label> |
||||
|
<div class="col-sm-6"> |
||||
|
<select name="p_B_scjlVerifyApproved" id="scjlVerifyApproved" class="form-control" required> |
||||
|
<option value=""></option> |
||||
|
<option value="true">同意</option> |
||||
|
<option value="false">拒绝</option> |
||||
|
</select> |
||||
|
</div> |
||||
|
</div> |
||||
|
<div class="form-group"> |
||||
|
<label class="col-sm-6 control-label">批注：</label> |
||||
|
<div class="col-sm-6"> |
||||
|
<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-empRequisitionChild"></table> |
||||
|
</div> |
||||
|
</div> |
||||
|
</div> |
||||
|
</div> |
||||
|
<th:block th:include="include :: footer" /> |
||||
|
<th:block th:include="include :: datetimepicker-js" /> |
||||
|
<th:block th:include="include :: bootstrap-table-editable-js" /> |
||||
|
<th:block th:include="include :: summernote-js" /> |
||||
|
<script th:src="@{/js/activiti.js}"></script> |
||||
|
<script th:inline="javascript"> |
||||
|
var prefix = ctx + "system/empRequisiteOrder"; |
||||
|
var materialTypeDatas = [[${@category.getChildByCode('materialType')}]]; |
||||
|
var auditStatusDatas = [[${@dict.getType('auditStatus')}]]; |
||||
|
var sysUnitClassDatas = [[${@dict.getType('sys_unit_class')}]]; |
||||
|
var processMethodDatas = [[${@dict.getType('processMethod')}]]; |
||||
|
$("#form-empRequisition-scjl").validate({ |
||||
|
focusCleanup: true |
||||
|
}); |
||||
|
//获取子表信息 |
||||
|
$(function() { |
||||
|
var options = { |
||||
|
id:'bootstrap-sub-table-empRequisitionChild', |
||||
|
pagination: false, |
||||
|
sidePagination: "client", |
||||
|
model: "物料报价信息", |
||||
|
data: [[${formData.baseEmpRequisiteOrderChildList}]], |
||||
|
columns: [ |
||||
|
{checkbox: true}, |
||||
|
{field: 'index',align: 'center', title: "序号", |
||||
|
formatter: function (value, row, index) { |
||||
|
var columnIndex = $.common.sprintf("<input type='hidden' name='index' value='%s'>", $.table.serialNumber(index)); |
||||
|
return columnIndex + $.table.serialNumber(index); |
||||
|
} |
||||
|
}, |
||||
|
{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: 'materialModel',align: 'center'}, |
||||
|
{title: '规格',field: 'specification',align: 'center'}, |
||||
|
{ title: '描述',field: 'describe',align: 'center'}, |
||||
|
{title: '品牌',field: 'brand',align: 'center'}, |
||||
|
{ title: '单位',field: 'unit',align: 'center', |
||||
|
formatter: function(value, row, index) { |
||||
|
return $.table.selectDictLabel(sysUnitClassDatas, value); |
||||
|
} |
||||
|
}, |
||||
|
{title: '半成品类型',field: 'processMethod',align: 'center', |
||||
|
formatter: function(value, row, index) { |
||||
|
return $.table.selectDictLabel(processMethodDatas, value); |
||||
|
} |
||||
|
}, |
||||
|
{title: '物料的数量', field: 'materialNum',align: 'center',editable: true,}, |
||||
|
{title: '物料的不含税单价(RMB)',field: 'materialNoRmb',align: 'center',}, |
||||
|
{title: '物料的含税单价(RMB)',field: 'materialRmb',align: 'center',}, |
||||
|
{title: '物料的含税总价(RMB)',field: 'materialNoRmbSum',align: 'center',}, |
||||
|
{title: '物料的不含税总价(RMB)',field: 'materialRmbSum',align: 'center',}, |
||||
|
{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',editable: true}, |
||||
|
], |
||||
|
onEditableSave:function(field, row, oldValue, $el){ |
||||
|
row.materialNoRmbSum = Number(row.materialNum * Number(row.materialNoRmb)).toFixed(2); |
||||
|
row.materialRmbSum = Number(row.materialRmb * row.materialNum).toFixed(2); |
||||
|
}, |
||||
|
}; |
||||
|
$.table.init(options); |
||||
|
}); |
||||
|
function submitHandler() { |
||||
|
|
||||
|
if ($.validate.form()) { |
||||
|
if ($('textarea[name="comment"]').val()) { |
||||
|
$('input[name="p_COM_comment"]').val($('textarea[name="comment"]').val()); |
||||
|
} |
||||
|
var taskId = [[${taskId}]]; |
||||
|
$.operate.save(prefix + "/complete/" + taskId, $('#form-empRequisition-scjl').serialize()); |
||||
|
} |
||||
|
} |
||||
|
|
||||
|
</script> |
||||
|
</body> |
||||
|
</html> |
||||
@ -0,0 +1,151 @@ |
|||||
|
<!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" /> |
||||
|
<th:block th:include="include :: summernote-css" /> |
||||
|
</head> |
||||
|
<body class="white-bg"> |
||||
|
<div class="wrapper wrapper-content animated fadeInRight ibox-content"> |
||||
|
<form class="form-horizontal m" id="form-empRequisition-sczg" th:object="${formData}"> |
||||
|
<input name="requisiteId" th:field="*{requisiteId}" 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="requisitieCode" th:field="*{requisitieCode}" 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="correlationCode" th:field="*{correlationCode}" 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="remark" th:field="*{remark}" class="form-control" type="text"> |
||||
|
</div> |
||||
|
</div> |
||||
|
<div class="form-group"> |
||||
|
<label class="col-sm-3 control-label is-required" for="sczgVerifyApproved">审批意见：</label> |
||||
|
<div class="col-sm-6"> |
||||
|
<select name="p_B_sczgVerifyApproved" id="sczgVerifyApproved" class="form-control" required> |
||||
|
<option value=""></option> |
||||
|
<option value="true">同意</option> |
||||
|
<option value="false">拒绝</option> |
||||
|
</select> |
||||
|
</div> |
||||
|
</div> |
||||
|
<div class="form-group"> |
||||
|
<label class="col-sm-6 control-label">批注：</label> |
||||
|
<div class="col-sm-6"> |
||||
|
<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-empRequisitionChild"></table> |
||||
|
</div> |
||||
|
</div> |
||||
|
</div> |
||||
|
</div> |
||||
|
<th:block th:include="include :: footer" /> |
||||
|
<th:block th:include="include :: select2-js" /> |
||||
|
<th:block th:include="include :: bootstrap-table-editable-js" /> |
||||
|
<th:block th:include="include :: datetimepicker-js" /> |
||||
|
<th:block th:include="include :: summernote-js" /> |
||||
|
<script th:src="@{/js/activiti.js}"></script> |
||||
|
<script th:inline="javascript"> |
||||
|
var prefix = ctx + "system/empRequisiteOrder"; |
||||
|
var materialTypeDatas = [[${@category.getChildByCode('materialType')}]]; |
||||
|
var auditStatusDatas = [[${@dict.getType('auditStatus')}]]; |
||||
|
var sysUnitClassDatas = [[${@dict.getType('sys_unit_class')}]]; |
||||
|
var processMethodDatas = [[${@dict.getType('processMethod')}]]; |
||||
|
$("#form-empRequisition-sczg").validate({ |
||||
|
focusCleanup: true |
||||
|
}); |
||||
|
//获取子表信息 |
||||
|
$(function() { |
||||
|
var options = { |
||||
|
id:'bootstrap-sub-table-empRequisitionChild', |
||||
|
pagination: false, |
||||
|
sidePagination: "client", |
||||
|
model: "物料报价信息", |
||||
|
data: [[${formData.baseEmpRequisiteOrderChildList}]], |
||||
|
columns: [ |
||||
|
{checkbox: true}, |
||||
|
{field: 'index',align: 'center', title: "序号", |
||||
|
formatter: function (value, row, index) { |
||||
|
var columnIndex = $.common.sprintf("<input type='hidden' name='index' value='%s'>", $.table.serialNumber(index)); |
||||
|
return columnIndex + $.table.serialNumber(index); |
||||
|
} |
||||
|
}, |
||||
|
{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: 'materialModel',align: 'center'}, |
||||
|
{title: '规格',field: 'specification',align: 'center'}, |
||||
|
{ title: '描述',field: 'describe',align: 'center'}, |
||||
|
{title: '品牌',field: 'brand',align: 'center'}, |
||||
|
{ title: '单位',field: 'unit',align: 'center', |
||||
|
formatter: function(value, row, index) { |
||||
|
return $.table.selectDictLabel(sysUnitClassDatas, value); |
||||
|
} |
||||
|
}, |
||||
|
{title: '半成品类型',field: 'processMethod',align: 'center', |
||||
|
formatter: function(value, row, index) { |
||||
|
return $.table.selectDictLabel(processMethodDatas, value); |
||||
|
} |
||||
|
}, |
||||
|
{title: '物料的数量', field: 'materialNum',align: 'center',editable: true,}, |
||||
|
{title: '物料的不含税单价(RMB)',field: 'materialNoRmb',align: 'center',}, |
||||
|
{title: '物料的含税单价(RMB)',field: 'materialRmb',align: 'center',}, |
||||
|
{title: '物料的含税总价(RMB)',field: 'materialNoRmbSum',align: 'center',}, |
||||
|
{title: '物料的不含税总价(RMB)',field: 'materialRmbSum',align: 'center',}, |
||||
|
{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',editable: true}, |
||||
|
], |
||||
|
}; |
||||
|
console.log(options.data); |
||||
|
$.table.init(options); |
||||
|
}); |
||||
|
function submitHandler() { |
||||
|
|
||||
|
if ($.validate.form()) { |
||||
|
if ($('textarea[name="comment"]').val()) { |
||||
|
$('input[name="p_COM_comment"]').val($('textarea[name="comment"]').val()); |
||||
|
} |
||||
|
var taskId = [[${taskId}]]; |
||||
|
$.operate.save(prefix + "/complete/" + taskId, $('#form-empRequisition-sczg').serialize()); |
||||
|
} |
||||
|
} |
||||
|
|
||||
|
</script> |
||||
|
</body> |
||||
|
</html> |
||||
Loading…
Reference in new issue