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