From b1a3773d72d0e632dc63ba539794b553faf7a294 Mon Sep 17 00:00:00 2001 From: zhangsiqi <2825463979@qq.com> Date: Thu, 30 May 2024 19:16:10 +0800 Subject: [PATCH] =?UTF-8?q?[feat]=E9=87=87=E8=B4=AD=E6=A8=A1=E5=9D=97:?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=87=87=E8=B4=AD=E8=AE=A1=E5=88=92=E4=BE=9B?= =?UTF-8?q?=E7=94=9F=E4=BA=A7=E9=87=87=E8=B4=AD=E5=8D=95=E6=8C=89=E9=92=AE?= =?UTF-8?q?=EF=BC=8C=E6=B7=BB=E5=8A=A0=E9=87=87=E8=B4=AD=E8=AE=A1=E5=88=92?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=87=87=E8=B4=AD=E5=8D=95=E6=8C=89=E9=92=AE?= =?UTF-8?q?=E3=80=82=E9=87=87=E8=B4=AD=E6=8C=89=E9=92=AE=E8=AE=A1=E5=88=92?= =?UTF-8?q?=E7=94=9F=E4=BA=A7=E9=A1=B5=E9=9D=A2=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/PurchasePlanController.java | 6 +- .../purchasePlan/addPurchaseOrder.html | 139 +++++++++++++++++- .../purchase/purchasePlan/purchasePlan.html | 13 +- 3 files changed, 146 insertions(+), 12 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/purchase/controller/PurchasePlanController.java b/ruoyi-admin/src/main/java/com/ruoyi/purchase/controller/PurchasePlanController.java index 901a95b0..f703350d 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/purchase/controller/PurchasePlanController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/purchase/controller/PurchasePlanController.java @@ -100,9 +100,9 @@ public class PurchasePlanController extends BaseController mmap.put("purchasePlan", purchasePlan); return prefix + "/edit"; } - @GetMapping("/addPurchaseOrder") - public String purChaseOrder(String planCode,ModelMap mmap){ - List purchasePlanList = purchasePlanService.selectPurchasePlanByPlanCode(planCode); + @GetMapping("/addPurchaseOrder/{purchasePlanCodes}") + public String purChaseOrder(@PathVariable("purchasePlanCodes") String purchasePlanCodes,ModelMap mmap){ + List purchasePlanList = purchasePlanService.selectPurchasePlanByPlanCode(purchasePlanCodes); mmap.put("purchasePlanList", purchasePlanList); return prefix + "/addPurchaseOrder"; } diff --git a/ruoyi-admin/src/main/resources/templates/purchase/purchasePlan/addPurchaseOrder.html b/ruoyi-admin/src/main/resources/templates/purchase/purchasePlan/addPurchaseOrder.html index d71b9189..f8566a78 100644 --- a/ruoyi-admin/src/main/resources/templates/purchase/purchasePlan/addPurchaseOrder.html +++ b/ruoyi-admin/src/main/resources/templates/purchase/purchasePlan/addPurchaseOrder.html @@ -6,30 +6,153 @@
-
+
-
- +
+
-
- -
- + +
+
公司收获地址:
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
-
\ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/purchase/purchasePlan/purchasePlan.html b/ruoyi-admin/src/main/resources/templates/purchase/purchasePlan/purchasePlan.html index 5bbf0d02..f6e2f0d7 100644 --- a/ruoyi-admin/src/main/resources/templates/purchase/purchasePlan/purchasePlan.html +++ b/ruoyi-admin/src/main/resources/templates/purchase/purchasePlan/purchasePlan.html @@ -159,8 +159,19 @@ ] }); }; + var purchasePlanCodes = ""; function addPurchaseOrder(){ - $.modal.open("新增采购订单", prefix + "/addPurchaseOrder"); + var selections = $("#bootstrap-table").bootstrapTable("getSelections"); + if(selections.length == 0){ + $.modal.alertWarning("请选择采购计划单"); + return; + }else{ + + for(var i=0;i