diff --git a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderMasterController.java b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderMasterController.java index c2103bd5..930d5135 100644 --- a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderMasterController.java +++ b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderMasterController.java @@ -127,6 +127,19 @@ public class OrderMasterController extends BaseController { return "order/pc-master"; } + @GetMapping("/manager") + public String orderManager() { + return "order/orderManager"; + } + + @GetMapping("/orderWorker/{orderId}") + public String orderWorker(@PathVariable("orderId") Long orderId, ModelMap mmap) { + List workList = workerService.getWorkList(new Worker()); + mmap.put("orderId", orderId); + mmap.put("workers", workList); + return "order/orderWorker"; + } + @PostMapping("/app/list") @ResponseBody public TableDataInfo appList(@RequestBody OrderMaster orderMaster) { diff --git a/ghy-admin/src/main/resources/templates/order/orderManager.html b/ghy-admin/src/main/resources/templates/order/orderManager.html new file mode 100644 index 00000000..ef7edeef --- /dev/null +++ b/ghy-admin/src/main/resources/templates/order/orderManager.html @@ -0,0 +1,609 @@ + + + + + + + + + + + + +
+ +
+ + + + + + + + + +