From f59110bd91d3bdf341d355e0d2abc75b4677d58b Mon Sep 17 00:00:00 2001
From: nizongfeng <nizongfeng@gmail.com>
Date: Fri, 26 Nov 2021 15:45:29 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A3=80=E7=B4=A2=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/admin/service/OrderMainService.php | 3 +++
 application/admin/view/order_main/index.html   | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/application/admin/service/OrderMainService.php b/application/admin/service/OrderMainService.php
index e8e47dd..2c3fb77 100644
--- a/application/admin/service/OrderMainService.php
+++ b/application/admin/service/OrderMainService.php
@@ -386,6 +386,9 @@ class OrderMainService
         if (!empty($param['supplier_id'])) {
             $where[] = "(b.supplier_id = {$param['supplier_id']} or c.supplier_id = {$param['supplier_id']})";
         }
+        if (!empty($param['customer_name'])) {
+            $where[] = "(b.customer_name like '%{$param['customer_name']}%' or c.customer_name like '%{$param['customer_name']}%')";
+        }
         //子订单查询条件 离店时间
         if (!empty($param['startOutDate'])) {
             $where[] = " c.check_out_date >= '{$param['startOutDate']} 00:00:00' ";
diff --git a/application/admin/view/order_main/index.html b/application/admin/view/order_main/index.html
index 3e23b7b..ad4091f 100755
--- a/application/admin/view/order_main/index.html
+++ b/application/admin/view/order_main/index.html
@@ -98,6 +98,8 @@
             <el-input-number v-model="search.endProfit" style="width: 170px;" placeholder="请输入内容" clearable></el-input-number>
         </div>
         <div class="header-search" style="width: 100%;margin-bottom: 10px">
+            <span>出游人：</span>
+            <el-input v-model="search.customer_name" style="width: 150px;" placeholder="请输入内容" clearable></el-input>
             <span>供应商</span>
             <el-select v-model="search.supplier_id" style="width: 150px;" placeholder="请选择" clearable>
                 <el-option
@@ -330,6 +332,7 @@
                     "endTime":"",
                     "pageNum":1,
                     "pageSize":10,
+                    "customer_name":"",
                     "startInDate":"",
                     "endInDate":"",
                     "startOutDate":"",