From 760a1ff87897bb231d6e5bf7b7d391ce98052171 Mon Sep 17 00:00:00 2001
From: zhangsiqi <2825463979@qq.com>
Date: Tue, 11 Jun 2024 19:50:36 +0800
Subject: [PATCH] =?UTF-8?q?[feat]=E7=94=9F=E4=BA=A7=E7=AE=A1=E7=90=86?=
=?UTF-8?q?=EF=BC=9A=E6=96=B0=E5=A2=9E=E5=B7=A5=E5=BA=8F=E6=98=8E=E7=BB=86?=
=?UTF-8?q?=E8=AF=A6=E6=83=85=E6=8C=89=E9=92=AE=E4=B8=8E=E8=AF=A6=E6=83=85?=
=?UTF-8?q?=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../system/SysProcedureController.java | 11 +-
.../templates/system/procedure/detail.html | 145 ++++++++++++++++++
.../templates/system/procedure/procedure.html | 113 +++++---------
3 files changed, 191 insertions(+), 78 deletions(-)
create mode 100644 ruoyi-admin/src/main/resources/templates/system/procedure/detail.html
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysProcedureController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysProcedureController.java
index 2d16a0e4..ad566769 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysProcedureController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysProcedureController.java
@@ -104,7 +104,16 @@ public class SysProcedureController extends BaseController
mmap.put("sysProcedure", sysProcedure);
return prefix + "/edit";
}
-
+ /**
+ * 生产加工工序明细详情
+ */
+ @GetMapping("/detail/{id}")
+ public String detail(@PathVariable("id") Long id, ModelMap mmap)
+ {
+ SysProcedure sysProcedure = sysProcedureService.selectSysProcedureById(id);
+ mmap.put("sysProcedure", sysProcedure);
+ return prefix + "/detail";
+ }
/**
* 修改保存生产加工工序明细
*/
diff --git a/ruoyi-admin/src/main/resources/templates/system/procedure/detail.html b/ruoyi-admin/src/main/resources/templates/system/procedure/detail.html
new file mode 100644
index 00000000..68bd7f74
--- /dev/null
+++ b/ruoyi-admin/src/main/resources/templates/system/procedure/detail.html
@@ -0,0 +1,145 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/ruoyi-admin/src/main/resources/templates/system/procedure/procedure.html b/ruoyi-admin/src/main/resources/templates/system/procedure/procedure.html
index 945e1d43..8ec79324 100644
--- a/ruoyi-admin/src/main/resources/templates/system/procedure/procedure.html
+++ b/ruoyi-admin/src/main/resources/templates/system/procedure/procedure.html
@@ -52,12 +52,12 @@
添加
-
- 修改
-
-
- 删除
-
+
+
+
+
+
+
@@ -73,7 +73,6 @@
var removeFlag = [[${@permission.hasPermi('system:procedure:remove')}]];
var prefix = ctx + "system/procedure";
var datas = [[${@dict.getType('sys_dept_type')}]];
-
$(function() {
var options = {
url: prefix + "/list",
@@ -81,78 +80,38 @@
updateUrl: prefix + "/edit/{id}",
removeUrl: prefix + "/remove",
exportUrl: prefix + "/export",
+ detailUrl: prefix + "/detail/{id}",
clickToSelect: true,
+ pageList: [10, 25, 50],
+ pageSize: 10,
+ showColumns: false,
+ fixedColumns: true, // 启用冻结列
+ fixedRightNumber: 1, // 冻结右列个数
+ height: $(window).height() - 100,
modalName: "生产加工工序明细",
- columns: [{
- checkbox: true
- },
- {
- title: '主键ID',
- field: 'id',
- visible: false
- },
- {
- field: 'procedureId',
- title: '工序id'
- },
- {
- field: 'procedureCode',
- title: '工序编号'
- },
- {
- field: 'produceEquipModel',
- title: '生产设备型号'
- },
- {
- field: 'workshopName',
- title: '车间名称',
- visible: false
- },
- {
- field: 'procedureName',
- title: '工序名称'
- },
- {
- field: 'sequence',
- title: '先后次序',
- sortable: true
- },
- {
- field: 'eachCost',
- title: '单间加工成本'
- },
- {
- field: 'procedureWorkhour',
- title: '加工工时'
- },
- {
- field: 'associatedItem',
- title: '核算数量关联项',
- visible: false
- },
- {
- field: 'procedureRemark',
- title: '工序备注'
- },
- {
- field: 'createTime',
- title: '录入时间'
- },
- {
- field: 'updateTime',
- title: '上次修改时间'
- }
-
- // {
- // title: '操作',
- // align: 'center',
- // formatter: function(value, row, index) {
- // var actions = [];
- // actions.push('编辑 ');
- // actions.push('删除');
- // return actions.join('');
- // }
- // }
+ columns: [
+ {checkbox: true},
+ {title: '主键ID',field: 'id', visible: false},
+ {field: 'procedureId', title: '工序id'},
+ {field: 'procedureCode',title: '工序编号'},
+ {field: 'produceEquipModel',title: '生产设备型号'},
+ {field: 'workshopName',title: '车间名称',visible: false},
+ {field: 'procedureName',title: '工序名称' },
+ {field: 'sequence',title: '先后次序',sortable: true},
+ {field: 'eachCost',title: '单间加工成本'},
+ {field: 'procedureWorkhour',title: '加工工时' },
+ {field: 'associatedItem',title: '核算数量关联项',visible: false},
+ {field: 'procedureRemark',title: '工序备注'},
+ {field: 'createTime',title: '录入时间'},
+ {field: 'updateTime', title: '上次修改时间'},
+ {title: '操作',align: 'center',formatter: function(value, row, index) {
+ var actions = [];
+ actions.push('编辑 ');
+ actions.push('详情 ');
+ actions.push('删除');
+ return actions.join('');
+ }
+ }
]
};
$.table.init(options);