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

[feat]品质管理: 

制程工序
新增制程工序详情按钮
新增制程工序详情页面
dev
liuxiaoxu 6 months ago
parent
7790c61805
commit
926d64fc0e
3 changed files with 95 additions and 2 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. 11
      ruoyi-admin/src/main/java/com/ruoyi/quality/controller/QualityManufacturingProcessController.java
  2. 82
      ruoyi-admin/src/main/resources/templates/quality/manufacturingProcess/detail.html
  3. 4
      ruoyi-admin/src/main/resources/templates/quality/manufacturingProcess/manufacturingProcess.html

11
ruoyi-admin/src/main/java/com/ruoyi/quality/controller/QualityManufacturingProcessController.java
View File

@ -112,6 +112,17 @@ public class QualityManufacturingProcessController extends BaseController
return toAjax(qualityManufacturingProcessService.updateQualityManufacturingProcess(qualityManufacturingProcess)); return toAjax(qualityManufacturingProcessService.updateQualityManufacturingProcess(qualityManufacturingProcess));
} }
/**
* 品质管理制程工序详情
*/
@GetMapping("/detail/{manufacturingProcessAutoid}")
public String detail(@PathVariable("manufacturingProcessAutoid") Long manufacturingProcessAutoid, ModelMap mmap)
{
QualityManufacturingProcess qualityManufacturingProcess = qualityManufacturingProcessService.selectQualityManufacturingProcessById(manufacturingProcessAutoid);
mmap.put("qualityManufacturingProcess", qualityManufacturingProcess);
return prefix + "/detail";
}
/** /**
* 删除品质管理制程工序 * 删除品质管理制程工序
*/ */

82
ruoyi-admin/src/main/resources/templates/quality/manufacturingProcess/detail.html
View File

@ -0,0 +1,82 @@
<!DOCTYPE html>
<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
<head>
<th:block th:include="include :: header('修改品质管理制程工序')" />
</head>
<body class="white-bg">
<div class="wrapper wrapper-content animated fadeInRight ibox-content">
<form class="form-horizontal m" id="form-manufacturingProcess-edit" th:object="${qualityManufacturingProcess}">
<input name="manufacturingProcessAutoid" th:field="*{manufacturingProcessAutoid}" type="hidden">
<div class="form-group">
<label class="col-sm-3 control-label">制程工序编号：</label>
<div class="col-sm-8">
<input name="manufacturingProcessCode" th:field="*{manufacturingProcessCode}" 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">
<select name="manufacturingProcessName" class="form-control m-b" th:with="type=${@dict.getType('manufacturing_process_name')}" readonly disabled>
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{manufacturingProcessName}"></option>
</select>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">设备名称：</label>
<div class="col-sm-8">
<input name="deviceName" th:field="*{deviceName}" 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="deviceModelCode" th:field="*{deviceModelCode}" 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="processSequence" th:field="*{processSequence}" 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="workshopName" th:field="*{workshopName}" 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="modName" th:field="*{modName}" 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="processInspectionItem" th:field="*{processInspectionItem}" 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="remark" th:field="*{remark}" class="form-control" type="text" readonly>
</div>
</div>
</form>
</div>
<th:block th:include="include :: footer" />
<script th:inline="javascript">
var prefix = ctx + "quality/manufacturingProcess";
$("#form-manufacturingProcess-edit").validate({
focusCleanup: true
});
function submitHandler() {
if ($.validate.form()) {
$.operate.save(prefix + "/edit", $('#form-manufacturingProcess-edit').serialize());
}
}
</script>
</body>
</html>

4
ruoyi-admin/src/main/resources/templates/quality/manufacturingProcess/manufacturingProcess.html
View File

@ -149,7 +149,7 @@
formatter: function(value, row, index) { formatter: function(value, row, index) {
var actions = []; var actions = [];
actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.manufacturingProcessAutoid + '\')"><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.manufacturingProcessAutoid + '\')"><i class="fa fa-edit"></i>编辑</a> ');
actions.push('<a class="btn btn-success btn-xs ' + detailFlag + '" href="javascript:void(0)" onclick="detail(\'' + row.manufacturingProcessAutoid + '\')"><i class="fa fa-edit"></i>编辑</a> '); actions.push('<a class="btn btn-success btn-xs ' + detailFlag + '" href="javascript:void(0)" onclick="detail(\'' + row.manufacturingProcessAutoid + '\')"><i class="fa fa-edit"></i>详情</a> ');
return actions.join(''); return actions.join('');
} }
}] }]
@ -158,7 +158,7 @@
}); });
// 详情页面 // 详情页面
function detail(manufacturingProcessAutoid){ function detail(manufacturingProcessAutoid){
var url = ctx+'quality/manufacturingProcess/detail'+manufacturingProcessAutoid; var url = ctx+'quality/manufacturingProcess/detail/'+manufacturingProcessAutoid;
$.modal.open("制程工序详情",url); $.modal.open("制程工序详情",url);
} }
</script> </script>

Write Preview
Loading…
Cancel
Save