add

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

@@ -1,6 +1,36 @@
+<div class="row" style=" padding: 10px 0;margin: 10px;font-size: 16px">
+    <div class="col-sm-4 pull-left">
+        共找到<span style="color: red">{{ $list->total() }}</span>个结果
+    </div>
+
+
+    <div class="col-sm-7 pull-right">
+        @if(role('Company/Info/import'))
+            <form class="form-horizontal" role="form" method="post"
+                  enctype="multipart/form-data"
+                  action="{{ U('Company/Info/import')}}">
+                {{csrf_field()}}
+                <button class="btn btn-sm btn-primary pull-right company-import"
+                        style="margin-right: 5px;display: none" type="submit">
+                    Excel导入
+                </button>
+                <input id="company-import" name="company_info" type="file" class="pull-right"
+                       data-show-preview="false" data-language="zh">
+            </form>
+        @endif
+
+    </div>
+
+    <div class="col-sm-1 pull-right">
+        @if(role('Company/Collection/create'))
+            <span class="btn btn-sm btn-warning pull-right" onclick="save_collection()">保存为我的公海</span>
+        @endif
+    </div>
+
+</div>
+
 @if(isset($list))
     @foreach($list as $key => $item)
-        <div class="col-sm-7" style="margin: auto">
             <div class="row  company-info">
                 <div class="col-lg-2 col-md-3 col-sm-4">
                     <img src="/base/img/companyAvatar.82b6c75.png" alt="">
@@ -33,8 +63,6 @@
                         <span>{{ $item->regAddr }}</span>
                     </p>
                 </div>
-
-            </div>
         </div>
 
 

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

@@ -4,7 +4,7 @@
         .company-info {
             border: 1px solid #eee;
             padding: 10px 0;
-            margin-bottom: 10px;
+            margin: 10px;
             border-radius: 5px
         }
 
@@ -22,12 +22,21 @@
             margin-right: 20px;
             color: #111
         }
+        .ibox-content{
+            background-color: #f5f9fc;
+        }
+        #company-list{
+            background-color: #ffffff;
+        }
 
-        #filter_table {
+        #filter_table{
+            background-color: #ffffff;
             margin: 0 auto 20px auto;
-            border-radius: 5px;
-            border: 1px solid #eee;
+            padding: 30px 5px;
+            border-radius: 5px
+
         }
+
     </style>
 @endsection
 
@@ -46,116 +55,153 @@
                 <div class="ibox-content">
                     <div class="form-group">
                         <div class="row">
-                            <div class="col-sm-4">
 
-                            </div>
 
 
-                            <div class="col-sm-8 pull-right">
-                                @if(role('Company/Collection/create'))
-                                    <span class="btn btn-sm btn-warning pull-right" onclick="save_collection()">保存为我的公海
-                                    </span>
-                                @endif
-
-                                @if(role('Company/Info/import'))
-                                    <form class="form-horizontal" role="form" method="post"
-                                          enctype="multipart/form-data"
-                                          action="{{ U('Company/Info/import')}}">
-                                        {{csrf_field()}}
-                                        <button class="btn btn-sm btn-primary pull-right company-import"
-                                                style="margin-right: 5px;display: none" type="submit">
-                                            Excel导入
-                                        </button>
-                                        <input id="company-import" name="company_info" type="file" class="pull-right"
-                                               data-show-preview="false" data-language="zh">
-                                    </form>
-                                @endif
-
-                            </div>
 
 
                         </div>
                     </div>
 
-                    <div class="col-sm-7" id="filter_table">
-                        <table class="table table-striped table-bordered table-hover dataTables-example dataTable">
-                            <tr>
-                                <th> 过滤条件</th>
-                                <form method="GET" action="" accept-charset="UTF-8" id="filter_company">
-                                    {{ csrf_field() }}
-                                    <th>
-                                        <select name="district" class="form-control" onchange="filter_company()">
-                                            <option value="">所在地区</option>
-                                            @foreach($fields['district'] as $district)
-                                                <option value="{{$district['value']}}"
-                                                        @if($district['value'] == Request::get('district')) selected @endif>{{$district['name']}}</option>
-                                            @endforeach
-                                        </select>
-                                    </th>
-                                    <th>
-                                        <select name="industry[]" data-placeholder="所属行业" class="form-control chosen-select" onchange="filter_company()" multiple="" tabindex="-1">
-                                            <option value="">所属行业</option>
-                                            @foreach($fields['industry'] as $industry)
-                                                <option value="{{$industry['value']}}"
-                                                        @if(Request::get('industry') &&  in_array($industry['value'],Request::get('industry')) ) selected @endif>{{$industry['name']}}</option>
-                                            @endforeach
-                                        </select>
-                                    </th>
-                                    <th>
-                                        <select name="regCapital" class="form-control" onchange="filter_company()">
-                                            <option value="">注册资本</option>
-                                            @foreach($fields['regCapital'] as $regCapital)
-                                                <option value="{{$regCapital['value']}}"
-                                                        @if($regCapital['value']== Request::get('regCapital')) selected @endif>{{$regCapital['name']}}</option>
-                                            @endforeach
-                                        </select>
-                                    </th>
-                                    <th>
-                                        <select name="startDate" class="form-control" onchange="filter_company()">
-                                            <option value="">成立年限</option>
-                                            @foreach($fields['startDate'] as $startDate)
-                                                <option value="{{$startDate['value']}}"
-                                                        @if($startDate['value']== Request::get('startDate')) selected @endif>{{$startDate['name']}}</option>
-                                            @endforeach
-                                        </select>
-                                    </th>
-                                    <th>
-                                        <select name="entType" class="form-control" onchange="filter_company()">
-                                            <option value="">企业类型</option>
-                                            @foreach($fields['entType'] as $entType)
-                                                <option value="{{$entType['value']}}"
-                                                        @if($entType['value']== Request::get('entType')) selected @endif>{{$entType['name']}}</option>
-                                            @endforeach
-                                        </select>
-                                    </th>
-                                    <th>
-                                        <select name="openStatus" class="form-control" onchange="filter_company()">
-                                            <option value="">企业状态</option>
-                                            @foreach($fields['openStatus'] as $openStatus)
-                                                <option value="{{$openStatus['value']}}"
-                                                        @if($openStatus['value']== Request::get('openStatus')) selected @endif>{{$openStatus['name']}}</option>
-                                            @endforeach
-                                        </select>
-                                    </th>
-
-                                    <th>
-                                        <div class="input-group">
-                                            <input type="text" class="form-control"
-                                                   value="{{Request::get('companyName')}}"
-                                                   placeholder="请输入企业名称"
-                                                   name="companyName">
-                                            <span class="input-group-append">
-                                                <span class="btn btn-sm btn-default"
-                                                      style="height: 100%" onclick="filter_company()">搜索</span>
-                                            </span>
-                                        </div>
-                                    </th>
-                                </form>
-                            </tr>
-                        </table>
+                    <div class="col-xl-7 col-lg-10" id="filter_table">
+                        <form method="GET" action="" accept-charset="UTF-8" id="filter_company">
+                            <div class="row">
+                                <div class="col-sm-2">
+                                    <select name="district" class="form-control" onchange="filter_company()">
+                                        <option value="">所在地区</option>
+                                        @foreach($fields['district'] as $district)
+                                            <option value="{{$district['value']}}"
+                                                    @if($district['value'] == Request::get('district')) selected @endif>{{$district['name']}}</option>
+                                        @endforeach
+                                    </select>
+                                </div>
+                                <div class="col-sm-2">
+                                    <select name="industry[]" data-placeholder="所属行业" class="form-control chosen-select"
+                                            onchange="filter_company()" multiple="" tabindex="-1">
+                                        <option value="">所属行业</option>
+                                        @foreach($fields['industry'] as $industry)
+                                            <option value="{{$industry['value']}}"
+                                                    @if(Request::get('industry') &&  in_array($industry['value'],Request::get('industry')) ) selected @endif>{{$industry['name']}}</option>
+                                        @endforeach
+                                    </select>
+                                </div>
+                                <div class="col-sm-2">
+                                    <select name="regCapital" class="form-control" onchange="filter_company()">
+                                        <option value="">注册资本</option>
+                                        @foreach($fields['regCapital'] as $regCapital)
+                                            <option value="{{$regCapital['value']}}"
+                                                    @if($regCapital['value']== Request::get('regCapital')) selected @endif>{{$regCapital['name']}}</option>
+                                        @endforeach
+                                    </select>
+                                </div>
+                                <div class="col-sm-2">
+                                    <select name="startDate" class="form-control" onchange="filter_company()">
+                                        <option value="">成立年限</option>
+                                        @foreach($fields['startDate'] as $startDate)
+                                            <option value="{{$startDate['value']}}"
+                                                    @if($startDate['value']== Request::get('startDate')) selected @endif>{{$startDate['name']}}</option>
+                                        @endforeach
+                                    </select>
+                                </div>
+                                <div class="col-sm-2">
+                                    <select name="entType" class="form-control" onchange="filter_company()">
+                                        <option value="">企业类型</option>
+                                        @foreach($fields['entType'] as $entType)
+                                            <option value="{{$entType['value']}}"
+                                                    @if($entType['value']== Request::get('entType')) selected @endif>{{$entType['name']}}</option>
+                                        @endforeach
+                                    </select>
+                                </div>
+                                <div class="col-sm-2">
+                                    <select name="openStatus" class="form-control" onchange="filter_company()">
+                                        <option value="">企业状态</option>
+                                        @foreach($fields['openStatus'] as $openStatus)
+                                            <option value="{{$openStatus['value']}}"
+                                                    @if($openStatus['value']== Request::get('openStatus')) selected @endif>{{$openStatus['name']}}</option>
+                                        @endforeach
+                                    </select>
+                                </div>
+
+                            </div>
+                        </form>
+                        {{--<table class="table table-striped table-bordered table-hover dataTables-example dataTable">--}}
+                        {{--<tr>--}}
+                        {{--<th> 过滤条件</th>--}}
+                        {{--<form method="GET" action="" accept-charset="UTF-8" id="filter_company">--}}
+                        {{--{{ csrf_field() }}--}}
+                        {{--<th>--}}
+                        {{--<select name="district" class="form-control" onchange="filter_company()">--}}
+                        {{--<option value="">所在地区</option>--}}
+                        {{--@foreach($fields['district'] as $district)--}}
+                        {{--<option value="{{$district['value']}}"--}}
+                        {{--@if($district['value'] == Request::get('district')) selected @endif>{{$district['name']}}</option>--}}
+                        {{--@endforeach--}}
+                        {{--</select>--}}
+                        {{--</th>--}}
+                        {{--<th>--}}
+                        {{--<select name="industry[]" data-placeholder="所属行业" class="form-control chosen-select" onchange="filter_company()" multiple="" tabindex="-1">--}}
+                        {{--<option value="">所属行业</option>--}}
+                        {{--@foreach($fields['industry'] as $industry)--}}
+                        {{--<option value="{{$industry['value']}}"--}}
+                        {{--@if(Request::get('industry') &&  in_array($industry['value'],Request::get('industry')) ) selected @endif>{{$industry['name']}}</option>--}}
+                        {{--@endforeach--}}
+                        {{--</select>--}}
+                        {{--</th>--}}
+                        {{--<th>--}}
+                        {{--<select name="regCapital" class="form-control" onchange="filter_company()">--}}
+                        {{--<option value="">注册资本</option>--}}
+                        {{--@foreach($fields['regCapital'] as $regCapital)--}}
+                        {{--<option value="{{$regCapital['value']}}"--}}
+                        {{--@if($regCapital['value']== Request::get('regCapital')) selected @endif>{{$regCapital['name']}}</option>--}}
+                        {{--@endforeach--}}
+                        {{--</select>--}}
+                        {{--</th>--}}
+                        {{--<th>--}}
+                        {{--<select name="startDate" class="form-control" onchange="filter_company()">--}}
+                        {{--<option value="">成立年限</option>--}}
+                        {{--@foreach($fields['startDate'] as $startDate)--}}
+                        {{--<option value="{{$startDate['value']}}"--}}
+                        {{--@if($startDate['value']== Request::get('startDate')) selected @endif>{{$startDate['name']}}</option>--}}
+                        {{--@endforeach--}}
+                        {{--</select>--}}
+                        {{--</th>--}}
+                        {{--<th>--}}
+                        {{--<select name="entType" class="form-control" onchange="filter_company()">--}}
+                        {{--<option value="">企业类型</option>--}}
+                        {{--@foreach($fields['entType'] as $entType)--}}
+                        {{--<option value="{{$entType['value']}}"--}}
+                        {{--@if($entType['value']== Request::get('entType')) selected @endif>{{$entType['name']}}</option>--}}
+                        {{--@endforeach--}}
+                        {{--</select>--}}
+                        {{--</th>--}}
+                        {{--<th>--}}
+                        {{--<select name="openStatus" class="form-control" onchange="filter_company()">--}}
+                        {{--<option value="">企业状态</option>--}}
+                        {{--@foreach($fields['openStatus'] as $openStatus)--}}
+                        {{--<option value="{{$openStatus['value']}}"--}}
+                        {{--@if($openStatus['value']== Request::get('openStatus')) selected @endif>{{$openStatus['name']}}</option>--}}
+                        {{--@endforeach--}}
+                        {{--</select>--}}
+                        {{--</th>--}}
+
+                        {{--<th>--}}
+                        {{--<div class="input-group">--}}
+                        {{--<input type="text" class="form-control"--}}
+                        {{--value="{{Request::get('companyName')}}"--}}
+                        {{--placeholder="请输入企业名称"--}}
+                        {{--name="companyName">--}}
+                        {{--<span class="input-group-append">--}}
+                        {{--<span class="btn btn-sm btn-default"--}}
+                        {{--style="height: 100%" onclick="filter_company()">搜索</span>--}}
+                        {{--</span>--}}
+                        {{--</div>--}}
+                        {{--</th>--}}
+                        {{--</form>--}}
+                        {{--</tr>--}}
+                        {{--</table>--}}
                     </div>
 
-                    <div id="company-list">
+                    <div id="company-list"  class="col-xl-7 col-lg-10" style="margin: auto">
                         @include('admin.company.info.data')
                     </div>
 
@@ -243,6 +289,5 @@
         })
 
 
-
     </script>
 @endsection