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 930d5135..0c87980a 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
@@ -140,6 +140,12 @@ public class OrderMasterController extends BaseController {
         return "order/orderWorker";
     }
 
+    @GetMapping("/assignWholeOrder/{orderId}")
+    public String assignWholeOrder(@PathVariable("orderId") Long orderId, ModelMap mmap) {
+        mmap.put("orderId", orderId);
+        return "order/assignWholeOrder";
+    }
+
     @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
index 81651286..a47a366d 100644
--- a/ghy-admin/src/main/resources/templates/order/orderManager.html
+++ b/ghy-admin/src/main/resources/templates/order/orderManager.html
@@ -359,8 +359,35 @@
     }
 
     function showOrderWorker(id) {
-        var url = "order/master/orderWorker/" + id;
-        $.modal.open("指派师傅", url, '800', '500');
+        var url = "orderWorker/" + id;
+        layer.open({
+            type: 2,
+            area: ['800px', '450px'],
+            fix: false,
+            //不固定
+            maxmin: true,
+            shade: 0.3,
+            title: '指派师傅',
+            content: url,
+            // 弹层外区域关闭
+            shadeClose: true
+        });
+    }
+
+    function showAssignWholeOrder(id) {
+        var url = "assignWholeOrder/" + id;
+        layer.open({
+            type: 2,
+            area: ['800px', '450px'],
+            fix: false,
+            //不固定
+            maxmin: true,
+            shade: 0.3,
+            title: '指派师傅',
+            content: url,
+            // 弹层外区域关闭
+            shadeClose: true
+        });
     }
 
     function selectRegion(regionLevelName, nextRegionLevelName) {
@@ -452,7 +479,11 @@
                         var actions = [];
                         actions.push('<a class="btn btn-success btn-xs " href="javascript:void(0)" onclick="detail(\'' + row.id + '\')"><i class="fa fa-info"></i>查看</a> ');
                         actions.push('<a class="btn btn-success btn-xs " href="javascript:void(0)" onclick="orderMasterReject(\'' + row.orderMasterId + '\')"></i>商家退单</a> ');
-                        actions.push('<a class="btn btn-success btn-xs " href="javascript:void(0)" onclick="showOrderWorker(\'' + row.id + '\')"></i>指派</a> ');
+                        if (row.workerId != null) {
+                            actions.push('<a class="btn btn-success btn-xs " href="javascript:void(0)" onclick="showOrderWorker(\'' + row.id + '\')"></i>指派</a> ');
+                        } else {
+                            actions.push('<a class="btn btn-success btn-xs " href="javascript:void(0)" onclick="showAssignWholeOrder(\'' + row.id + '\')"></i>指派</a> ');
+                        }
                         if (row.payStatus == 0) {
                             actions.push('<a class="btn btn-success btn-xs " href="javascript:void(0)" onclick="showPayQrcode(\'' + row.id + '\')"></i>付款</a> ');
                         }