diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/controller/SysMakeOrderController.java b/ruoyi-admin/src/main/java/com/ruoyi/system/controller/SysMakeOrderController.java index c15c513f..f09fcdab 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/system/controller/SysMakeOrderController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/system/controller/SysMakeOrderController.java @@ -422,4 +422,37 @@ public class SysMakeOrderController extends BaseController List list = sysMakeOrderService.selectAllMakeNos(); return list; } + + + /* + * 生产订单详情 + * */ + @GetMapping("/detail/{id}") + public String detail(@PathVariable("id") Long id , ModelMap mmap){ + mmap.put("currentUser", ShiroUtils.getSysUser()); + SysMakeOrder sysMakeOrder = sysMakeOrderService.selectSysMakeOrderById(id); + SysSalesOrder sysSalesOrder = salesOrderService.selectSysSalesOrderBySalesOrderCode(sysMakeOrder.getSaleNo()); + if(StringUtils.isNotNull(sysSalesOrder)){ + sysMakeOrder.setOrderType(sysSalesOrder.getSalesOrderType()); + sysMakeOrder.setSalesman(sysSalesOrder.getBusinessMembers()); + sysMakeOrder.setCustomerName(sysSalesOrder.getEnterpriseName()); + sysMakeOrder.setCustomerId(sysSalesOrder.getEnterpriseCode()); + sysMakeOrder.setCustomerOderCode(sysSalesOrder.getSalesOrderNumber()); + } + mmap.put("sysMakeOrder", sysMakeOrder); + return prefix + "/detail"; + } + + + /* + * 确定生产订单详情 + * */ + + @ResponseBody + @PostMapping("/detail") + public AjaxResult detailSave(SysMakeOrder sysMakeOrder){ + return AjaxResult.success("操作成功"); + } + + } diff --git a/ruoyi-admin/src/main/resources/templates/system/makeorder/detail.html b/ruoyi-admin/src/main/resources/templates/system/makeorder/detail.html new file mode 100644 index 00000000..d569b47e --- /dev/null +++ b/ruoyi-admin/src/main/resources/templates/system/makeorder/detail.html @@ -0,0 +1,502 @@ + + + + + + + +
+
+ +
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+ +
+
+
+
+
+ +
+
+ + + + + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/system/makeorder/makeorder.html b/ruoyi-admin/src/main/resources/templates/system/makeorder/makeorder.html index aa622b12..1c0c1582 100644 --- a/ruoyi-admin/src/main/resources/templates/system/makeorder/makeorder.html +++ b/ruoyi-admin/src/main/resources/templates/system/makeorder/makeorder.html @@ -101,6 +101,7 @@ var editFlag = [[${@permission.hasPermi('system:makeorder:edit')}]]; var removeFlag = [[${@permission.hasPermi('system:makeorder:remove')}]]; var cancelFlag = [[${@permission.hasPermi('system:makeorder:cancel')}]]; + var detailFlag = [[${@permission.hasPermi('system:makeorder:detail')}]]; var restoreFlag = [[${@permission.hasPermi('system:makeorder:restore')}]]; var makeStatusDatas = [[${@dict.getType('sys_erp_makeStatus')}]]; var eceiptStatusDatas = [[${@dict.getType('eceiptStatus')}]]; @@ -115,6 +116,7 @@ updateUrl: prefix + "/edit/{id}", removeUrl: prefix + "/remove", cancelUrl: prefix + "/cancel/{id}", + detailUrl: prefix + "/detail{id}", restoreUrl: prefix + "/restore/{id}", exportUrl: prefix + "/export", modalName: "生产订单", @@ -227,7 +229,9 @@ var actions = []; // actions.push('编辑 '); // actions.push('删除 '); - + //详情页面 工程审核为详情页面 + // actions.push('详情 '); + actions.push('详情 '); // 评审 if(row.makeStatus == '0'){ actions.push('评审 ');