diff --git a/ruoyi-admin/src/main/java/com/ruoyi/purchase/controller/PurchaseOrderController.java b/ruoyi-admin/src/main/java/com/ruoyi/purchase/controller/PurchaseOrderController.java index 5c2ea0e2..213a1145 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/purchase/controller/PurchaseOrderController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/purchase/controller/PurchaseOrderController.java @@ -191,6 +191,9 @@ public class PurchaseOrderController extends BaseController + /** + * 打开采购订单详情页面 + */ @GetMapping("/detail/{purchaseOrderId}") public String detail(@PathVariable("purchaseOrderId") Long purchaseOrderChildId, ModelMap mmap) { @@ -200,6 +203,23 @@ public class PurchaseOrderController extends BaseController return prefix + "/detail"; } + + + /** + * 采购订单详情提交 + */ + @Log(title = "采购订单", businessType = BusinessType.INSERT) + @PostMapping("/detail") + @ResponseBody + public AjaxResult detailSave(PurchaseOrder purchaseOrder) { + + return toAjax(purchaseOrderService.detailSave(purchaseOrder)); + } + + + + + /** * 加载采购入库通知单弹窗 */ diff --git a/ruoyi-admin/src/main/java/com/ruoyi/purchase/service/IPurchaseOrderService.java b/ruoyi-admin/src/main/java/com/ruoyi/purchase/service/IPurchaseOrderService.java index 06bff188..16a70df5 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/purchase/service/IPurchaseOrderService.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/purchase/service/IPurchaseOrderService.java @@ -127,4 +127,6 @@ public interface IPurchaseOrderService * */ int addPurchaseStorageSave(PurchaseOrder purchaseOrder); + + int detailSave(PurchaseOrder purchaseOrder); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/purchase/service/impl/PurchaseOrderServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/purchase/service/impl/PurchaseOrderServiceImpl.java index 86cdf310..a5b54e49 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/purchase/service/impl/PurchaseOrderServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/purchase/service/impl/PurchaseOrderServiceImpl.java @@ -1403,6 +1403,16 @@ public class PurchaseOrderServiceImpl implements IPurchaseOrderService } } + + /** + * 提交采购订单详情 + * */ + @Override + public int detailSave(PurchaseOrder purchaseOrder) { + + return 1; + } + /** * 启动流程实例 * */ diff --git a/ruoyi-admin/src/main/resources/templates/purchase/purchaseOrder/detail.html b/ruoyi-admin/src/main/resources/templates/purchase/purchaseOrder/detail.html index 6a251343..6cd8ee1d 100644 --- a/ruoyi-admin/src/main/resources/templates/purchase/purchaseOrder/detail.html +++ b/ruoyi-admin/src/main/resources/templates/purchase/purchaseOrder/detail.html @@ -1,112 +1,105 @@ - + - - - - - +
-
-
- -
- -
-
-
- - -
-
-
+ -
+ + +
+
+
+

已选择采购计划单号：

-
-
+
-
+
+ +
+
- -
-

公司地址：

-
- -
- -
-
-
- -
- -
-
-
- -
- + + +
+
+
+

已选择供应商：

+
-
-
- -
- +
+ +
+ +
+ + +
+ +
-
- -
- + +
+
+
+

公司收货信息：

+
-
-
-
-

订单合计：

-
- -
- +
+ + +
+ +
+ +
+ +
-
-
- -
- + +
+ +
+ +
+ + +
+ +
+ + +
+ +
-
- -
- + + +
+
+
+

采购信息：

+
-
-
- -
- +
+
+
+
-
-
+ + + +
- - - + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/purchase/purchaseOrder/purchaseOrder.html b/ruoyi-admin/src/main/resources/templates/purchase/purchaseOrder/purchaseOrder.html index 41d3336a..da4cb084 100644 --- a/ruoyi-admin/src/main/resources/templates/purchase/purchaseOrder/purchaseOrder.html +++ b/ruoyi-admin/src/main/resources/templates/purchase/purchaseOrder/purchaseOrder.html @@ -270,8 +270,7 @@ actions.push(' 进度查看 '); } - - //actions.push('审核 '); + actions.push('详情 '); var actionLinks = actions.join(''); return $.table.dropdownToggle(actionLinks); } @@ -353,6 +352,13 @@ $.modal.open("入库通知", url); } + + //详情 + function detail(purchaseOrderId) { + var url = prefix + "/detail/" + purchaseOrderId; + $.modal.open("详情", url); + } + \ No newline at end of file