From 455b2bcaa32b668632e4870738983cf009d4dc1f Mon Sep 17 00:00:00 2001 From: liuxiaoxu <1793812695@qq.com> Date: Tue, 18 Jun 2024 15:07:07 +0800 Subject: [PATCH] =?UTF-8?q?[feat]=E7=94=9F=E4=BA=A7=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E7=AE=A1=E7=90=86:=20=E7=94=9F=E4=BA=A7=E8=AE=A2=E5=8D=95=20?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=94=9F=E4=BA=A7=E8=AE=A2=E5=8D=95=E8=AF=A6?= =?UTF-8?q?=E6=83=85=E9=A1=B5=E9=9D=A2detail.html=20=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E7=94=9F=E4=BA=A7=E8=AE=A2=E5=8D=95=E8=AF=A6=E6=83=85=E5=89=8D?= =?UTF-8?q?=E7=AB=AF=E6=8C=89=E9=92=AE=20=E6=96=B0=E5=A2=9E=E7=94=9F?= =?UTF-8?q?=E4=BA=A7=E8=AE=A2=E5=8D=95=E8=AF=A6=E6=83=85=E5=90=8E=E7=AB=AF?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/SysMakeOrderController.java | 33 ++ .../templates/system/makeorder/detail.html | 502 ++++++++++++++++++ .../templates/system/makeorder/makeorder.html | 6 +- 3 files changed, 540 insertions(+), 1 deletion(-) create mode 100644 ruoyi-admin/src/main/resources/templates/system/makeorder/detail.html 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('评审 ');