field name

app/Exports/ThreadsExport.php

@@ -26,25 +26,25 @@ class ThreadsExport implements FromCollection,WithHeadings
             $contact = $item->contact?$item->contact->phone:'暂无联系人信息';
             $qq = $item->contact?$item->contact->qq:'';
             $email = $item->contact?$item->contact->email:'';
-            $companyName = $item->company->companyName;
+            $company_name = $item->company->company_name;
             $ower_name = $item->ower->real_name;
             $companyWebsite = $item->company->website;
-            $legalPerson = $item->company->legalPerson;
-            $regCapital = $item->company->regCapital;
-            $regAddr = $item->company->regAddr;
+            $legal_person = $item->company->legal_person;
+            $reg_capital = $item->company->reg_capital;
+            $reg_addr = $item->company->reg_addr;
             $lastest = $item->latestProgress();
             $created_at = $item->created_at;
 
-            $base_coll = [$companyName,$contact];
+            $base_coll = [$company_name,$contact];
 
             if(substr_count($this->field,'qq')) array_push($base_coll,$qq);
             if(substr_count($this->field,'email')) array_push($base_coll,$email);
 
             if(substr_count($this->field,'ower_name')) array_push($base_coll,$ower_name);
             if(substr_count($this->field,'website')) array_push($base_coll,$companyWebsite);
-            if(substr_count($this->field,'legalPerson')) array_push($base_coll,$legalPerson);
-            if(substr_count($this->field,'regCapital')) array_push($base_coll, $regCapital);
-            if(substr_count($this->field,'regAddr')) array_push($base_coll,$regAddr);
+            if(substr_count($this->field,'legal_person')) array_push($base_coll,$legal_person);
+            if(substr_count($this->field,'reg_capital')) array_push($base_coll, $reg_capital);
+            if(substr_count($this->field,'reg_addr')) array_push($base_coll,$reg_addr);
             if(substr_count($this->field,'lastest')) array_push($base_coll, $lastest);
             if(substr_count($this->field,'created_at')) array_push($base_coll,$created_at);
 
@@ -62,10 +62,10 @@ class ThreadsExport implements FromCollection,WithHeadings
 
         if(substr_count($this->field,'ower_name')) array_push($head,'线索拥有者');
         if(substr_count($this->field,'website')) array_push($head,'企业网站');
-        if(substr_count($this->field,'legalPerson')) array_push($head,'法人');
+        if(substr_count($this->field,'legal_person')) array_push($head,'法人');
 
-        if(substr_count($this->field,'regCapital')) array_push($head,'注册资本(万)');
-        if(substr_count($this->field,'regAddr')) array_push($head,'注册地址');
+        if(substr_count($this->field,'reg_capital')) array_push($head,'注册资本(万)');
+        if(substr_count($this->field,'reg_addr')) array_push($head,'注册地址');
 
         if(substr_count($this->field,'lastest')) array_push($head,'最新跟进');
         if(substr_count($this->field,'created_at')) array_push($head,'领取时间');

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

@@ -48,8 +48,8 @@ class ThreadsController extends Controller
 
         } else {
             $list = UserThreadsModel::whereHas('company', function ($query) use ($search) {
-                $query->where('companyName', 'like', '%' . $search['keyword'] . '%')
-                    ->orWhere('regNo', 'like', '%' . $search['keyword'] . '%');
+                $query->where('company_name', 'like', '%' . $search['keyword'] . '%')
+                    ->orWhere('reg_no', 'like', '%' . $search['keyword'] . '%');
             })->where('ower_id', $user_id)->orderBy('updated_at', 'desc');
         }
 

app/Imports/CompanyInfoImport.php

@@ -26,13 +26,13 @@ class CompanyInfoImport implements ToCollection, WithChunkReading, ShouldQueue
             if ($key == 0) continue;
             if (strpos($row[0], '国税局') || strpos($row[0], '税务')) {
 
-                $data['companyName'] = $row[3];
-                $data['legalPerson'] = $row[5];
-                $data['startDate'] = str_replace('/', '-', $row[1]);
-                $data['regAddr'] = $row[4];
+                $data['company_name'] = $row[3];
+                $data['legal_person'] = $row[5];
+                $data['start_date'] = str_replace('/', '-', $row[1]);
+                $data['reg_addr'] = $row[4];
                 $data['scope'] = $row[7];
                 $data['industry'] = $row[10];
-                $data['regNo'] = $row[2];
+                $data['reg_no'] = $row[2];
 
                 $res = CompanyInfoModel::create($data);
                 $company_id = $res->id;
@@ -54,16 +54,16 @@ class CompanyInfoImport implements ToCollection, WithChunkReading, ShouldQueue
 
 
             } else {
-                $isExisted = CompanyInfoModel::where('companyName', $row[1])->first();
+                $isExisted = CompanyInfoModel::where('company_name', $row[1])->first();
 
                 if ($isExisted) {
                     $company_id = $isExisted->id;
                 } else {
-                    $data['companyName'] = $row[1];
-                    $data['legalPerson'] = $row[8];
-                    $data['startDate'] = $row[9];
-                    $data['regCapital'] = (int)$row[10];
-                    $data['regAddr'] = $row[11];
+                    $data['company_name'] = $row[1];
+                    $data['legal_person'] = $row[8];
+                    $data['start_date'] = $row[9];
+                    $data['reg_capital'] = (int)$row[10];
+                    $data['reg_addr'] = $row[11];
                     $res = CompanyInfoModel::create($data);
                     $company_id = $res->id;
                 }

app/Models/CompanyContactsModel.php

@@ -39,8 +39,8 @@ class CompanyContactsModel extends BaseModel
         'phone',
         'qq',
         'email',
-        'viaWebsite',
-        'viaLink',
+        'via_website',
+        'via_link',
         'remark',
         'sort',
     ];

app/Models/CompanyInfoModel.php

@@ -34,20 +34,20 @@ class CompanyInfoModel extends BaseModel
      * @var string
      */
     protected $fillable = [
-        'companyName',
-        'regNo',
-        'orgNo',
-        'legalPerson',
-        'openStatus',
-        'startDate',
-        'openTime',
-        'annualDate',
-        'regCapital',
-        'entType',
+        'company_name',
+        'reg_no',
+        'org_no',
+        'legal_person',
+        'open_status',
+        'start_date',
+        'open_time',
+        'annual_date',
+        'reg_capital',
+        'ent_type',
         'industry',
         'district',
         'authority',
-        'regAddr',
+        'reg_addr',
         'scope',
         'website'
     ];
@@ -108,23 +108,23 @@ class CompanyInfoModel extends BaseModel
             ['value' => '批发和零售业', 'name' => '批发和零售业'],
             ['value' => '软件和信息技术服务业', 'name' => '软件和信息技术服务业'],
         ],
-        'regCapital' => [
+        'reg_capital' => [
             ['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' => [
+        'start_date' => [
             ['value' => '2014', 'name' => '2014'],
             ['value' => '2015', 'name' => '2015'],
             ['value' => '2016', 'name' => '2016'],
             ['value' => '2017', 'name' => '2017'],
         ],
-        'entType' => [
+        'ent_type' => [
             ['value' => '有限责任公司', 'name' => '有限责任公司'],
         ],
-        'openStatus' => [
+        'open_status' => [
             ['value' => '开业', 'name' => '开业'],
             ['value' => '停业', 'name' => '停业'],
         ],

app/Repositories/Company/Info/Criteria/MultiWhere.php

@@ -29,20 +29,20 @@ class MultiWhere extends Criteria
     {
         if (isset($this->search['keyword']) && $this->search['keyword']) {
             $model = $model->where('id', 'like', '%' . $this->search['keyword'] . '%')
-                ->orWhere('companyName', 'like', '%' . $this->search['keyword'] . '%')
-                ->orWhere('regNo', 'like', '%' . $this->search['keyword'] . '%')
-                ->orWhere('orgNo', 'like', '%' . $this->search['keyword'] . '%')
-                ->orWhere('legalPerson', 'like', '%' . $this->search['keyword'] . '%')
-                ->orWhere('openStatus', 'like', '%' . $this->search['keyword'] . '%')
-                ->orWhere('startDate', 'like', '%' . $this->search['keyword'] . '%')
-                ->orWhere('openTime', 'like', '%' . $this->search['keyword'] . '%')
-                ->orWhere('annualDate', 'like', '%' . $this->search['keyword'] . '%')
-                ->orWhere('regCapital', 'like', '%' . $this->search['keyword'] . '%')
-                ->orWhere('entType', 'like', '%' . $this->search['keyword'] . '%')
+                ->orWhere('company_name', 'like', '%' . $this->search['keyword'] . '%')
+                ->orWhere('reg_no', 'like', '%' . $this->search['keyword'] . '%')
+                ->orWhere('org_no', 'like', '%' . $this->search['keyword'] . '%')
+                ->orWhere('legal_person', 'like', '%' . $this->search['keyword'] . '%')
+                ->orWhere('open_status', 'like', '%' . $this->search['keyword'] . '%')
+                ->orWhere('start_date', 'like', '%' . $this->search['keyword'] . '%')
+                ->orWhere('open_time', 'like', '%' . $this->search['keyword'] . '%')
+                ->orWhere('annual_date', 'like', '%' . $this->search['keyword'] . '%')
+                ->orWhere('reg_capital', 'like', '%' . $this->search['keyword'] . '%')
+                ->orWhere('ent_type', 'like', '%' . $this->search['keyword'] . '%')
                 ->orWhere('industry', 'like', '%' . $this->search['keyword'] . '%')
                 ->orWhere('district', 'like', '%' . $this->search['keyword'] . '%')
                 ->orWhere('authority', 'like', '%' . $this->search['keyword'] . '%')
-                ->orWhere('regAddr', 'like', '%' . $this->search['keyword'] . '%')
+                ->orWhere('reg_addr', 'like', '%' . $this->search['keyword'] . '%')
                 ->orWhere('scope', 'like', '%' . $this->search['keyword'] . '%')
                 ->orWhere('website', 'like', '%' . $this->search['keyword'] . '%');
         }

app/Repositories/Company/InfoRepository.php

@@ -21,10 +21,10 @@ class InfoRepository extends Repository {
     {
         $currentQuery = $this->model;
         /*企业名称*/
-        if(isset($search['companyName']) && ! empty($search['companyName'])) {
-            $keywords = str_replace(',','|',$search['companyName']);
+        if(isset($search['company_name']) && ! empty($search['company_name'])) {
+            $keywords = str_replace(',','|',$search['company_name']);
             $currentQuery = $currentQuery->where(function ($query) use ($keywords) {
-                $query->where('companyName'  , 'REGEXP', $keywords);
+                $query->where('company_name'  , 'REGEXP', $keywords);
             });
         }
         /*所在地区*/
@@ -37,21 +37,21 @@ class InfoRepository extends Repository {
             });
         }
         /*企业类型*/
-        if(isset($search['entType']) && ! empty($search['entType'])) {
-            $entType = $search['entType'];
-            if (is_array($entType)) $entType = join('|',$entType) ;
+        if(isset($search['ent_type']) && ! empty($search['ent_type'])) {
+            $ent_type = $search['ent_type'];
+            if (is_array($ent_type)) $ent_type = join('|',$ent_type) ;
 
-            $currentQuery = $currentQuery->where(function ($query) use ($entType) {
-                $query->where('entType','REGEXP',$entType);
+            $currentQuery = $currentQuery->where(function ($query) use ($ent_type) {
+                $query->where('ent_type','REGEXP',$ent_type);
             });
         }
         /*经营状态*/
-        if(isset($search['openStatus']) && ! empty($search['openStatus'])) {
-            $openStatus = $search['openStatus'];
-            if (is_array($openStatus)) $openStatus = join('|',$openStatus) ;
+        if(isset($search['open_status']) && ! empty($search['open_status'])) {
+            $open_status = $search['open_status'];
+            if (is_array($open_status)) $open_status = join('|',$open_status) ;
 
-            $currentQuery = $currentQuery->where(function ($query) use ($openStatus) {
-                $query->where('openStatus','REGEXP',$openStatus);
+            $currentQuery = $currentQuery->where(function ($query) use ($open_status) {
+                $query->where('open_status','REGEXP',$open_status);
             });
         }
         /*所属行业*/
@@ -64,15 +64,15 @@ class InfoRepository extends Repository {
             });
         }
         /*注册资本*/
-        if(isset($search['regCapital']) && ! empty($search['regCapital'])) {
-            $regCapital = explode('-',$search['regCapital']);
+        if(isset($search['reg_capital']) && ! empty($search['reg_capital'])) {
+            $reg_capital = explode('-',$search['reg_capital']);
 
-            $currentQuery = $currentQuery->where(function ($query) use ($regCapital) {
-                if(!$regCapital[1]){
-                    $query->where('regCapital','>=',(int)$regCapital[0]);
+            $currentQuery = $currentQuery->where(function ($query) use ($reg_capital) {
+                if(!$reg_capital[1]){
+                    $query->where('reg_capital','>=',(int)$reg_capital[0]);
                 }else{
-                    $query->where('regCapital','>=',(int)$regCapital[0])
-                          ->where('regCapital','<',(int)$regCapital[1]);
+                    $query->where('reg_capital','>=',(int)$reg_capital[0])
+                          ->where('reg_capital','<',(int)$reg_capital[1]);
                 }
             });
         }

database/migrations/2018_11_13_030958_create_company_info_table.php

@@ -15,20 +15,20 @@ class CreateCompanyInfoTable extends Migration
     {
         Schema::create('company_info', function (Blueprint $table) {
             $table->increments('id');
-            $table->string('companyName',255)->comment('公司名称');
-            $table->string('regNo',64)->nullable()->comment('统一社会信用代码');
-            $table->string('orgNo',64)->nullable()->comment('组织机构代码');
-            $table->string('legalPerson',32)->nullable()->comment('法人');
-            $table->string('openStatus',24)->nullable()->comment('经营状态');
-            $table->string('startDate',64)->nullable()->comment('成立日期');
-            $table->string('openTime',64)->nullable()->comment('营业期限');
-            $table->string('annualDate',64)->nullable()->comment('审核/年检日期');
-            $table->string('regCapital',32)->nullable()->comment('注册资本/万元');
-            $table->string('entType',32)->nullable()->comment('企业类型');
+            $table->string('company_name',255)->comment('公司名称');
+            $table->string('reg_no',64)->nullable()->comment('统一社会信用代码');
+            $table->string('org_no',64)->nullable()->comment('组织机构代码');
+            $table->string('legal_person',32)->nullable()->comment('法人');
+            $table->string('open_status',24)->nullable()->comment('经营状态');
+            $table->string('start_date',64)->nullable()->comment('成立日期');
+            $table->string('open_time',64)->nullable()->comment('营业期限');
+            $table->string('annual_date',64)->nullable()->comment('审核/年检日期');
+            $table->string('reg_capital',32)->nullable()->comment('注册资本/万元');
+            $table->string('ent_type',32)->nullable()->comment('企业类型');
             $table->string('industry',64)->nullable()->comment('所属行业');
             $table->string('district',128)->nullable()->comment('行政区域');
             $table->string('authority',128)->nullable()->comment('登记机关');
-            $table->string('regAddr',255)->nullable()->comment('所在地址');
+            $table->string('reg_addr',255)->nullable()->comment('所在地址');
             $table->text('scope')->nullable()->comment('经营范围');
             $table->string('website',255)->nullable()->comment('网址');
 

database/migrations/2018_11_21_022659_create_company_contacts_table.php

@@ -21,8 +21,8 @@ class CreateCompanyContactsTable extends Migration
             $table->string('qq',32)->nullable()->comment('QQ号码');
             $table->string('email',128)->nullable()->comment('邮箱');
             $table->string('address',255)->nullable()->comment('联系地址');
-            $table->string('viaWebsite',255)->nullable()->comment('来源网站');
-            $table->string('viaLink',255)->nullable()->comment('来源链接');
+            $table->string('via_website',255)->nullable()->comment('来源网站');
+            $table->string('via_link',255)->nullable()->comment('来源链接');
             $table->string('remark',255)->nullable()->comment('备注');
             $table->integer('sort')->nullable()->comment('排序：越大越靠前');
 

resources/views/admin/call/records/index.blade.php

@@ -82,7 +82,7 @@
                                            placeholder="请输入电话号码或标签"
                                            name="phone">
                                     <span class="input-group-append">
-                                                <button class="btn btn-sm btn-default"
+                                                <button type="button" class="btn btn-sm btn-default"
                                                       onclick="filter_records()">搜索</button>
                                             </span>
                                 </div>

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

@@ -3,12 +3,12 @@
     <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 class="sorting" data-sort="company_name"> 企业名称</th>
+        <th class="sorting" data-sort="org_no"> 组织机构代码</th>
+        <th class="sorting" data-sort="legal_person"> 法人</th>
+        <th class="sorting" data-sort="open_status"> 经营状态</th>
+        <th class="sorting" data-sort="start_date"> 成立日期</th>
+        <th class="sorting" data-sort="reg_capital"> 注册资本（万元）</th>
         {{--<th width="22%">相关操作</th>--}}
     </tr>
     </thead>
@@ -20,12 +20,12 @@
             <tr>
 
                 <td>{{ $item->id }}</td>
-                <td><a href="{{ U('Company/Info/view',['id'=>$item->id])}}">{{ $item->companyName }}</a></td>
-                <td>{{ $item->orgNo }}</td>
-                <td>{{ $item->legalPerson }}</td>
-                <td>{{ $item->openStatus }}</td>
-                <td>{{ $item->startDate }}</td>
-                <td>{{ $item->regCapital }}</td>
+                <td><a href="{{ U('Company/Info/view',['id'=>$item->id])}}">{{ $item->company_name }}</a></td>
+                <td>{{ $item->org_no }}</td>
+                <td>{{ $item->legal_person }}</td>
+                <td>{{ $item->open_status }}</td>
+                <td>{{ $item->start_date }}</td>
+                <td>{{ $item->reg_capital }}</td>
                 {{--<td>--}}
                     {{--@if(role('Company/Info/update') && !$item->isThread())--}}
                         {{--<button class="btn btn-sm btn-success"--}}

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

@@ -80,38 +80,38 @@
                                     </select>
                                 </th>
                                 <th>
-                                    <select name="regCapital" class="form-control" onchange="filter_company()">
+                                    <select name="reg_capital" 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>
+                                        @foreach($fields['reg_capital'] as $reg_capital)
+                                            <option value="{{$reg_capital['value']}}"
+                                                    @if($reg_capital['value']== Request::get('reg_capital')) selected @endif>{{$reg_capital['name']}}</option>
                                         @endforeach
                                     </select>
                                 </th>
                                 <th>
-                                    <select name="startDate" class="form-control" onchange="filter_company()">
+                                    <select name="start_date" 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>
+                                        @foreach($fields['start_date'] as $start_date)
+                                            <option value="{{$start_date['value']}}"
+                                                    @if($start_date['value']== Request::get('start_date')) selected @endif>{{$start_date['name']}}</option>
                                         @endforeach
                                     </select>
                                 </th>
                                 <th>
-                                    <select name="entType" class="form-control" onchange="filter_company()">
+                                    <select name="ent_type" 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>
+                                        @foreach($fields['ent_type'] as $ent_type)
+                                            <option value="{{$ent_type['value']}}"
+                                                    @if($ent_type['value']== Request::get('ent_type')) selected @endif>{{$ent_type['name']}}</option>
                                         @endforeach
                                     </select>
                                 </th>
                                 <th>
-                                    <select name="openStatus" class="form-control" onchange="filter_company()">
+                                    <select name="open_status" 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>
+                                        @foreach($fields['open_status'] as $open_status)
+                                            <option value="{{$open_status['value']}}"
+                                                    @if($open_status['value']== Request::get('open_status')) selected @endif>{{$open_status['name']}}</option>
                                         @endforeach
                                     </select>
                                 </th>
@@ -119,12 +119,12 @@
                                 <th>
                                     <div class="input-group">
                                         <input type="text" class="form-control"
-                                               value="{{Request::get('companyName')}}"
+                                               value="{{Request::get('company_name')}}"
                                                placeholder="请输入企业名称"
-                                               name="companyName">
+                                               name="company_name">
 
                                         <span class="input-group-append">
-                                                <button class="btn btn-sm btn-default"
+                                                <button type="button" class="btn btn-sm btn-default"
                                                        onclick="filter_company()">搜索</button>
                                             </span>
                                     </div>

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

@@ -37,18 +37,18 @@
                 </div>
                 <div class="col-lg-10 col-md-9 col-sm-8">
                     <a href="{{ U('Company/Info/view',['id'=>$item->id])}}">
-                        <h3>{{ $item->companyName }}</h3>
+                        <h3>{{ $item->company_name }}</h3>
                     </a>
 
                     <p>
                         <label for="">公司类型：</label>
-                        <span>{{ $item->entType }}</span>
+                        <span>{{ $item->ent_type }}</span>
 
                         <label for="">成立日期：</label>
-                        <span>{{ $item->startDate }}</span>
+                        <span>{{ $item->start_date }}</span>
 
                         <label for="">注册资本:</label>
-                        <span>{{ $item->regCapital }}</span>
+                        <span>{{ $item->reg_capital }}</span>
                     </p>
 
                     <p>
@@ -60,7 +60,7 @@
                     </p>
                     <p>
                         <label for="">注册地址：</label>
-                        <span>{{ $item->regAddr }}</span>
+                        <span>{{ $item->reg_addr }}</span>
                     </p>
                 </div>
         </div>

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

@@ -64,8 +64,8 @@
                             <div class="row" style="margin-bottom: 20px">
                                 <div class="col-sm-10 col-sm-offset-2" style="margin: auto">
                                     <input class="tagsinput form-control" type="text"
-                                           name="companyName" style="display: none;width: 100%"
-                                           placeholder="请输入企业名称关键字" value="{{Request::get('companyName')}}">
+                                           name="company_name" style="display: none;width: 100%"
+                                           placeholder="请输入企业名称关键字" value="{{Request::get('company_name')}}">
 
                                          <span class="btn btn-default" style="margin: 5px 6px" onclick="filter_company()">搜索</span>
 
@@ -94,38 +94,38 @@
                                     </select>
                                 </div>
                                 <div class="col-sm-2">
-                                    <select name="regCapital" class="form-control" onchange="filter_company()">
+                                    <select name="reg_capital" 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>
+                                        @foreach($fields['reg_capital'] as $reg_capital)
+                                            <option value="{{$reg_capital['value']}}"
+                                                    @if($reg_capital['value']== Request::get('reg_capital')) selected @endif>{{$reg_capital['name']}}</option>
                                         @endforeach
                                     </select>
                                 </div>
                                 <div class="col-sm-2">
-                                    <select name="startDate" class="form-control" onchange="filter_company()">
+                                    <select name="start_date" 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>
+                                        @foreach($fields['start_date'] as $start_date)
+                                            <option value="{{$start_date['value']}}"
+                                                    @if($start_date['value']== Request::get('start_date')) selected @endif>{{$start_date['name']}}</option>
                                         @endforeach
                                     </select>
                                 </div>
                                 <div class="col-sm-2">
-                                    <select name="entType" class="form-control" onchange="filter_company()">
+                                    <select name="ent_type" 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>
+                                        @foreach($fields['ent_type'] as $ent_type)
+                                            <option value="{{$ent_type['value']}}"
+                                                    @if($ent_type['value']== Request::get('ent_type')) selected @endif>{{$ent_type['name']}}</option>
                                         @endforeach
                                     </select>
                                 </div>
                                 <div class="col-sm-2">
-                                    <select name="openStatus" class="form-control" onchange="filter_company()">
+                                    <select name="open_status" 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>
+                                        @foreach($fields['open_status'] as $open_status)
+                                            <option value="{{$open_status['value']}}"
+                                                    @if($open_status['value']== Request::get('open_status')) selected @endif>{{$open_status['name']}}</option>
                                         @endforeach
                                     </select>
                                 </div>

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

@@ -69,7 +69,7 @@
                             <div class="row">
                                 <div class="col-sm-12">
                                     <input class="tagsinput form-control" type="text"
-                                           name="companyName" value="" style="display: none;width: 100%"
+                                           name="company_name" value="" style="display: none;width: 100%"
                                            placeholder="请输入企业名称关键字">
                                 </div>
                             </div>
@@ -83,11 +83,11 @@
                                         <div>
                                             <select data-placeholder="全部" class="chosen-select"
                                                     style="width: 350px; display: none;" tabindex="-1"
-                                                    name="regCapital">
+                                                    name="reg_capital">
                                                 <option value="">全部</option>
-                                                @foreach($fields['regCapital'] as $regCapital)
-                                                    <option value="{{$regCapital['value']}}"
-                                                            @if($regCapital['value']== Request::get('regCapital')) selected @endif>{{$regCapital['name']}}</option>
+                                                @foreach($fields['reg_capital'] as $reg_capital)
+                                                    <option value="{{$reg_capital['value']}}"
+                                                            @if($reg_capital['value']== Request::get('reg_capital')) selected @endif>{{$reg_capital['name']}}</option>
                                                 @endforeach
                                             </select>
                                         </div>
@@ -121,11 +121,11 @@
                                         <div>
                                             <select data-placeholder="全部" class="chosen-select" multiple=""
                                                     style="width: 350px; display: none;" tabindex="-1"
-                                                    name="entType[]">
+                                                    name="ent_type[]">
                                                 <option value="">全部</option>
-                                                @foreach($fields['entType'] as $entType)
-                                                    <option value="{{$entType['value']}}"
-                                                            @if($entType['value']== Request::get('entType')) selected @endif>{{$entType['name']}}</option>
+                                                @foreach($fields['ent_type'] as $ent_type)
+                                                    <option value="{{$ent_type['value']}}"
+                                                            @if($ent_type['value']== Request::get('ent_type')) selected @endif>{{$ent_type['name']}}</option>
                                                 @endforeach
                                             </select>
                                         </div>

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

@@ -122,7 +122,7 @@
                                         <div class="col-lg-10 col-md-9">
                                             <div class="row">
                                                 <div class="col-md-6">
-                                                    <h3 style="font-weight: 700">{{ $data->companyName }}</h3>
+                                                    <h3 style="font-weight: 700">{{ $data->company_name }}</h3>
                                                 </div>
 
                                                 @if(!$data->isThread())
@@ -135,16 +135,16 @@
 
                                             <div class="row company_baseinfo">
                                                 <div class="col-md-4">
-                                                    <h3><label for="">经营状态：</label>{{ $data->openStatus }}</h3>
+                                                    <h3><label for="">经营状态：</label>{{ $data->open_status }}</h3>
                                                 </div>
                                                 <div class="col-sm-4">
-                                                    <h3><label>成立日期:</label>{{ $data->startDate }}</h3>
+                                                    <h3><label>成立日期:</label>{{ $data->start_date }}</h3>
                                                 </div>
                                                 <div class="col-md-4">
-                                                    <h3><label for="">公司类型：</label>{{ $data->entType }}</h3>
+                                                    <h3><label for="">公司类型：</label>{{ $data->ent_type }}</h3>
                                                 </div>
                                                 <div class="col-md-6">
-                                                    <h3><label for="">企业地址：</label>{{ $data->regAddr }}</h3>
+                                                    <h3><label for="">企业地址：</label>{{ $data->reg_addr }}</h3>
                                                 </div>
 
                                             </div>
@@ -184,48 +184,48 @@
                                                             <div class="form-group row">
                                                                 <div class="col-sm-6">
                                                                     <label for="col-sm-3">统一社会信用代码/注册号:</label>
-                                                                    <span>{{ $data->regNo }}</span>
+                                                                    <span>{{ $data->reg_no }}</span>
 
                                                                 </div>
 
                                                                 <div class="col-sm-6">
                                                                     <label for="col-sm-3">组织机构代码:</label>
-                                                                    <span>{{ $data->orgNo }}</span>
+                                                                    <span>{{ $data->org_no }}</span>
                                                                 </div>
                                                             </div>
 
                                                             <div class="form-group row">
                                                                 <div class="col-sm-6">
                                                                     <label for="col-sm-3">法定代表人:</label>
-                                                                    <span>{{ $data->legalPerson }}</span>
+                                                                    <span>{{ $data->legal_person }}</span>
                                                                 </div>
                                                                 <div class="col-sm-6">
                                                                     <label for="col-sm-3">经营状态:</label>
-                                                                    <span>{{ $data->openStatus }}</span>
+                                                                    <span>{{ $data->open_status }}</span>
                                                                 </div>
 
                                                                 <div class="col-sm-6">
                                                                     <label for="col-sm-3">营业期限:</label>
-                                                                    <span>{{ $data->openTime }}</span>
+                                                                    <span>{{ $data->open_time }}</span>
                                                                 </div>
                                                                 <div class="col-sm-6">
                                                                     <label for="col-sm-3">审核/年检日期:</label>
-                                                                    <span>{{ $data->annualDate }}</span>
+                                                                    <span>{{ $data->annual_date }}</span>
                                                                 </div>
                                                             </div>
 
                                                             <div class="form-group row">
                                                                 <div class="col-sm-6">
                                                                     <label for="col-sm-3">注册资本:</label>
-                                                                    <span>{{ $data->regCapital }}</span>
+                                                                    <span>{{ $data->reg_capital }}</span>
                                                                 </div>
                                                                 <div class="col-sm-6">
                                                                     <label for="col-sm-3">企业类型:</label>
-                                                                    <span>{{ $data->entType }}</span>
+                                                                    <span>{{ $data->ent_type }}</span>
                                                                 </div>
                                                                 {{--<div class="col-sm-6">--}}
                                                                 {{--<label for="col-sm-3">机构类型:</label>--}}
-                                                                {{--<span>{{ $data->annualDate }}</span>--}}
+                                                                {{--<span>{{ $data->annual_date }}</span>--}}
                                                                 {{--</div>--}}
                                                                 <div class="col-sm-6">
                                                                     <label for="col-sm-3">所属行业:</label>
@@ -244,7 +244,7 @@
                                                                 </div>
                                                                 <div class="col-sm-12">
                                                                     <label for="col-sm-3">所在地址:</label>
-                                                                    <span>{{ $data->regAddr }}</span>
+                                                                    <span>{{ $data->reg_addr }}</span>
                                                                 </div>
                                                                 <div class="col-sm-12">
                                                                     <label for="col-sm-3">经营范围:</label>
@@ -398,7 +398,7 @@
                                                             <div><label>电子邮箱：</label><span>{{ $item->email }}</span>
                                                             </div>
 
-                                                            <div><label>来源：</label><span>{{ $item->viaLink }}</span>
+                                                            <div><label>来源：</label><span>{{ $item->via_link }}</span>
                                                             </div>
 
                                                             <div><label>联系地址：</label><span>{{ $item->address }}</span>

resources/views/admin/user/threads/data.blade.php

@@ -29,11 +29,11 @@
                 <td>{{ $item->contact?$item->contact->phone:'暂无联系人信息' }}</td>
                 <td>{{ $item->ower->real_name }}</td>
                 <td>
-                    <a href="{{ U('Company/Info/view',['id'=> $item->company->id]) }}"> {{ $item->company->companyName }} </a>
+                    <a href="{{ U('Company/Info/view',['id'=> $item->company->id]) }}"> {{ $item->company->company_name }} </a>
                 </td>
                 <td><a href="http://{{ $item->company->website }}"
                        target="_blank">{{ $item->company->website }}</a></td>
-                <td>{{ $item->company->regCapital }}</td>
+                <td>{{ $item->company->reg_capital }}</td>
                 <td>{{ $item->latestProgress() }}</td>
                 <td>{{ $item->created_at }}</td>
                 <td>

resources/views/admin/user/threads/index.blade.php

@@ -51,7 +51,7 @@
                                            placeholder="请输入企业名称或电话"
                                            name="keyword">
                                     <span class="input-group-append">
-                                                <button class="btn btn-sm btn-default"
+                                                <button type="button" class="btn btn-sm btn-default"
                                                        onclick="filter_threads()">搜索</button>
                                             </span>
                                 </div>
@@ -168,7 +168,7 @@
                                                 <div class="col-sm-3">
                                                     <div class="checkbox checkbox-success">
                                                         <input class="check-fields" type="checkbox" checked="checked"
-                                                               name="companyName" disabled>
+                                                               name="company_name" disabled>
                                                         <label>
                                                             企业名称
                                                         </label>
@@ -198,7 +198,7 @@
                                                 <div class="col-sm-3">
                                                     <div class="checkbox checkbox-success">
                                                         <input class="check-fields" type="checkbox" checked="checked"
-                                                               name="legalPerson">
+                                                               name="legal_person">
                                                         <label>
                                                             法人
                                                         </label>
@@ -208,7 +208,7 @@
                                                 <div class="col-sm-3">
                                                     <div class="checkbox checkbox-success">
                                                         <input class="check-fields" type="checkbox" checked="checked"
-                                                               name="regCapital">
+                                                               name="reg_capital">
                                                         <label>
                                                             注册资本
                                                         </label>
@@ -218,7 +218,7 @@
                                                 <div class="col-sm-3">
                                                     <div class="checkbox checkbox-success">
                                                         <input class="check-fields" type="checkbox" checked="checked"
-                                                               name="regAddr">
+                                                               name="reg_addr">
                                                         <label>
                                                             注册地址
                                                         </label>