add

app/Http/Controllers/Admin/Company/InfoController.php

@@ -25,12 +25,14 @@ class InfoController extends Controller
     }
 
 
-   /*
-    * 搜索页
-    * */
-    public function search(){
+    /*
+     * 搜索页
+     * */
+    public function search()
+    {
         return view('admin.company.info.search');
     }
+
     /**
      * 列表页
      */
@@ -38,6 +40,7 @@ class InfoController extends Controller
     {
         $search = $request->all();
 
+        dd($search);
         $order = array();
         if (isset($request['sort_field']) && $request['sort_field'] && isset($request['sort_field_by'])) {
             $order[$request['sort_field']] = $request['sort_field_by'];
@@ -47,10 +50,10 @@ class InfoController extends Controller
 
         $list = $this->repository->searchCompany($search, $order);
 
-        if($request->ajax()){
-            $view = view('admin.company.info.data',compact('list'))->render();
+        if ($request->ajax()) {
+            $view = view('admin.company.info.data', compact('list'))->render();
 
-            return response()->json(['html'=>$view]);
+            return response()->json(['html' => $view]);
 
         }
 
@@ -111,15 +114,15 @@ class InfoController extends Controller
         } else {
             $url[] = array('url' => U('Company/Info/index'), 'title' => '返回列表');
             return $this->showWarning('操作失败', $url);
-            
+
         }
     }
 
     public function view(Request $request)
     {
         $data = $this->repository->find(request('id'));
-        $contacts = $data->contacts()->orderBy('sort','desc')->get();
-        return view('admin.company.info.view', compact('data','contacts'));
+        $contacts = $data->contacts()->orderBy('sort', 'desc')->get();
+        return view('admin.company.info.view', compact('data', 'contacts'));
     }
 
 

app/Http/Controllers/Admin/User/ThreadsController.php

@@ -31,16 +31,14 @@ class ThreadsController extends Controller
      */
     function index(Request $request)
     {
+        $user_id = \Auth::guard('admin')->user()->id;
         $search['keyword'] = $request->input('keyword');
 
         $list = UserThreadsModel::whereHas('company', function ($query) use ($search) {
             $query->where('companyName', 'like', '%' . $search['keyword'] . '%')
                 ->orWhere('regNo', 'like', '%' . $search['keyword'] . '%')
                 ->orWhere('companyName', 'like', '%' . $search['keyword'] . '%');
-        })->orWhereHas('contact', function ($query) use ($search) {
-            $query->where('phone', 'like', '%' . $search['keyword'] . '%');
-        })->orderBy('updated_at','desc')->paginate(16);
-
+        })->where('ower_id',$user_id)->orderBy('updated_at','desc')->paginate(16);
         return view('admin.user.threads.index', compact('list'));
     }
 

resources/views/admin/company/info/search.blade.php

@@ -13,99 +13,124 @@
                     </div>
                 </div>
 
-                <div class="ibox-content">
-                    <div class="form-group">
-                        <div class="row">
-                            <div class="col-sm-8">
-                                满足下列
-                                <select name="" id="">
-                                    <option value="所有">所有</option>
-                                    <option value="任一">任一</option>
-                                </select>
-                                条件：
+                <form method="GET" action="{{ U('Company/info/index') }}" accept-charset="UTF-8">
+                    <div class="ibox-content">
+
+                        <div class="form-group">
+
+                            <div class="row">
+                                <label class="col-form-label col-sm-2">企业名称</label>
+
+                                <div class="col-sm-6">
+                                    <input class="tagsinput form-control" type="text"
+                                           name="companyName" value="" style="display: none;" placeholder="请输入企业名称关键字">
+                                </div>
                             </div>
                         </div>
-                    </div>
 
-                    <div id="app">
+                        <div class="form-group">
+
+                            <div class="row">
+                                <label class="col-form-label col-sm-2">注册资本</label>
+
+                                <div class="col-sm-6">
+                                    <div class="form-group">
+                                        <label class="font-normal">单选</label>
+                                        <div>
+                                            <select data-placeholder="" class="chosen-select"
+                                                    style="width: 350px; display: none;" tabindex="-1" name="regCapital">
+                                                <option value="">全部</option>
+                                                <option value="-50">50万以下</option>
+                                                <option value="50-100">50～100万</option>
+                                                <option value="100-500">100～500万</option>
+                                                <option value="500-1000">500～1000万</option>
+                                                <option value="1000-">1000万以上</option>
+                                            </select>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
 
                         <div class="form-group">
+
                             <div class="row">
-                                <div class="col-sm-2">
-                                    <select name="filterFiled[]" class="form-control" v-on:change="choseFilters" v-model="selected">
-                                        <option v-for="filter in filters" v-bind:value='filter.value'>@{{ filter.name }}
-                                        </option>
-                                    </select>
+                                <label class="col-form-label col-sm-2">所属行业</label>
+
+                                <div class="col-sm-6">
+                                    <div class="form-group">
+                                        <label class="font-normal">多选</label>
+                                        <div>
+                                            <select data-placeholder="" class="chosen-select" multiple=""
+                                                    style="width: 350px; display: none;" tabindex="-1" name="industry">
+                                                <option value="">全部</option>
+                                                <option value="互联网">互联网</option>
+                                                <option value="金融">金融</option>
+                                            </select>
+                                        </div>
+                                    </div>
                                 </div>
+                            </div>
 
+                            <div class="form-group">
 
-                                <div class="col-sm-2" v-if="selected === 'companyName'">
-                                    <input name="companyName" class="form-control" placeholder="">
+                                <div class="row">
+                                    <label class="col-form-label col-sm-2">企业类型</label>
+
+                                    <div class="col-sm-6">
+                                        <div class="form-group">
+                                            <label class="font-normal">多选</label>
+                                            <div>
+                                                <select data-placeholder="" class="chosen-select" multiple=""
+                                                        style="width: 350px; display: none;" tabindex="-1" name="entType">
+                                                    <option value="">全部</option>
+                                                    <option value="民营">民营</option>
+                                                    <option value="国有企业">国有企业</option>
+                                                    <option value="外资、中外合资">外资、中外合资</option>
+                                                    <option value="港、澳、台投资">港、澳、台投资</option>
+                                                    <option value="个体工商户">个体工商户</option>
+                                                    <option value="其他">其他</option>
+                                                </select>
+                                            </div>
+                                        </div>
+                                    </div>
                                 </div>
-                                <div class="col-sm-2" v-else>
-                                    <select :name='selected'  class="form-control">
-                                        <option v-for="item in items" v-bind:value='item.value'>@{{ item.name }}
-                                        </option>
-                                    </select>
+                            </div>
+
+                            <div class="form-group">
+
+                                <div class="row">
+                                    <label class="col-form-label col-sm-2">所在地区</label>
+
+                                    <div class="col-sm-6">
+                                        <div class="form-group">
+                                            <label class="font-normal">多选</label>
+                                            <div>
+                                                <select data-placeholder="" class="chosen-select" multiple=""
+                                                        style="width: 350px; display: none;" tabindex="-1" name="district">
+                                                    <option value="">全部</option>
+                                                    <option value="成都">成都</option>
+                                                </select>
+                                            </div>
+                                        </div>
+                                    </div>
                                 </div>
                             </div>
-                        </div>
 
 
-                        <div class="form-group">
-                            <div class="row">
-                                <div class="col-sm-8">
-                                    <button class="btn btn-outline-primary" id="addFilter" v-on:click="addFilter">添加条件
-                                    </button>
+                            <div class="form-group">
+                                <div class="row">
+                                    <label class="col-form-label col-sm-2"></label>
+                                    <div class="col-sm-6">
+                                        <button class="btn btn-outline-primary">筛选
+                                        </button>
+                                    </div>
                                 </div>
                             </div>
                         </div>
                     </div>
-                </div>
+                </form>
             </div>
         </div>
     </div>
-@endsection
-
-@section('js')
-    <script>
-        new Vue({
-            el: '#app',
-            data: {
-                selected:'companyName',
-                filters: [
-                    {name: '企业名称', value: 'companyName'},
-                    {name: '企业类型', value: 'entType'},
-                    {name: '注册资本', value: 'regCapital'},
-                    {name: '所属行业', value: 'industry'},
-                ],
-
-                items: [
-
-                ]
-            },
-            methods: {
-                addFilter: function (event) {
-
-                },
-                choseFilters: function (event) {
-                    if(this.selected == 'regCapital'){
-                        this.items = [
-                            {name:'50万以下',value:'50万以上'},
-                            {name:'50万-100万',value:'50万-100万'},
-                            {name:'100万以上',value:'100万以上'}
-                        ]
-                    }else if(this.selected == 'industry'){
-                        this.items = [
-                            {name:'互联网',value:'互联网'},
-                            {name:'软件开发',value:'软件开发'}
-                        ]
-                    }else {
-                        console.log(this.selected)
-                    }
-
-                }
-            }
-        })
-    </script>
 @endsection

resources/views/admin/layouts/app.blade.php

@@ -20,6 +20,8 @@
     <link href="/base/css/style.css" rel="stylesheet">
     <link href="/base/css/plugins/datapicker/datepicker3.css" rel="stylesheet">
     <link href="/base/css/plugins/dataTables/datatables.min.css" rel="stylesheet">
+    <link href="/base/css/plugins/bootstrap-tagsinput/bootstrap-tagsinput.css" rel="stylesheet">
+    <link href="/base/css/plugins/chosen/bootstrap-chosen.css" rel="stylesheet">
 
     <!-- Mainly scripts -->
     <script src="/base/js/jquery-2.1.1.js"></script>
@@ -34,6 +36,8 @@
     <script src="/base/plugins/bootstrap-fileinput/js/fileinput.js" type="text/javascript"></script>
     <script src="/base/plugins/bootstrap-fileinput/js/locales/zh.js" type="text/javascript"></script>
     <script src="/base/js/vue.min.js" type="text/javascript"></script>
+    <script src="/base/js/plugins/bootstrap-tagsinput/bootstrap-tagsinput.js" type="text/javascript"></script>
+    <script src="/base/js/plugins/chosen/chosen.jquery.js" type="text/javascript"></script>
 
     @yield('header')
 </head>
@@ -73,6 +77,10 @@
 <script src="/base/js/jquery.tablesort.js"></script>
 
 <script>
+    $('.tagsinput').tagsinput({
+        tagClass: 'label label-primary'
+    })
+    $('.chosen-select').chosen({width: "100%"})
     $(".dataTable").tableSort(['sorting', 'sorting_asc', 'sorting_desc']);
     $('.input-group.date').datepicker({
         language: "zh",