root
/
smart-erp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

[feat] 

基础资料 员工领料单
修改员工领料列表显示结构；
新增添加员工领料页面申请人部门、岗位、姓名字段表单结构，修改表单提交方法；
修改详情页面表单显示结构，新增申请人部门、岗位、姓名字段；
新增编辑员工领料页面申请人部门、岗位、姓名字段表单结构，修改表单提交方法；
修改生产经理审批页面，新增字段显示；
修改生产主管审批页面，新增字段显示；
dev
王晓迪 7 months ago
parent
54e6c71e03
commit
d94e607172
6 changed files with 123 additions and 32 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 33
      ruoyi-admin/src/main/resources/templates/system/empRequisiteOrder/add.html
  2. 20
      ruoyi-admin/src/main/resources/templates/system/empRequisiteOrder/detail.html
  3. 20
      ruoyi-admin/src/main/resources/templates/system/empRequisiteOrder/edit.html
  4. 20
      ruoyi-admin/src/main/resources/templates/system/empRequisiteOrder/empRequisiteOrder.html
  5. 30
      ruoyi-admin/src/main/resources/templates/system/empRequisiteOrder/taskScjlVerify.html
  6. 30
      ruoyi-admin/src/main/resources/templates/system/empRequisiteOrder/taskSczgVerify.html

33
ruoyi-admin/src/main/resources/templates/system/empRequisiteOrder/add.html
View File

@ -8,10 +8,28 @@
<body class="white-bg"> <body class="white-bg">
<div class="wrapper wrapper-content animated fadeInRight ibox-content"> <div class="wrapper wrapper-content animated fadeInRight ibox-content">
<form class="form-horizontal m" id="form-empRequisiteOrder-add"> <form class="form-horizontal m" id="form-empRequisiteOrder-add">
<!-- <div class="form-group"> -->
<!-- <label class="col-sm-3 control-label">领料单编号：</label>-->
<!-- <div class="col-sm-8">-->
<!-- <input name="requisitieCode" class="form-control" type="text" readonly>-->
<!-- </div>-->
<!-- </div>-->
<div class="form-group"> <div class="form-group">
<label class="col-sm-3 control-label">领料单编号：</label> <label class="col-sm-3 control-label is-required">部门：</label>
<div class="col-sm-8"> <div class="col-sm-8">
<input name="requisitieCode" class="form-control" type="text" readonly> <select id="deptName" name="deptName" class="form-control" disabled required></select>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label" >岗位：</label>
<div class="col-sm-8">
<select id="postName" name="postName" class="form-control" disabled></select>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label is-required">姓名：</label>
<div class="col-sm-8">
<select id="userName" name="userName" class="form-control" disabled required></select>
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
@ -56,7 +74,7 @@
$("#form-empRequisiteOrder-add").validate({focusCleanup: true}); $("#form-empRequisiteOrder-add").validate({focusCleanup: true});
//获取子表信息 //获取子表信息
$(function() { $(function() {
getRequisitieCode(); // getRequisitieCode();
// selectSaleOrder(); // selectSaleOrder();
getSelections(); getSelections();
var options = { var options = {
@ -196,13 +214,16 @@
var baseEmpRequisiteOrderVO = {}; var baseEmpRequisiteOrderVO = {};
if ($.validate.form()) { if ($.validate.form()) {
var baseEmpRequisiteOrderChildList = []; var baseEmpRequisiteOrderChildList = [];
$("select[name='deptName']").removeAttr("disabled");
$("select[name='postName']").removeAttr("disabled");
// 获取表单数据 // 获取表单数据
const Data = $("#form-empRequisiteOrder-add").serializeArray().reduce((obj, item) => { const Data = $("#form-empRequisiteOrder-add").serializeArray().reduce((obj, item) => {
obj[item.name] = item.value; obj[item.name] = item.value;
return obj; return obj;
}, {}); }, {});
baseEmpRequisiteOrderVO = { baseEmpRequisiteOrderVO = {
requisitieCode: Data.requisitieCode, deptName: Data.deptName,
postName: Data.postName,
correlationCode: Data.correlationCode, correlationCode: Data.correlationCode,
remark: Data.remark, remark: Data.remark,
materialAmount: 0, materialAmount: 0,
@ -252,9 +273,9 @@
dataType: "json", dataType: "json",
success: function (data) { success: function (data) {
console.log(data); console.log(data);
$("select[name='dept']").append($('<option></option>').val(data.deptName).html(data.deptName)); $("select[name='deptName']").append($('<option></option>').val(data.deptName).html(data.deptName));
$("select[name='userName']").append($('<option></option>').val(data.userName).html(data.userName)); $("select[name='userName']").append($('<option></option>').val(data.userName).html(data.userName));
$("select[name='post']").append($('<option></option>').val(data.postName).html(data.postName)); $("select[name='postName']").append($('<option></option>').val(data.postName).html(data.postName));
// $select.trigger('change'); // $select.trigger('change');
} }
}); });

20
ruoyi-admin/src/main/resources/templates/system/empRequisiteOrder/detail.html
View File

@ -16,7 +16,25 @@
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="col-sm-3 control-label">关联销售订单号：</label> <label class="col-sm-3 control-label is-required">部门：</label>
<div class="col-sm-8">
<input id="deptName" name="deptName" th:field="*{deptName}" class="form-control" readonly required>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label" >岗位：</label>
<div class="col-sm-8">
<input id="postName" name="postName" th:field="*{postName}" class="form-control" readonly>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label is-required">姓名：</label>
<div class="col-sm-8">
<input id="applyUser" name="applyUser" th:field="*{applyUser}" class="form-control" readonly required>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">关联订单号：</label>
<div class="col-sm-8"> <div class="col-sm-8">
<input name="correlationCode" th:field="*{correlationCode}" class="form-control" type="text" readonly> <input name="correlationCode" th:field="*{correlationCode}" class="form-control" type="text" readonly>
</div> </div>

20
ruoyi-admin/src/main/resources/templates/system/empRequisiteOrder/edit.html
View File

@ -15,6 +15,24 @@
<input name="requisitieCode" th:field="*{requisitieCode}" class="form-control" type="text" readonly> <input name="requisitieCode" th:field="*{requisitieCode}" class="form-control" type="text" readonly>
</div> </div>
</div> </div>
<div class="form-group">
<label class="col-sm-3 control-label is-required">部门：</label>
<div class="col-sm-8">
<input id="deptName" name="deptName" th:field="*{deptName}" class="form-control" readonly required>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label" >岗位：</label>
<div class="col-sm-8">
<input id="postName" name="postName" th:field="*{postName}" class="form-control" readonly>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label is-required">姓名：</label>
<div class="col-sm-8">
<input id="applyUser" name="applyUser" th:field="*{applyUser}" class="form-control" readonly required>
</div>
</div>
<div class="form-group"> <div class="form-group">
<label class="col-sm-3 control-label">关联订单号：</label> <label class="col-sm-3 control-label">关联订单号：</label>
<div class="col-sm-8"> <div class="col-sm-8">
@ -200,6 +218,8 @@
baseEmpRequisiteOrderVO = { baseEmpRequisiteOrderVO = {
requisiteId: Data.requisiteId, requisiteId: Data.requisiteId,
requisitieCode: Data.requisitieCode, requisitieCode: Data.requisitieCode,
deptName: Data.deptName,
postName: Data.postName,
correlationCode: Data.correlationCode, correlationCode: Data.correlationCode,
remark: Data.remark, remark: Data.remark,
materialAmount: 0, materialAmount: 0,

20
ruoyi-admin/src/main/resources/templates/system/empRequisiteOrder/empRequisiteOrder.html
View File

@ -91,17 +91,19 @@
{title: '领料状态',field: 'requisitieStatus', {title: '领料状态',field: 'requisitieStatus',
formatter: function(value, row, index) {return $.table.selectDictLabel(requisitieStatusDatas, value);} formatter: function(value, row, index) {return $.table.selectDictLabel(requisitieStatusDatas, value);}
}, },
{title: '领料单编号',field: 'requisitieCode',}, {title: '领料单号',field: 'requisitieCode',},
{title: '领料人',field: 'createBy',}, {title: '领料员',field: 'createBy',},
{title: '关联销售订单号',field: 'correlationCode',}, {title: '关联订单号',field: 'correlationCode',},
{title: '物料合计',field: 'materialAmount', }, {title: '物料合计',field: 'materialAmount', },
{title: '数量总计',field: 'materialSum',}, {title: '数量总计',field: 'materialSum',},
{title: '不含税总价(RMB)',field: 'noRmbSum',}, {title: '不含税总价(RMB)',field: 'noRmbSum',visible: false},
{title: '含税总价(RMB)',field: 'rmbSum',}, {title: '含税总价(RMB)',field: 'rmbSum',visible: false},
{title: '申请人',field: 'applyUser',visible: false}, {title: '申请人',field: 'applyUser',visible: false},
{title: '录入时间',field: 'createTime',}, {title: '录入时间',field: 'createTime',},
{title: '更新人',field: 'updateBy',},
{title: '上次更新时间',field: 'updateTime',},
{title: '备注',field: 'remark'}, {title: '备注',field: 'remark'},
{title: '使用状态',field: 'useStatus', {title: '使用状态',field: 'useStatus',visible: false,
formatter: function(value, row, index) {return $.table.selectDictLabel(useStatusDatas, value);} formatter: function(value, row, index) {return $.table.selectDictLabel(useStatusDatas, value);}
}, },
{ {
@ -124,14 +126,8 @@
// 进度查看 // 进度查看
actions.push('<a class="btn btn-info btn-xs" href="javascript:void(0)" onclick="showProcessImgDialog(\'' + row.instanceId + '\')"><i class="fa fa-image"></i> 进度查看</a> '); actions.push('<a class="btn btn-info btn-xs" href="javascript:void(0)" onclick="showProcessImgDialog(\'' + row.instanceId + '\')"><i class="fa fa-image"></i> 进度查看</a> ');
} }
actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.requisiteId + '\')"><i class="fa fa-edit"></i>编辑</a> '); actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.requisiteId + '\')"><i class="fa fa-edit"></i>编辑</a> ');
actions.push('<a class="btn btn-primary btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.detail(\'' + row.requisiteId + '\')"><i class="fa fa-deatil"></i>详情</a> '); actions.push('<a class="btn btn-primary btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.detail(\'' + row.requisiteId + '\')"><i class="fa fa-deatil"></i>详情</a> ');
if(row.delFlag == '0'){
actions.push('<a class="btn btn-danger btn-xs ' + cancelFlag + '" href="javascript:void(0)" onclick="$.operate.cancel(\'' + row.id + '\')"><i class="fa fa-remove"></i>作废</a> ');
}else{
actions.push('<a class="btn btn-success btn-xs ' + restoreFlag + '" href="javascript:void(0)" onclick="$.operate.restore(\'' + row.id + '\')"><i class="fa fa-window-restore"></i>恢复</a> ');
}
return actions.join(''); return actions.join('');
} }
} }

30
ruoyi-admin/src/main/resources/templates/system/empRequisiteOrder/taskScjlVerify.html
View File

@ -17,19 +17,37 @@
<div class="form-group"> <div class="form-group">
<label class="col-sm-3 control-label">领料单编号：</label> <label class="col-sm-3 control-label">领料单编号：</label>
<div class="col-sm-8"> <div class="col-sm-8">
<input name="requisitieCode" th:field="*{requisitieCode}" class="form-control" type="text"> <input name="requisitieCode" th:field="*{requisitieCode}" class="form-control" type="text" readonly>
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="col-sm-3 control-label">关联销售订单号：</label> <label class="col-sm-3 control-label is-required">部门：</label>
<div class="col-sm-8"> <div class="col-sm-8">
<input name="correlationCode" th:field="*{correlationCode}" class="form-control" type="text"> <input id="deptName" name="deptName" th:field="*{deptName}" class="form-control" readonly required>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label" >岗位：</label>
<div class="col-sm-8">
<input id="postName" name="postName" th:field="*{postName}" class="form-control" readonly>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label is-required">姓名：</label>
<div class="col-sm-8">
<input id="applyUser" name="applyUser" th:field="*{applyUser}" class="form-control" readonly required>
</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" readonly>
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="col-sm-3 control-label">用途：</label> <label class="col-sm-3 control-label">用途：</label>
<div class="col-sm-8"> <div class="col-sm-8">
<input name="remark" th:field="*{remark}" class="form-control" type="text"> <input name="remark" th:field="*{remark}" class="form-control" type="text" readonly>
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
@ -119,7 +137,7 @@
return $.table.selectDictLabel(processMethodDatas, value); return $.table.selectDictLabel(processMethodDatas, value);
} }
}, },
{title: '物料的数量', field: 'materialNum',align: 'center',editable: true,}, {title: '物料的数量', field: 'materialNum',align: 'center',},
{title: '物料的不含税单价(RMB)',field: 'materialNoRmb',align: 'center',}, {title: '物料的不含税单价(RMB)',field: 'materialNoRmb',align: 'center',},
{title: '物料的含税单价(RMB)',field: 'materialRmb',align: 'center',}, {title: '物料的含税单价(RMB)',field: 'materialRmb',align: 'center',},
{title: '物料的含税总价(RMB)',field: 'materialNoRmbSum',align: 'center',}, {title: '物料的含税总价(RMB)',field: 'materialNoRmbSum',align: 'center',},
@ -128,7 +146,7 @@
{title: '录入时间',field: 'createTime',align: 'center',visible: false }, {title: '录入时间',field: 'createTime',align: 'center',visible: false },
{title: '更新人',field: 'updateBy',align: 'center',visible: false}, {title: '更新人',field: 'updateBy',align: 'center',visible: false},
{title: '上次更新时间',field: 'updateTime',align: 'center',visible: false}, {title: '上次更新时间',field: 'updateTime',align: 'center',visible: false},
{title: '备注',field: 'remark',align: 'center',editable: true}, {title: '备注',field: 'remark',align: 'center',},
], ],
onEditableSave:function(field, row, oldValue, $el){ onEditableSave:function(field, row, oldValue, $el){
row.materialNoRmbSum = Number(row.materialNum * Number(row.materialNoRmb)).toFixed(2); row.materialNoRmbSum = Number(row.materialNum * Number(row.materialNoRmb)).toFixed(2);

30
ruoyi-admin/src/main/resources/templates/system/empRequisiteOrder/taskSczgVerify.html
View File

@ -17,19 +17,37 @@
<div class="form-group"> <div class="form-group">
<label class="col-sm-3 control-label">领料单编号：</label> <label class="col-sm-3 control-label">领料单编号：</label>
<div class="col-sm-8"> <div class="col-sm-8">
<input name="requisitieCode" th:field="*{requisitieCode}" class="form-control" type="text"> <input name="requisitieCode" th:field="*{requisitieCode}" class="form-control" type="text" readonly>
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="col-sm-3 control-label">关联销售订单号：</label> <label class="col-sm-3 control-label is-required">部门：</label>
<div class="col-sm-8"> <div class="col-sm-8">
<input name="correlationCode" th:field="*{correlationCode}" class="form-control" type="text"> <input id="deptName" name="deptName" th:field="*{deptName}" class="form-control" readonly required>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label" >岗位：</label>
<div class="col-sm-8">
<input id="postName" name="postName" th:field="*{postName}" class="form-control" readonly>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label is-required">姓名：</label>
<div class="col-sm-8">
<input id="applyUser" name="applyUser" th:field="*{applyUser}" class="form-control" readonly required>
</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" readonly>
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="col-sm-3 control-label">用途：</label> <label class="col-sm-3 control-label">用途：</label>
<div class="col-sm-8"> <div class="col-sm-8">
<input name="remark" th:field="*{remark}" class="form-control" type="text"> <input name="remark" th:field="*{remark}" class="form-control" type="text" readonly>
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
@ -120,7 +138,7 @@
return $.table.selectDictLabel(processMethodDatas, value); return $.table.selectDictLabel(processMethodDatas, value);
} }
}, },
{title: '物料的数量', field: 'materialNum',align: 'center',editable: true,}, {title: '物料的数量', field: 'materialNum',align: 'center',},
{title: '物料的不含税单价(RMB)',field: 'materialNoRmb',align: 'center',}, {title: '物料的不含税单价(RMB)',field: 'materialNoRmb',align: 'center',},
{title: '物料的含税单价(RMB)',field: 'materialRmb',align: 'center',}, {title: '物料的含税单价(RMB)',field: 'materialRmb',align: 'center',},
{title: '物料的含税总价(RMB)',field: 'materialNoRmbSum',align: 'center',}, {title: '物料的含税总价(RMB)',field: 'materialNoRmbSum',align: 'center',},
@ -129,7 +147,7 @@
{title: '录入时间',field: 'createTime',align: 'center',visible: false }, {title: '录入时间',field: 'createTime',align: 'center',visible: false },
{title: '更新人',field: 'updateBy',align: 'center',visible: false}, {title: '更新人',field: 'updateBy',align: 'center',visible: false},
{title: '上次更新时间',field: 'updateTime',align: 'center',visible: false}, {title: '上次更新时间',field: 'updateTime',align: 'center',visible: false},
{title: '备注',field: 'remark',align: 'center',editable: true}, {title: '备注',field: 'remark',align: 'center',},
], ],
}; };
console.log(options.data); console.log(options.data);

Write Preview
Loading…
Cancel
Save