add

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

@@ -10,6 +10,8 @@
 namespace App\Http\Controllers\Admin\Company;
 
 use App\Http\Controllers\Admin\Controller;
+use App\Models\CompanyInfoModel;
+use App\Models\UserCompanyCollectionModel;
 use Illuminate\Http\Request;
 use App\Repositories\Company\InfoRepository;
 
@@ -28,7 +30,8 @@ class InfoController extends Controller
      * */
     public function search()
     {
-        return view('admin.company.info.search');
+        $fields = (new CompanyInfoModel())->filterFields;
+        return view('admin.company.info.search', compact('fields'));
     }
 
     /**
@@ -49,16 +52,70 @@ class InfoController extends Controller
 
         if ($request->ajax()) {
             $view = view('admin.company.info.data', compact('list'))->render();
-
             return response()->json(['html' => $view]);
-
         }
 
-        return view('admin.company.info.index', compact('list'));
+        $fields = (new CompanyInfoModel())->filterFields;
+
+
+        return view('admin.company.info.index', compact('list', 'fields'));
+    }
+
+    /***
+     * 创建公海
+     * @param Request $request
+     * @return int
+     */
+    public function add_collection(Request $request)
+    {
+        $filter_fields = $request->except('_token');
+
+        $data['user_id'] = \Auth::guard('admin')->user()->id;
+        $data['filter_fields'] = json_encode($filter_fields);
+        $data['name'] = '我的公海';
+
+        UserCompanyCollectionModel::create($data);
+
+        return 200;
     }
 
-    public function collection()
+
+    public function collection(Request $request)
     {
+        if ($request->ajax()) {
+            $search = $request->all();
+
+            $order = array();
+            if (isset($request['sort_field']) && $request['sort_field'] && isset($request['sort_field_by'])) {
+                $order[$request['sort_field']] = $request['sort_field_by'];
+            } else {
+                $order['id'] = 'DESC';
+            }
+
+            $list = $this->repository->searchCompany($search, $order);
+
+            $view = view('admin.company.collection.data', compact('list'))->render();
+            return response()->json(['html' => $view]);
+        }
+
+        $user_id = \Auth::guard('admin')->user()->id;
+        $collection = UserCompanyCollectionModel::where('user_id', $user_id)->first();
+
+        if (count($collection)) {
+            $search = (array)json_decode($collection->filter_fields);
+            $order = array();
+            if (isset($request['sort_field']) && $request['sort_field'] && isset($request['sort_field_by'])) {
+                $order[$request['sort_field']] = $request['sort_field_by'];
+            } else {
+                $order['id'] = 'DESC';
+            }
+
+            $list = $this->repository->searchCompany($search, $order);
+
+            $fields = (new CompanyInfoModel())->filterFields;
+
+            return view('admin.company.collection.index', compact('list', 'fields'));
+        }
 
     }
 

app/Models/CompanyInfoModel.php

@@ -53,13 +53,50 @@ class CompanyInfoModel extends BaseModel
     ];
 
 
-    public function isThread(){
+    public function isThread()
+    {
         $ower_id = \Auth::guard('admin')->user()->id;
-        return UserThreadsModel::where('ower_id',$ower_id)->where('company_id',$this->id)->count();
+        return UserThreadsModel::where('ower_id', $ower_id)->where('company_id', $this->id)->count();
     }
 
-    public function contacts(){
-        return $this->hasMany('App\Models\CompanyContactsModel','company_id');
+    public function contacts()
+    {
+        return $this->hasMany('App\Models\CompanyContactsModel', 'company_id');
     }
 
+    public $filterFields = [
+        'district' => [
+            ['value' => '成都', 'name' => '成都'],
+            ['value' => '上海', 'name' => '上海'],
+            ['value' => '北京', 'name' => '北京'],
+            ['value' => '广州', 'name' => '广州'],
+        ],
+        'industry' => [
+            ['value' => '软件开发', 'name' => '软件开发'],
+            ['value' => '信息传输', 'name' => '信息传输'],
+            ['value' => '批发和零售业', 'name' => '批发和零售业'],
+            ['value' => '软件和信息技术服务业', 'name' => '软件和信息技术服务业'],
+        ],
+        'regCapital' => [
+            ['value' => '-50', 'name' => '小于50万'],
+            ['value' => '50-100', 'name' => '50～100万'],
+            ['value' => '100-500', 'name' => '100～500万'],
+            ['value' => '500-1000', 'name' => '500～1000'],
+            ['value' => '1000-', 'name' => '1000万以上'],
+        ],
+        'startDate' => [
+            ['value' => '2014', 'name' => '2014'],
+            ['value' => '2015', 'name' => '2015'],
+            ['value' => '2016', 'name' => '2016'],
+            ['value' => '2017', 'name' => '2017'],
+        ],
+        'entType' => [
+            ['value' => '有限责任公司', 'name' => '有限责任公司'],
+        ],
+        'openStatus' => [
+            ['value' => '开业', 'name' => '开业'],
+            ['value' => '停业', 'name' => '停业'],
+        ],
+    ];
+
 }

app/Models/UserCompanyCollectionModel.php

@@ -0,0 +1,44 @@
+<?php
+
+namespace App\Models;
+
+use Illuminate\Foundation\Auth\User as Authenticatable;
+use Laravel\Passport\HasApiTokens;
+
+/**
+ * @description
+ * @author  system;
+ * @version    1.0
+ * @date 2017-05-30 12:16:56
+ *
+ */
+class UserCompanyCollectionModel extends Authenticatable
+{
+    use HasApiTokens;
+    /**
+     * 数据表名
+     *
+     * @var string
+     *
+     */
+    protected $table = 'user_company_collection';
+    /**
+     * 主键
+     */
+    protected $primaryKey = 'id';
+
+    //分页
+    protected $perPage = PAGE_NUMS;
+
+    /**
+     * 可以被集体附值的表的字段
+     *
+     * @var string
+     */
+    protected $fillable = [
+        'name',
+        'user_id',
+        'filter_fields'
+    ];
+
+}

database/migrations/2018_12_07_092757_create_user_company_collection_table.php

@@ -0,0 +1,35 @@
+<?php
+
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class CreateUserCompanyCollectionTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('user_company_collection', function (Blueprint $table) {
+            $table->increments('id');
+            $table->string('name')->comment('公海名字');
+            $table->integer('user_id')->comment('所有者ID');
+            $table->text('filter_fields')->comment('过滤字段');
+
+            $table->timestamps();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::dropIfExists('user_company_collection');
+    }
+}

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

@@ -0,0 +1,62 @@
+<table class="table table-striped table-bordered table-hover dataTables-example dataTable">
+    <thead>
+    <tr>
+
+        <th class="sorting" data-sort="id"> ID</th>
+        <th class="sorting" data-sort="companyName"> 企业名称</th>
+        <th class="sorting" data-sort="orgNo"> 组织机构代码</th>
+        <th class="sorting" data-sort="legalPerson"> 法人</th>
+        <th class="sorting" data-sort="openStatus"> 经营状态</th>
+        <th class="sorting" data-sort="startDate"> 成立日期</th>
+        <th class="sorting" data-sort="regCapital"> 注册资本（万元）</th>
+        <th width="22%">相关操作</th>
+    </tr>
+    </thead>
+    <tbody>
+
+
+    @if(isset($list))
+        @foreach($list as $key => $item)
+            <tr>
+
+                <td>{{ $item->id }}</td>
+                <td>{{ $item->companyName }}</td>
+                <td>{{ $item->orgNo }}</td>
+                <td>{{ $item->legalPerson }}</td>
+                <td>{{ $item->openStatus }}</td>
+                <td>{{ $item->startDate }}</td>
+                <td>{{ $item->regCapital }}</td>
+                <td>
+                    @if(role('Company/Info/update') && !$item->isThread())
+                    <button class="btn btn-sm btn-success"
+                    onclick="window.location.href='{{ U('User/Threads/create',['company_id'=>$item->id])}}' ">
+                    领取线索
+                    </button>
+                    @endif
+
+                    @if(role('Company/Info/view'))
+                        <a href="{{ U('Company/Info/view',['id'=>$item->id])}}"
+                           class="btn btn-sm btn-primary "> 查看</a>
+                    @endif
+                </td>
+            </tr>
+        @endforeach
+    @endif
+
+    </tbody>
+</table>
+
+
+<div class="row">
+    <div class="col-sm-6">
+        <div class="dataTables_info" id="DataTables_Table_0_info"
+             role="alert" aria-live="polite" aria-relevant="all">每页{{ $list->count() }}
+            条，共{{ $list->lastPage() }}页，总{{ $list->total() }}条。
+        </div>
+    </div>
+    <div class="col-sm-6">
+        <div class="dataTables_paginate paging_simple_numbers" id="DataTables_Table_0_paginate">
+            {!! $list->setPath('')->appends(Request::all())->render() !!}
+        </div>
+    </div>
+</div>

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

@@ -0,0 +1,175 @@
+@extends('admin.layouts.app')
+@section('header')
+    <style>
+        .company-info {
+            border: 1px solid #eee;
+            padding: 10px 0;
+            margin-bottom: 10px;
+            border-radius: 5px
+        }
+
+        .company-info p {
+            margin-bottom: 0;
+            font-size: 14px
+        }
+
+        .company-info p label {
+            color: #aaa;
+            font-weight: 400
+        }
+
+        .company-info p span {
+            margin-right: 20px;
+            color: #111
+        }
+
+    </style>
+@endsection
+
+@section('content')
+    <div class="row">
+        <div class="col-sm-12">
+            <div class="ibox float-e-margins">
+                <div class="ibox-title">
+                    <h5>挖掘线索</h5>
+
+                    <div class="ibox-tools">
+                        <a class="collapse-link"> <i class="fa fa-chevron-up"></i>
+                        </a>
+                    </div>
+                </div>
+                <div class="ibox-content">
+                    <div class="form-group">
+                        <div class="row">
+                            <div class="col-sm-4">
+
+                            </div>
+
+                            @if(role('Company/Info/collection'))
+                                <div class="col-sm-8 pull-right">
+                                    <span class="btn btn-warning pull-right" onclick="save_collection()">保存为我的公海
+                                    </span>
+                                </div>
+                            @endif
+
+                        </div>
+                    </div>
+
+
+                    <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" class="form-control" onchange="filter_company()">
+                                        <option value="">所属行业</option>
+                                        @foreach($fields['industry'] as $industry)
+                                            <option value="{{$industry['value']}}"
+                                                    @if($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 id="company-list">
+                        @include('admin.company.collection.data')
+                    </div>
+
+                </div>
+            </div>
+        </div>
+    </div>
+@endsection
+
+@section('js')
+    <script type="text/javascript">
+        /*对字段进行过滤*/
+        function filter_company() {
+            data = $('#filter_company').serialize()
+            $.ajax({
+                type: 'get',
+                data: data,
+            }).done(function (data) {
+                $('#company-list').html(data.html)
+            })
+        }
+
+        /*Ajax分页*/
+        $('body').on('click', '.pagination a', function (e) {
+            e.preventDefault();
+            if ($(this).attr('href') != '#') {
+                data = $('#filter_company').serialize()
+                $.ajax({
+                    url: $(this).attr('href'),
+                    type: 'get',
+                    data: data,
+                }).done(function (data) {
+                    $('#company-list').html(data.html)
+                })
+            }
+
+        });
+
+    </script>
+@endsection

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

@@ -1,32 +1,32 @@
-<table class="table table-striped table-bordered table-hover dataTables-example dataTable">
-    <thead>
-    <tr>
-
-        <th class="sorting" data-sort="id"> ID</th>
-        <th class="sorting" data-sort="companyName"> 企业名称</th>
-        <th class="sorting" data-sort="orgNo"> 组织机构代码</th>
-        <th class="sorting" data-sort="legalPerson"> 法人</th>
-        <th class="sorting" data-sort="openStatus"> 经营状态</th>
-        <th class="sorting" data-sort="startDate"> 成立日期</th>
-        <th class="sorting" data-sort="regCapital"> 注册资本（万元）</th>
-        <th width="22%">相关操作</th>
-    </tr>
-    </thead>
-    <tbody>
-
-
-    @if(isset($list))
-        @foreach($list as $key => $item)
-            <tr>
-
-                <td>{{ $item->id }}</td>
-                <td>{{ $item->companyName }}</td>
-                <td>{{ $item->orgNo }}</td>
-                <td>{{ $item->legalPerson }}</td>
-                <td>{{ $item->openStatus }}</td>
-                <td>{{ $item->startDate }}</td>
-                <td>{{ $item->regCapital }}</td>
-                <td>
+{{--<table class="table table-striped table-bordered table-hover dataTables-example dataTable">--}}
+    {{--<thead>--}}
+    {{--<tr>--}}
+
+        {{--<th class="sorting" data-sort="id"> ID</th>--}}
+        {{--<th class="sorting" data-sort="companyName"> 企业名称</th>--}}
+        {{--<th class="sorting" data-sort="orgNo"> 组织机构代码</th>--}}
+        {{--<th class="sorting" data-sort="legalPerson"> 法人</th>--}}
+        {{--<th class="sorting" data-sort="openStatus"> 经营状态</th>--}}
+        {{--<th class="sorting" data-sort="startDate"> 成立日期</th>--}}
+        {{--<th class="sorting" data-sort="regCapital"> 注册资本（万元）</th>--}}
+        {{--<th width="22%">相关操作</th>--}}
+    {{--</tr>--}}
+    {{--</thead>--}}
+    {{--<tbody>--}}
+
+
+    {{--@if(isset($list))--}}
+        {{--@foreach($list as $key => $item)--}}
+            {{--<tr>--}}
+
+                {{--<td>{{ $item->id }}</td>--}}
+                {{--<td>{{ $item->companyName }}</td>--}}
+                {{--<td>{{ $item->orgNo }}</td>--}}
+                {{--<td>{{ $item->legalPerson }}</td>--}}
+                {{--<td>{{ $item->openStatus }}</td>--}}
+                {{--<td>{{ $item->startDate }}</td>--}}
+                {{--<td>{{ $item->regCapital }}</td>--}}
+                {{--<td>--}}
                     {{--@if(role('Company/Info/update') && !$item->isThread())--}}
                     {{--<button class="btn btn-sm btn-success"--}}
                     {{--onclick="window.location.href='{{ U('User/Threads/create',['company_id'=>$item->id])}}' ">--}}
@@ -34,17 +34,62 @@
                     {{--</button>--}}
                     {{--@endif--}}
 
-                    @if(role('Company/Info/view'))
-                        <a href="{{ U('Company/Info/view',['id'=>$item->id])}}"
-                           class="btn btn-sm btn-primary "> 查看</a>
-                    @endif
-                </td>
-            </tr>
-        @endforeach
-    @endif
-
-    </tbody>
-</table>
+                    {{--@if(role('Company/Info/view'))--}}
+                        {{--<a href="{{ U('Company/Info/view',['id'=>$item->id])}}"--}}
+                           {{--class="btn btn-sm btn-primary "> 查看</a>--}}
+                    {{--@endif--}}
+                {{--</td>--}}
+            {{--</tr>--}}
+        {{--@endforeach--}}
+    {{--@endif--}}
+
+    {{--</tbody>--}}
+{{--</table>--}}
+
+
+@if(isset($list))
+    @foreach($list as $key => $item)
+        <div class="col-sm-7" style="margin: auto">
+            <div class="row  company-info">
+                <div class="col-sm-1">
+                    <img src="/base/img/companyAvatar.82b6c75.png" alt="">
+                </div>
+                <div class="col-sm-11">
+                    <a href="{{ U('Company/Info/view',['id'=>$item->id])}}">
+                        <h3>{{ $item->companyName }}</h3>
+                    </a>
+
+                    <p>
+                        <label for="">公司类型：</label>
+                        <span>{{ $item->entType }}</span>
+
+                        <label for="">成立日期：</label>
+                        <span>{{ $item->startDate }}</span>
+
+                        <label for="">注册资本:</label>
+                        <span>{{ $item->regCapital }}</span>
+                    </p>
+
+                    <p>
+                        <label for="">所属行业：</label>
+                        <span>{{ $item->industry }}</span>
+
+                        <label for="">官网：</label>
+                        <span>{{ $item->website }}</span>
+                    </p>
+                    <p>
+                        <label for="">注册地址：</label>
+                        <span>{{ $item->regAddr }}</span>
+                    </p>
+                </div>
+
+            </div>
+        </div>
+
+
+    @endforeach
+@endif
+
 <div class="row">
     <div class="col-sm-6">
         <div class="dataTables_info" id="DataTables_Table_0_info"

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

@@ -1,239 +0,0 @@
-@extends('admin.layouts.app')
-
-@section('content')
-
-    <?php
-    if (!isset($data)) $data = array();
-    if (!$data && session("data")) {
-        $data = session("data");
-    }
-    if (!$data && session('_old_input')) {
-        $data = session("_old_input");
-    }
-    ?>
-    <div class="row">
-        <div class="col-sm-12">
-            <div class="ibox float-e-margins">
-                <div class="ibox-title">
-                    <h5>挖掘线索</h5>
-                    <div class="ibox-tools">
-                        <a class="collapse-link"> <i class="fa fa-chevron-up"></i>
-                        </a>
-                    </div>
-                </div>
-                <div class="ibox-content">
-                    @if(role('Company/Info/index'))
-                        <div class="row">
-                            <div class="col-sm-10 pull-right">
-                                <a href="{{ U('Company/Info/index')}}"
-                                   class="btn btn-sm btn-primary pull-right">返回列表</a>
-                            </div>
-                        </div>
-                    @endif
-
-                    <div class="row">
-                        <div class="col-lg-10">
-                            <form name="form_product" id="form-validation" action=""
-                                  class="form-horizontal form-validation" accept-charset="UTF-8" method="post">
-
-                                <div class="form-group row">
-
-                                    <label class="col-form-label col-sm-3">企业名称</label>
-
-                                    <div class="col-sm-9">
-                                        <input id="data_regNo" name="data[companyName]" class="form-control"
-                                               value="{{ $data['companyName'] or ''}}" required="" aria-required="true"
-                                               placeholder="">
-                                    </div>
-
-                                </div>
-                                <div class="form-group row">
-
-                                    <label class="col-form-label col-sm-3">统一社会信用代码</label>
-
-                                    <div class="col-sm-9">
-                                        <input id="data_regNo" name="data[regNo]" class="form-control"
-                                               value="{{ $data['regNo'] or ''}}" required="" aria-required="true"
-                                               placeholder="">
-                                    </div>
-
-                                </div>
-                                <div class="form-group row">
-
-                                    <label class="col-form-label col-sm-3">组织机构代码</label>
-
-                                    <div class="col-sm-9">
-                                        <input id="data_orgNo" name="data[orgNo]" class="form-control"
-                                               value="{{ $data['orgNo'] or ''}}" required="" aria-required="true"
-                                               placeholder="">
-                                    </div>
-
-                                </div>
-                                <div class="form-group row">
-
-                                    <label class="col-form-label col-sm-3">法人</label>
-
-                                    <div class="col-sm-9">
-                                        <input id="data_legalPerson" name="data[legalPerson]" class="form-control"
-                                               value="{{ $data['legalPerson'] or ''}}" required="" aria-required="true"
-                                               placeholder="">
-                                    </div>
-
-                                </div>
-                                <div class="form-group row">
-
-                                    <label class="col-form-label col-sm-3">经营状态</label>
-
-                                    <div class="col-sm-9">
-                                        <input id="data_openStatus" name="data[openStatus]" class="form-control"
-                                               value="{{ $data['openStatus'] or ''}}" required="" aria-required="true"
-                                               placeholder="">
-                                    </div>
-
-                                </div>
-                                <div class="form-group row">
-
-                                    <label class="col-form-label col-sm-3">成立日期</label>
-
-                                    <div class="col-sm-9">
-                                        <input id="data_startDate" name="data[startDate]" class="form-control"
-                                               value="{{ $data['startDate'] or ''}}" required="" aria-required="true"
-                                               placeholder="">
-                                    </div>
-
-                                </div>
-                                <div class="form-group row">
-
-                                    <label class="col-form-label col-sm-3">营业期限</label>
-
-                                    <div class="col-sm-9">
-                                        <input id="data_openTime" name="data[openTime]" class="form-control"
-                                               value="{{ $data['openTime'] or ''}}" required="" aria-required="true"
-                                               placeholder="">
-                                    </div>
-
-                                </div>
-                                <div class="form-group row">
-
-                                    <label class="col-form-label col-sm-3">审核/年检日期</label>
-
-                                    <div class="col-sm-9">
-                                        <input id="data_annualDate" name="data[annualDate]" class="form-control"
-                                               value="{{ $data['annualDate'] or ''}}" required="" aria-required="true"
-                                               placeholder="">
-                                    </div>
-
-                                </div>
-                                <div class="form-group row">
-
-                                    <label class="col-form-label col-sm-3">注册资本/万元</label>
-
-                                    <div class="col-sm-9">
-                                        <input id="data_regCapital" name="data[regCapital]" class="form-control"
-                                               value="{{ $data['regCapital'] or ''}}" required="" aria-required="true"
-                                               placeholder="">
-                                    </div>
-
-                                </div>
-                                <div class="form-group row">
-
-                                    <label class="col-form-label col-sm-3">企业类型</label>
-
-                                    <div class="col-sm-9">
-                                        <input id="data_entType" name="data[entType]" class="form-control"
-                                               value="{{ $data['entType'] or ''}}" required="" aria-required="true"
-                                               placeholder="">
-                                    </div>
-
-                                </div>
-                                <div class="form-group row">
-
-                                    <label class="col-form-label col-sm-3">所属行业</label>
-
-                                    <div class="col-sm-9">
-                                        <input id="data_industry" name="data[industry]" class="form-control"
-                                               value="{{ $data['industry'] or ''}}" required="" aria-required="true"
-                                               placeholder="">
-                                    </div>
-
-                                </div>
-                                <div class="form-group row">
-
-                                    <label class="col-form-label col-sm-3">行政区域</label>
-
-                                    <div class="col-sm-9">
-                                        <input id="data_district" name="data[district]" class="form-control"
-                                               value="{{ $data['district'] or ''}}" required="" aria-required="true"
-                                               placeholder="">
-                                    </div>
-
-                                </div>
-                                <div class="form-group row">
-
-                                    <label class="col-form-label col-sm-3">登记机关</label>
-
-                                    <div class="col-sm-9">
-                                        <input id="data_authority" name="data[authority]" class="form-control"
-                                               value="{{ $data['authority'] or ''}}" required="" aria-required="true"
-                                               placeholder="">
-                                    </div>
-
-                                </div>
-                                <div class="form-group row">
-
-                                    <label class="col-form-label col-sm-3">所在地址</label>
-
-                                    <div class="col-sm-9">
-                                        <input id="data_regAddr" name="data[regAddr]" class="form-control"
-                                               value="{{ $data['regAddr'] or ''}}" required="" aria-required="true"
-                                               placeholder="">
-                                    </div>
-
-                                </div>
-                                <div class="form-group row">
-
-                                    <label class="col-form-label col-sm-3">经营范围</label>
-
-                                    <div class="col-sm-9">
-                                        {!! editor('') !!}
-
-                                        <script id="container" name="data[scope]"
-                                                type="text/plain">{!! $data['scope'] or '' !!}</script>
-
-                                    </div>
-
-                                </div>
-                                <div class="form-group row">
-
-                                    <label class="col-form-label col-sm-3">网址</label>
-
-                                    <div class="col-sm-9">
-                                        <input id="data_website" name="data[website]" class="form-control"
-                                               value="{{ $data['website'] or ''}}" required="" aria-required="true"
-                                               placeholder="">
-                                    </div>
-
-                                </div>
-
-                                <div class="form-group row">
-                                    <label class="col-form-label col-sm-3">&nbsp;</label>
-                                    <div class="col-sm-9">
-                                        <input type="hidden" name="_referer"
-                                               value="<?php echo urlencode(request()->server('HTTP_REFERER'));?>"/>
-                                        <input type="hidden" name="_token" value="<?php echo csrf_token(); ?>"/>
-                                        <input type="submit" class="btn btn-success" style="margin-right:20px;">
-                                        <input type="reset" class="btn btn-default">
-                                    </div>
-                                </div>
-
-                            </form>
-                        </div>
-                        <!-- /.col-lg-10 -->
-                    </div>
-                    <!-- /.row -->
-                </div>
-            </div>
-        </div>
-    </div>
-
-@endsection

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

@@ -1,4 +1,35 @@
 @extends('admin.layouts.app')
+@section('header')
+    <style>
+        .company-info {
+            border: 1px solid #eee;
+            padding: 10px 0;
+            margin-bottom: 10px;
+            border-radius: 5px
+        }
+
+        .company-info p {
+            margin-bottom: 0;
+            font-size: 14px
+        }
+
+        .company-info p label {
+            color: #aaa;
+            font-weight: 400
+        }
+
+        .company-info p span {
+            margin-right: 20px;
+            color: #111
+        }
+
+        #filter_table {
+            margin: 0 auto 20px auto;
+            border-radius: 5px;
+            border: 1px solid #eee;
+        }
+    </style>
+@endsection
 
 @section('content')
     <div class="row">
@@ -19,82 +50,93 @@
 
                             </div>
 
-                            {{--@if(role('Company/Info/create'))--}}
-                            {{--<div class="col-sm-8 pull-right">--}}
-                            {{--<a href="{{ U('Company/Info/create')}}" class="btn btn-primary pull-right">添加</a>--}}
-                            {{--</div>--}}
-                            {{--@endif--}}
+                            @if(role('Company/Info/collection'))
+                                <div class="col-sm-8 pull-right">
+                                    <span class="btn btn-warning pull-right" onclick="save_collection()">保存为我的公海
+                                    </span>
+                                </div>
+                            @endif
+
                         </div>
                     </div>
 
-                    <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">
-                                <th>
-                                    <select name="district" class="form-control" onchange="filter_company()">
-                                        <option value="">所在地区</option>
-                                        <option value="成都">成都</option>
-                                        <option value="上海">上海</option>
-                                    </select>
-                                </th>
-                                <th>
-                                    <select name="industry" class="form-control" onchange="filter_company()">
-                                        <option value="">所属行业</option>
-                                        <option value="软件开发">软件开发</option>
-                                        <option value="信息传输">信息传输</option>
-                                        <option value="互联网">互联网</option>
-                                        <option value="批发和零售业">批发和零售业</option>
-                                        <option value="软件和信息技术服务业">软件和信息技术服务业</option>
-                                    </select>
-                                </th>
-                                <th>
-                                    <select name="regCapital" class="form-control" onchange="filter_company()">
-                                        <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>
-                                </th>
-                                <th>
-                                    <select name="startDate" class="form-control" onchange="filter_company()">
-                                        <option value="">成立年限</option>
-                                        <option value="2014">2014</option>
-                                        <option value="2017">2017</option>
-                                    </select>
-                                </th>
-                                <th>
-                                    <select name="entType" class="form-control" onchange="filter_company()">
-                                        <option value="">企业类型</option>
-                                        <option value="有限责任公司">有限责任公司(中外合资)</option>
-                                        <option value="有限责任公司(中外合资)">有限责任公司(中外合资)</option>
-                                        <option value="有限责任公司(台港澳法人独资)">有限责任公司(台港澳法人独资)</option>
-                                    </select>
-                                </th>
-                                <th>
-                                    <select name="openStatus" class="form-control" onchange="filter_company()">
-                                        <option value="">企业状态</option>
-                                        <option value="开业">开业</option>
-                                        <option value="">企业状态</option>
-                                    </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">
+                    <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" class="form-control" onchange="filter_company()">
+                                            <option value="">所属行业</option>
+                                            @foreach($fields['industry'] as $industry)
+                                                <option value="{{$industry['value']}}"
+                                                        @if($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>
+                                    </th>
+                                </form>
+                            </tr>
+                        </table>
+                    </div>
 
                     <div id="company-list">
                         @include('admin.company.info.data')
@@ -109,7 +151,7 @@
 @section('js')
     <script type="text/javascript">
         /*对字段进行过滤*/
-        function filter_company(){
+        function filter_company() {
             data = $('#filter_company').serialize()
             $.ajax({
                 type: 'get',
@@ -119,6 +161,22 @@
             })
         }
 
+        /*保存公海*/
+        function save_collection() {
+            data = $('#filter_company').serialize()
+            $.ajax({
+                url: '{{ U('Company/Info/add_collection') }}',
+                type: 'post',
+                data: data,
+                success: function (data) {
+                    if (data == 200) {
+                        layer.msg('保存公海成功！', {icon: 1})
+                    }
+                }
+
+            })
+        }
+
         /*Ajax分页*/
         $('body').on('click', '.pagination a', function (e) {
             e.preventDefault();