From 638c3bd51845e0b11aebd15fa306a385adaeca9b Mon Sep 17 00:00:00 2001 From: donqi Date: Sat, 17 Jun 2023 01:28:14 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B4=BE=E5=8D=95=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/templates/order/master.html | 8 +- .../templates/order/orderManager.html | 2 +- .../templates/order/orderWorker.html | 305 +++++++++++++++++- 3 files changed, 293 insertions(+), 22 deletions(-) diff --git a/ghy-admin/src/main/resources/templates/order/master.html b/ghy-admin/src/main/resources/templates/order/master.html index c517a62c..c5f19b32 100644 --- a/ghy-admin/src/main/resources/templates/order/master.html +++ b/ghy-admin/src/main/resources/templates/order/master.html @@ -302,9 +302,9 @@ shiro:hasPermission="order:order:export"> 导出 - - 指派 - + + + @@ -606,7 +606,7 @@ actions.push('查看 '); actions.push('师傅退单 '); actions.push('商家退单 '); - actions.push('指派 '); + if (row.payStatus == 0) { actions.push('付款 '); } diff --git a/ghy-admin/src/main/resources/templates/order/orderManager.html b/ghy-admin/src/main/resources/templates/order/orderManager.html index ef7edeef..81651286 100644 --- a/ghy-admin/src/main/resources/templates/order/orderManager.html +++ b/ghy-admin/src/main/resources/templates/order/orderManager.html @@ -360,7 +360,7 @@ function showOrderWorker(id) { var url = "order/master/orderWorker/" + id; - $.modal.open("指派师傅", url, '800', '300'); + $.modal.open("指派师傅", url, '800', '500'); } function selectRegion(regionLevelName, nextRegionLevelName) { diff --git a/ghy-admin/src/main/resources/templates/order/orderWorker.html b/ghy-admin/src/main/resources/templates/order/orderWorker.html index 23b5f21f..11c69802 100644 --- a/ghy-admin/src/main/resources/templates/order/orderWorker.html +++ b/ghy-admin/src/main/resources/templates/order/orderWorker.html @@ -3,31 +3,302 @@ + + + - -
-
- -
- -
- + +
+
+ +
-
- +
+
+ 可派单金额： + + 元 +
+
+
+ + +
+
+
+ +
+ +
+
+
+ +
+ + + + +
+
+
+ +
+ + + + +
+
+
+ + +
+
+  搜索 +  重置 +
+
+
+ +
+
+
+ - \ No newline at end of file +