From b80486eb0a894bed7348be4bc5c097883681a619 Mon Sep 17 00:00:00 2001
From: weizong song <sdswz@qq.com>
Date: Sat, 5 Feb 2022 14:32:30 +0800
Subject: [PATCH] up

---
 app/Http/Controllers/Admin/OrdersController.php |  8 +++++++-
 resources/views/admin/orders/index.blade.php    | 10 +++++++++-
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/app/Http/Controllers/Admin/OrdersController.php b/app/Http/Controllers/Admin/OrdersController.php
index ce3a0cd..360ffb8 100755
--- a/app/Http/Controllers/Admin/OrdersController.php
+++ b/app/Http/Controllers/Admin/OrdersController.php
@@ -40,13 +40,19 @@ class OrdersController extends CommonController
         $this->model = $this->model->where("project_id", $project_id);
 
         if ($request->keyword) {
-            $this->model = $this->model->where(function($query) use ($request) {
+            $this->model = $this->model->where(function ($query) use ($request) {
                 $query->where("serial", "like", "%" . $request->keyword . "%")
                     ->orWhere("contact", "like", "%" . $request->keyword . "%")
                     ->orWhere("mobile", "like", "%" . $request->keyword . "%");
             });
         }
 
+        if ($request->date) {
+            $this->model = $this->model->whereHas("orderItems", function ($query) use ($month, $request) {
+                $query->where("service_date", $month . "-" . $request->date);
+            });
+        }
+
         $data = $this->model
             ->with([
                 "orderItems",
diff --git a/resources/views/admin/orders/index.blade.php b/resources/views/admin/orders/index.blade.php
index 389817b..85878d8 100755
--- a/resources/views/admin/orders/index.blade.php
+++ b/resources/views/admin/orders/index.blade.php
@@ -19,7 +19,15 @@
                                     <option value="{{$mm}}" @if($mm == $month) {{ "selected" }}@endif>{{$mm}}</option>
                                 @endforeach
                             </select>
-                            <input class="form-control" type="text" name="keyword" value="{{ request()->keyword }}" placeholder="订单编号/联系人/联系电话">
+                            <select class="form-control mr-1" name="date" onchange="$(this).closest('form').submit()">
+                                <option value="">包含本月所有日期</option>
+                                @for($i=1;$i<=31;$i++)
+                                    <option
+                                        value="{{ sprintf("%02d",$i)}}" @if(sprintf("%02d",$i) == request()->date) {{ "selected" }}@endif>{{sprintf("%02d",$i)}}</option>
+                                @endfor
+                            </select>
+                            <input class="form-control" type="text" name="keyword" value="{{ request()->keyword }}"
+                                   placeholder="订单编号/联系人/联系电话">
                         </form>
                     </div>
                     <table class="table table-bordered" id="data-table">