更新

app/Http/Controllers/Admin/OrderOverviewController.php

@@ -8,6 +8,7 @@ use App\Models\InnerDeviceNamesModel;
 use App\Models\Order;
 use App\Models\OrderDevice;
 use App\Models\OrderOverviewModel;
+use App\Models\Project;
 use App\Models\Spec;
 use App\Models\User;
 use Illuminate\Http\Request;
@@ -36,13 +37,33 @@ class OrderOverviewController extends BaseController
 
     public function index()
     {
+        $project_ids = Project::getNotOneProjectOptions();
+        $status = [
+            [
+                'id' => 1,
+                'name' => '未确认'
+            ],
+            [
+                'id' => 2,
+                'name' => '已确认'
+            ]
+        ];
+        $date = OrderOverviewModel::pluck('date','id')->toArray();
+        $date = array_unique($date);
+        $dates = [];
+        foreach ($date as $key =>$value)
+        {
+            $name = date('Y-m',strtotime($value));
+            array_push($dates,$name);
+        }
         list($model, $model_name, $pre_uri) = array($this->model, $this->model_name, $this->pre_uri);
-        return view($this->view_path . 'index', compact('model', 'model_name','pre_uri'));
+        return view($this->view_path . 'index', compact('model', 'model_name','pre_uri','project_ids','status','dates'));
     }
     public function orderDetails(Request $request)
     {
+        $device_id = Device::get(['id','name'])->toArray();
         list($model, $model_name, $pre_uri) = array($this->model, $this->model_name, $this->pre_uri);
-        return view($this->view_path . 'order-details', compact('model', 'model_name','pre_uri'));
+        return view($this->view_path . 'order-details', compact('model', 'model_name','pre_uri','device_id'));
     }
 
     public function get(Request $request)
@@ -61,7 +82,37 @@ class OrderOverviewController extends BaseController
         }else{
             $items = $this->model->where('id', '>', 0)->orderBy('id','desc');
         }
-        $items = $items->paginate(15);
+        if ($request->input('project_ids'))
+        {
+            $items->whereHas('projects',function ($query){
+                    $query->where('id','=',request('project_ids'));
+                });
+        }
+        if ($request->input('status'))
+        {
+            if ($request->input('status') == 1)
+            {
+                $items->where('status',0);
+            }else if ($request->input('status') == 2)
+                {
+                    $items->where('status',1);
+                }
+        }
+        if ($request->input('order_sn'))
+        {
+            $items->where('order_sn','like','%'.request('order_sn').'%');
+        }
+        if ($request->input('dates'))
+        {
+            $dates = $request->input('dates').'-01 00:00:00';
+            $items->where('date',$dates);
+        }
+        if ($request->input('device_id'))
+        {
+            $items->where('device_id',request('device_id'));
+        }
+
+            $items = $items->paginate(15);
         if ($request->input('type') == 'details')
         {
             foreach ($items as $item) {

resources/views/admin/order-overviews/index.blade.php

@@ -11,29 +11,60 @@
         <div class="layui-card-header sg-card-header">
             {{ $model_name }}管理
             <div class="sg-card-create">
-                <button id="sg-create-btn" class="layui-btn layui-btn-sm">创建</button>
+                {{--<button id="sg-create-btn" class="layui-btn layui-btn-sm">创建</button>--}}
             </div>
         </div>
         <div class="layui-card-body">
             <form class="layui-form" id="sg-search-form">
-                {{--<div class="layui-form-item layui-row">--}}
-                    {{--<div class="layui-inline">--}}
-                        {{--<div class="layui-input-inline">--}}
-                            {{--<input type="text" name="name" placeholder="请输入设备名称" autocomplete="off" class="layui-input" value="{{ request('name') }}">--}}
-                        {{--</div>--}}
-                    {{--</div>--}}
-                    {{--<div class="layui-inline">--}}
-                        {{--<div class="layui-btn" id="sg-search-btn">搜索</div>--}}
-                    {{--</div>--}}
-                {{--</div>--}}
+                <div class="layui-form-item layui-row">
+                    <div class="layui-inline">
+                        <div class="layui-input-inline">
+                            <input type="text" name="order_sn" placeholder="请输入订单号" autocomplete="off" class="layui-input" value="{{ request('order_sn') }}">
+                        </div>
+                    </div>
+                    <div class="layui-inline">
+                            <div class="layui-input-inline">
+                                <select name="project_ids">
+                                    <option value="0">项目名称</option>
+                                    @foreach($project_ids as $option)
+                                        <option value="{{ $option['id'] }}" {{ request('project_id') == $option['id'] ? 'selected' : ''  }}>{{ $option['name'] }}</option>
+                                    @endforeach
+                                </select>
+                            </div>
+                    </div>
+                    <div class="layui-inline">
+                        <div class="layui-input-inline">
+                            <select name="dates">
+                                <option value="0">选择年月</option>
+                                @foreach($dates as $option)
+                                    <option value="{{ $option }}" {{ request('status') == $option ? 'selected' : ''  }}>{{ $option }}</option>
+                                @endforeach
+                            </select>
+                        </div>
+                    </div>
+                    <div class="layui-inline">
+                        <div class="layui-input-inline">
+                            <select name="status">
+                                <option value="0">订单确认状态</option>
+                                @foreach($status as $option)
+                                    <option value="{{ $option['id'] }}" {{ request('status') == $option['id'] ? 'selected' : ''  }}>{{ $option['name'] }}</option>
+                                @endforeach
+                            </select>
+                        </div>
+                    </div>
+
+                    <div class="layui-inline">
+                        <div class="layui-btn" id="sg-search-btn">搜索</div>
+                    </div>
+                </div>
             </form>
             <table id="sg-main-table" class="layui-hide" lay-filter="tableEvent"></table>
             <script type="text/html" id="sg-table-bar">
                 <div class="layui-btn-group">
                     <div class="layui-btn-group">
                         <a class="layui-btn layui-btn-normal layui-btn-xs" lay-event="details">账单详情</a>
-                        <a class="layui-btn layui-btn-xs" lay-event="edit">编辑</a>
-                        <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="delete">删除</a>
+                        {{--<a class="layui-btn layui-btn-xs" lay-event="edit">编辑</a>--}}
+                        {{--<a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="delete">删除</a>--}}
                     </div>
                 </div>
             </script>
@@ -57,15 +88,13 @@
                     cellMinWidth: 80,
                     cols: [[
                         { field: 'order_sn', title: '订单号', align: 'center' },
-                        { field: 'dates', title: '年月', align: 'center' },
                         { field: 'project_name', title: '项目名称', align: 'center' },
+                        { field: 'dates', title: '年月', align: 'center' },
                         { field: 'total_price', title: '总金额', align: 'center' },
                         { field: 'confirmation_time', title: '对账时间', align: 'center' },
                         { field: 'status', title: '订单确认状态', align: 'center' },
                         { field: 'confirmation_user_id', title: '项目经理名称', align: 'center' },
                         { field: 'phone', title: '联系电话', align: 'center' },
-                        { field: 'created_at', title: '创建时间', align: 'center' },
-                        { field: 'updated_at', title: '更新时间', align: 'center' },
                         { title: '操作', align:'center', toolbar: '#sg-table-bar' }
                     ]],
                     page: {

resources/views/admin/order-overviews/order-details.blade.php

@@ -25,11 +25,16 @@
                 <input type="hidden" name="type" value="details">
 
                 <div class="layui-form-item layui-row">
-                    {{--<div class="layui-inline">--}}
-                        {{--<div class="layui-input-inline">--}}
-                            {{--<input type="text" name="name" placeholder="请输入名称" autocomplete="off" class="layui-input" value="{{ request('name') }}">--}}
-                        {{--</div>--}}
-                    {{--</div>--}}
+                    <div class="layui-inline">
+                        <div class="layui-input-inline">
+                            <select name="device_id">
+                                <option value="0">设备类型</option>
+                                @foreach($device_id as $option)
+                                    <option value="{{ $option['id'] }}" {{ request('project_id') == $option['id'] ? 'selected' : ''  }}>{{ $option['name'] }}</option>
+                                @endforeach
+                            </select>
+                        </div>
+                    </div>
                     <div class="layui-inline">
                         <div class="layui-btn" id="sg-search-btn">搜索</div>
                     </div>