diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/controller/SysProcessCategoryController.java b/ruoyi-admin/src/main/java/com/ruoyi/system/controller/SysProcessCategoryController.java index b009b999..9b0b521e 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/system/controller/SysProcessCategoryController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/system/controller/SysProcessCategoryController.java @@ -96,7 +96,13 @@ public class SysProcessCategoryController extends BaseController mmap.put("sysProcessCategory", sysProcessCategory); return prefix + "/edit"; } - + @GetMapping("/detail/{id}") + public String detail(@PathVariable("id") Long id, ModelMap mmap) + { + SysProcessCategory sysProcessCategory = sysProcessCategoryService.selectSysProcessCategoryById(id); + mmap.put("sysProcessCategory", sysProcessCategory); + return prefix + "/detail"; + } /** * 修改保存制程类别明细 */ diff --git a/ruoyi-admin/src/main/resources/templates/system/processCategory/detail.html b/ruoyi-admin/src/main/resources/templates/system/processCategory/detail.html new file mode 100644 index 00000000..833c43eb --- /dev/null +++ b/ruoyi-admin/src/main/resources/templates/system/processCategory/detail.html @@ -0,0 +1,68 @@ + + + + + + +
+
+ +
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+
+ + + + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/system/processCategory/processCategory.html b/ruoyi-admin/src/main/resources/templates/system/processCategory/processCategory.html index 96f4a9b0..feaca21e 100644 --- a/ruoyi-admin/src/main/resources/templates/system/processCategory/processCategory.html +++ b/ruoyi-admin/src/main/resources/templates/system/processCategory/processCategory.html @@ -59,51 +59,35 @@ updateUrl: prefix + "/edit/{id}", removeUrl: prefix + "/remove", exportUrl: prefix + "/export", + detailUrl: prefix + "/detail/{id}", + 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: 'processCategoryId', - title: '制程类别id' - }, - { - field: 'processCategoryCode', - title: '制程类别编号' - }, - { - field: 'processCategoryName', - title: '制程类别名称' - }, - { - field: 'processDescription', - title: '制程描述' - }, - { - field: 'workHourOutput', - title: '工时产量' - }, - { - field: 'standardConversionCost', - title: '标准加工费' - }, - { - field: 'actualProcessingCost', - title: '财务实际加工费' - }, - { - field: 'createTime', - title: '录入时间' - }, - { - field: 'updateTime', - title: '上次修改时间' - }] + columns: [ + {checkbox: true}, + {title: '主键ID',field: 'id',visible: false}, + {field: 'processCategoryId',title: '制程类别id'}, + {field: 'processCategoryCode',title: '制程类别编号'}, + {field: 'processCategoryName',title: '制程类别名称'}, + {field: 'processDescription',title: '制程描述'}, + {field: 'workHourOutput',title: '工时产量'}, + {field: 'standardConversionCost',title: '标准加工费'}, + {field: 'actualProcessingCost',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); });