From 1264052f30da83a8b0c1820da3747bd3be462a02 Mon Sep 17 00:00:00 2001
From: "kuang.yife" <clunt@vip.163.com>
Date: Wed, 11 Oct 2023 09:37:32 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=BB=E5=8D=95=E6=B4=BE=E5=8D=95=E4=BD=8D?=
 =?UTF-8?q?=E7=BD=AE=E8=BF=81=E7=A7=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../templates/order/orderManager.html         | 26 ++++++++++++++++++-
 .../resources/templates/order/pc-master.html  |  6 ++---
 2 files changed, 28 insertions(+), 4 deletions(-)

diff --git a/ghy-admin/src/main/resources/templates/order/orderManager.html b/ghy-admin/src/main/resources/templates/order/orderManager.html
index e46accc5..bbc68b12 100644
--- a/ghy-admin/src/main/resources/templates/order/orderManager.html
+++ b/ghy-admin/src/main/resources/templates/order/orderManager.html
@@ -313,10 +313,12 @@
                        shiro:hasPermission="order:order:export">
                         <i class="fa fa-download"></i> 导出
                     </a>
-
                     <a class="btn btn-default" onclick="mergePay()">
                         <i class="fa fa-money"></i> 付款
                     </a>
+                    <a class="btn btn-default" onclick="showPcOrderWorker()">
+                        <i class="fa fa-money"></i> 指派
+                    </a>
                 </div>
             </div>
 
@@ -827,6 +829,28 @@
         });
     }
 
+    function showPcOrderWorker() {
+        table.set();
+        var rows = $.common.isEmpty(table.options.uniqueId) ? $.table.selectFirstColumns() : $.table.selectColumns(table.options.uniqueId);
+        if (rows.length === 0) {
+            $.modal.alertWarning("请至少选择一条记录");
+            return;
+        }
+        var url = "pcOrderWorker/" + rows.join(",");
+        layer.open({
+            type: 2,
+            area: ['800px', '450px'],
+            fix: false,
+            //不固定
+            maxmin: true,
+            shade: 0.3,
+            title: '指派师傅',
+            content: url,
+            // 弹层外区域关闭
+            shadeClose: true
+        });
+    }
+
     function mergePay() {
         table.set();
         var rows = $.common.isEmpty(table.options.uniqueId) ? $.table.selectFirstColumns() : $.table.selectColumns(table.options.uniqueId);
diff --git a/ghy-admin/src/main/resources/templates/order/pc-master.html b/ghy-admin/src/main/resources/templates/order/pc-master.html
index f32186e4..6f952acc 100644
--- a/ghy-admin/src/main/resources/templates/order/pc-master.html
+++ b/ghy-admin/src/main/resources/templates/order/pc-master.html
@@ -170,9 +170,9 @@
                     <a class="btn btn-default" onclick="mergePay()">
                         <i class="fa fa-money"></i> 付款
                     </a>
-                    <a class="btn btn-default" onclick="showOrderWorker()">
-                        <i class="fa fa-money"></i> 指派
-                    </a>
+<!--                    <a class="btn btn-default" onclick="showOrderWorker()">-->
+<!--                        <i class="fa fa-money"></i> 指派-->
+<!--                    </a>-->
                 </div>
             </div>