瀏覽代碼

订单联动赛选

whj 4 年之前
父節點
當前提交
20a4e24959

+ 2 - 0
app/Http/Controllers/Admin/OrderDeviceController.php

xqd
@@ -44,6 +44,8 @@ class OrderDeviceController extends BaseController
     public function rentList()
     {
         list($model, $model_name, $pre_uri) = array($this->model, $this->model_name, $this->pre_uri);
+        $options = ( new Device())->getDeviceOptions();
+        $project_work_point_options = (new Project())->getTwoLevelOptions();
         return view($this->view_path . 'rent-list', compact('model', 'model_name','pre_uri'));
     }
 

+ 1 - 1
app/Models/Project.php

xqd
@@ -26,7 +26,7 @@ class Project extends BaseModel
 
     public function getTwoLevelOptions()
     {
-        $projects = Project::select('name as text', 'id as value')->get();
+        $projects = Project::select('name as text', 'id as value')->where('id','!=',1)->get();
         $projects = $projects->prepend($this->transObject(['text' => '选择项目', 'value' => '']));
         foreach ($projects as $project) {
             $work_points = WorkPoint::where('project_id', $project->value)->select('name as text', 'id as value')->get();

+ 13 - 10
resources/views/admin/order-devices/rent-list.blade.php

xqd
@@ -14,16 +14,19 @@
         <div class="layui-card-body">
             <form class="layui-form" id="sg-search-form">
                 <input type="hidden" name="type" value="rent">
-                {{--<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">
+
+                    @include('share.device-select-form', ['device_id' => '', 'device_name_id' => '', 'spec_id' => '', 'options' => $options, 'hide_spec' => true])
+                    @include('share.project-work-point-select-form', ['project_id' => '', 'work_point_id' => '', 'options' => $project_work_point_options])
+                </div>
+
+                <div class="layui-form-item layui-row">
+                    <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">