From e3bab20f7be0597e32ca295f9f15ad33f4fad0ed Mon Sep 17 00:00:00 2001
From: xman <1946321327@qq.com>
Date: Mon, 16 Jun 2025 17:44:03 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=89=E7=BA=A7=E7=AD=9B=E9=80=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/admin/controller/Order.php        | 32 +++++++++++++++++++
 .../admin/controller/orders/Revisitorder.php  |  9 ++++++
 .../admin/controller/statistics/Worker.php    |  9 ++++++
 application/admin/view/order/index.html       | 17 ++++++++++
 application/common/controller/Backend.php     |  9 ++++++
 public/assets/js/backend/order.js             |  8 +++++
 6 files changed, 84 insertions(+)

diff --git a/application/admin/controller/Order.php b/application/admin/controller/Order.php
index 5a7d55c..fec957d 100644
--- a/application/admin/controller/Order.php
+++ b/application/admin/controller/Order.php
@@ -790,7 +790,30 @@ class Order extends Backend
         }
         $this->request->get([config('paginate.var_page') => $page]);
         $filter = (array)json_decode($filter, true);
+
+
+
+        $province_id = $filter['province_id']??null;
+        $city_id = $filter['city_id']??null;
+        $area_id = $filter['city_id']??null;
+        unset($filter['city_id']);
+        unset($filter['province_id']);
+        unset($filter['area_id']);
+
+        if(!empty($area_id)){
+            $filter['area_id'] = $area_id;
+        }else{
+            if(!empty($city_id)){
+                $filter['area_id'] = $city_id;
+            }else{
+                if(!empty($province_id)){
+                    $filter['area_id'] = $province_id;
+                }
+            }
+        }
+
         $op = (array)json_decode($op, true);
+        $op['area_id'] = 'LIKE%';
         $filter = $filter ? $filter : [];
         $where = [];
         $alias = [];
@@ -855,6 +878,15 @@ class Order extends Backend
                 case 'NOT LIKE %...%':
                     $where[] = [$k, trim(str_replace('%...%', '', $sym)), "%{$v}%"];
                     break;
+                // ✅ 新增：右匹配（like%）
+                case 'LIKE%':
+                    $where[] = [$k, 'LIKE', "{$v}%"];
+                    break;
+
+                // ✅ 新增：左匹配（%like）
+                case '%LIKE':
+                    $where[] = [$k, 'LIKE', "%{$v}"];
+                    break;
                 case '>':
                 case '>=':
                 case '<':
diff --git a/application/admin/controller/orders/Revisitorder.php b/application/admin/controller/orders/Revisitorder.php
index 1292a5c..1ace67e 100644
--- a/application/admin/controller/orders/Revisitorder.php
+++ b/application/admin/controller/orders/Revisitorder.php
@@ -259,6 +259,15 @@ class Revisitorder extends Backend
                 case 'NOT LIKE %...%':
                     $where[] = [$k, trim(str_replace('%...%', '', $sym)), "%{$v}%"];
                     break;
+                // ✅ 新增：右匹配（like%）
+                case 'LIKE%':
+                    $where[] = [$k, 'LIKE', "{$v}%"];
+                    break;
+
+                // ✅ 新增：左匹配（%like）
+                case '%LIKE':
+                    $where[] = [$k, 'LIKE', "%{$v}"];
+                    break;
                 case '>':
                 case '>=':
                 case '<':
diff --git a/application/admin/controller/statistics/Worker.php b/application/admin/controller/statistics/Worker.php
index 1db788f..e240d2e 100644
--- a/application/admin/controller/statistics/Worker.php
+++ b/application/admin/controller/statistics/Worker.php
@@ -440,6 +440,15 @@ class Worker extends Backend
                 case 'NOT LIKE %...%':
                     $where[] = [$k, trim(str_replace('%...%', '', $sym)), "%{$v}%"];
                     break;
+                // ✅ 新增：右匹配（like%）
+                case 'LIKE%':
+                    $where[] = [$k, 'LIKE', "{$v}%"];
+                    break;
+
+                // ✅ 新增：左匹配（%like）
+                case '%LIKE':
+                    $where[] = [$k, 'LIKE', "%{$v}"];
+                    break;
                 case '>':
                 case '>=':
                 case '<':
diff --git a/application/admin/view/order/index.html b/application/admin/view/order/index.html
index 80e7b3b..825784b 100644
--- a/application/admin/view/order/index.html
+++ b/application/admin/view/order/index.html
@@ -124,3 +124,20 @@
     }
 
 </style>
+
+
+<script id="categorytpl" type="text/html">
+    <div class="row">
+        <div class="col-xs-12">
+            <div class="form-inline" data-toggle="cxselect" data-selects="province,city,area">
+                <select style="width: 25%;" class="province form-control" name="province_id" data-url="ajax/area"></select>
+                <select style="width: 30%;" class="city form-control" name="city_id" data-url="ajax/area" data-query-name="province"></select>
+                <select style="width:auto" class="area form-control" name="area_id" data-url="ajax/area" data-query-name="city"></select>
+                <input type="hidden" class="operate" data-name="province_id" value="LIKE%" />
+                <input type="hidden" class="operate" data-name="city_id" value="LIKE%" />
+                <input type="hidden" class="operate" data-name="area_id" value="LIKE%" />
+            </div>
+        </div>
+    </div>
+</script>
+
diff --git a/application/common/controller/Backend.php b/application/common/controller/Backend.php
index 43106a3..b226d8c 100755
--- a/application/common/controller/Backend.php
+++ b/application/common/controller/Backend.php
@@ -361,6 +361,15 @@ class Backend extends Controller
                 case 'NOT LIKE %...%':
                     $where[] = [$k, trim(str_replace('%...%', '', $sym)), "%{$v}%"];
                     break;
+                // ✅ 新增：右匹配（like%）
+                case 'LIKE%':
+                    $where[] = [$k, 'LIKE', "{$v}%"];
+                    break;
+
+                // ✅ 新增：左匹配（%like）
+                case '%LIKE':
+                    $where[] = [$k, 'LIKE', "%{$v}"];
+                    break;
                 case '>':
                 case '>=':
                 case '<':
diff --git a/public/assets/js/backend/order.js b/public/assets/js/backend/order.js
index 4993f48..2a4d1c8 100644
--- a/public/assets/js/backend/order.js
+++ b/public/assets/js/backend/order.js
@@ -183,6 +183,14 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form', 'cascader'], function
                             addclass: 'datetimerange',
                             autocomplete: false
                         },
+
+                        {field: 'area', title: __('地区'), searchList: function (column) {
+                                return Template('categorytpl', {});
+                            }, formatter: function (value, row, index) {
+                                return '无';
+                            }, visible: false
+                        },
+
                         {
                             field: 'operate',
                             title: __('Operate'),