更新调用订单

app/Http/Controllers/Admin/OrderDeviceController.php

@@ -5,6 +5,7 @@ namespace App\Http\Controllers\Admin;
 use App\Models\Device;
 use App\Models\DeviceName;
 use App\Models\InnerDevice;
+use App\Models\InnerDeviceNamesModel;
 use App\Models\OrderDevice;
 use App\Models\Project;
 use App\Models\Spec;
@@ -54,8 +55,10 @@ class OrderDeviceController extends BaseController
 
     public function applyList()
     {
+        $project_id = Project::getOptions();
+        $inner_device_name = InnerDeviceNamesModel::getOptions();
         list($model, $model_name, $pre_uri) = array($this->model, $this->model_name, $this->pre_uri);
-        return view($this->view_path . 'apply-list', compact('model', 'model_name','pre_uri'));
+        return view($this->view_path . 'apply-list', compact('model', 'model_name','pre_uri','project_id','inner_device_name'));
     }
 
     public function get(Request $request)
@@ -82,13 +85,44 @@ class OrderDeviceController extends BaseController
             }
         }
 
+        if ($request->input('order_id'))
+        {
+            $items->where('order_id','like','%'.$request->input('order_id').'%');
+        }
+        if ($request->input('number'))
+        {
+            $items->whereHas('inner_device',function ($query){
+                $query->where('number','like','%'.request('number').'%');
+            });
+        }
+        if ($request->input('spec_name'))
+        {
+            $items->whereHas('inner_device',function ($query){
+                $query->where('spec_name','like','%'.request('spec_name').'%');
+            });
+        }
+        if ($request->input('project_id'))
+        {
+            $items->whereHas('project',function ($query){
+               $query->where('id','=',request('project_id'));
+            });
+        }
+        if ($request->input('inner_device_name'))
+        {
+            $items->whereHas('inner_device',function ($query){
+                $query->whereHas('device_name',function ($query){
+                    $query->where('id','=',request('inner_device_name'));
+                });
+            });
+        }
+
         $items = $items->paginate();
 
         if($request->input('type') == 'apply') {
             foreach ($items as $item) {
                 $item->number = $item->inner_device ? $item->inner_device->number : '';
                 $item->device_name_name = $item->inner_device ? ($item->inner_device->device_name ? $item->inner_device->device_name->name : '') : '';
-                $item->spec_name = $item->inner_device ? ($item->inner_device->spec ? $item->inner_device->spec->name : '') : '';
+                $item->spec_name = $item->inner_device ? ($item->inner_device->spec_name ? $item->inner_device->spec_name : '') : '';
                 $item->project_name = $item->project ? $item->project->name : '';
                 $item->work_point_name = $item->inner_device ? ($item->inner_device->workPoint ? $item->inner_device->workPoint->name : '') : '';
                 $item->status_label = $item->inner_device ? $item->inner_device->getStatusLabel() : '';

resources/views/admin/order-devices/apply-list.blade.php

@@ -14,16 +14,45 @@
         <div class="layui-card-body">
             <form class="layui-form" id="sg-search-form">
                 <input type="hidden" name="type" value="apply">
-                {{--<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_id" placeholder="请输入订单id" autocomplete="off" class="layui-input" value="{{ request('order_id') }}">
+                        </div>
+                    </div>
+                    <div class="layui-inline">
+                        <div class="layui-input-inline">
+                            <input type="text" name="number" placeholder="请输入固定资产编号" autocomplete="off" class="layui-input" value="{{ request('number') }}">
+                        </div>
+                    </div><div class="layui-inline">
+                        <div class="layui-input-inline">
+                            <input type="text" name="spec_name" placeholder="请输入设备规格型号" autocomplete="off" class="layui-input" value="{{ request('spec_name') }}">
+                        </div>
+                    </div>
+                    <div class="layui-inline">
+                        <div class="layui-input-inline">
+                            <select name="project_id">
+                                <option value="0">在用项目</option>
+                                @foreach($project_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-input-inline">
+                            <select name="inner_device_name">
+                                <option value="0">内部设备名称</option>
+                                @foreach($inner_device_name as $option)
+                                    <option value="{{ $option['id'] }}" {{ request('inner_device_name') == $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">
@@ -56,11 +85,11 @@
                     url: '{{ $pre_uri }}' + 'get',
                     cellMinWidth: 80,
                     cols: [[
-                        { field: 'id', title: 'ID', align: 'center' },
+                        // { field: 'id', title: 'ID', align: 'center' },
                         { field: 'order_id', title: '订单ID', align: 'center' },
-                        { field: 'project_name', title: '项目', align: 'center' },
+                        { field: 'project_name', title: '在用项目', align: 'center' },
                         { field: 'number', title: '固定资产编号', align: 'center' },
-                        { field: 'device_name_name', title: '租赁设备名称', align: 'center' },
+                        { field: 'device_name_name', title: '内部设备名称', align: 'center' },
                         { field: 'spec_name', title: '设备规格型号', align: 'center' },
                         { field: 'work_point_name', title: '目前在用工点', align: 'center' },
                         { field: 'start_date', title: '调用开始时间', align: 'center' },