add

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

@@ -8,6 +8,7 @@
  */
 namespace App\Http\Controllers\Admin\User;
 use App\Http\Controllers\Admin\Controller;
+use App\Models\ThreadsProgressModel;
 use Illuminate\Http\Request;
 use App\Repositories\Base\Criteria\OrderBy;
 use App\Repositories\User\Threads\Criteria\MultiWhere;
@@ -66,7 +67,8 @@ class ThreadsController extends Controller
             return $this->_updateSave();
         }
         $data = $this->repository->find($request->get('id'));
-        return view('admin.user.threads.edit',compact('data'));
+        $progress = $data->progress()->orderBy('id','desc')->get();
+        return view('admin.user.threads.edit',compact('data','progress'));
     }
 
     /**
@@ -74,14 +76,13 @@ class ThreadsController extends Controller
      */
     private function _updateSave() {
         $data = (array) request('data');
-        $ok = $this->repository->update(request('id'),$data);
-        if($ok) {
-            $url[] = array('url'=>U( 'User/Threads/index'),'title'=>'返回列表');
-            return $this->showMessage('操作成功',urldecode(request('_referer')));
-        }else{
-            $url[] = array('url'=>U( 'User/Threads/index'),'title'=>'返回列表');
-            return $this->showWarning('操作失败',$url);
-        }
+        ThreadsProgressModel::create($data);
+
+        $progress = ThreadsProgressModel::where('threads_id',$data['threads_id'])->orderBy('id','desc')->get();
+
+        $view = view('admin.user.threads.progress',compact('progress'))->render();
+
+        return response()->json(['html'=>$view]);
     }
 
     public function view(Request $request) {

app/Models/ThreadsProgressModel.php

@@ -0,0 +1,44 @@
+<?php
+
+namespace App\Models;
+
+use App\Models\BaseModel;
+
+/**
+ * @description 我的线索
+ * @author  system;
+ * @version    1.0
+ * @date 2018-11-20 02:55:06
+ *
+ */
+class ThreadsProgressModel extends BaseModel
+{
+    /**
+     * 数据表名
+     *
+     * @var string
+     *
+     */
+    protected $table = 'threads_progress';
+    /**
+     * 主键
+     */
+    protected $primaryKey = 'id';
+
+    //分页
+    protected $perPage = PAGE_NUMS;
+
+    /**
+     * 可以被集体附值的表的字段
+     *
+     * @var string
+     */
+    protected $fillable = [
+        'threads_id',
+        'remark'
+    ];
+
+
+
+
+}

app/Models/UserInfoModel.php

@@ -44,8 +44,4 @@ class UserInfoModel extends Authenticatable
         'sex',
     ];
 
-    public function path(){
-        return route('/admin/User/Info/update/') . $this->id;
-    }
-
 }

app/Models/UserThreadsModel.php

@@ -51,4 +51,11 @@ class UserThreadsModel extends BaseModel
         return $this->belongsTo('App\Models\AdminUserModel','ower_id');
     }
 
+    /*
+     * 获得线索的进度
+     * */
+    public function progress(){
+        return $this->hasMany('App\Models\ThreadsProgressModel','threads_id');
+    }
+
 }

app/Repositories/Company/InfoRepository.php

@@ -46,7 +46,7 @@ class InfoRepository extends Repository {
         }
         if(isset($search['industry']) && ! empty($search['industry'])) {
             $currentQuery = $currentQuery->where(function ($query) use ($search) {
-                $query->where('industry',$search['industry']);
+                $query->where('industry','like','%'.$search['industry'].'%');
             });
         }
 

database/migrations/2018_11_23_065953_create_threads_progress_table.php

@@ -0,0 +1,34 @@
+<?php
+
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class CreateThreadsProgressTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('threads_progress', function (Blueprint $table) {
+            $table->increments('id');
+            $table->integer('threads_id')->comment('线索ID');
+            $table->string('remark',255)->nullable()->comment('进度备注');
+
+            $table->timestamps();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::dropIfExists('threads_progress');
+    }
+}

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

@@ -27,12 +27,12 @@
                 <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/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])}}"

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

@@ -42,7 +42,10 @@
                                     <select name="industry" class="form-control filter_company">
                                         <option value="">所属行业</option>
                                         <option value="软件开发">软件开发</option>
+                                        <option value="信息传输">信息传输</option>
                                         <option value="互联网">互联网</option>
+                                        <option value="批发和零售业">批发和零售业</option>
+                                        <option value="软件和信息技术服务业">软件和信息技术服务业</option>
                                     </select>
                                 </th>
                                 <th>
@@ -63,6 +66,7 @@
                                 <th>
                                     <select name="entType" class="form-control filter_company">
                                         <option value="">企业类型</option>
+                                        <option value="有限责任公司">有限责任公司(中外合资)</option>
                                         <option value="有限责任公司(中外合资)">有限责任公司(中外合资)</option>
                                         <option value="有限责任公司(台港澳法人独资)">有限责任公司(台港澳法人独资)</option>
                                     </select>

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

@@ -229,27 +229,45 @@
 
                             <div class="col-md-3">
                                 <div class="panel-body">
-                                    <h3>联系方式</h3>
+                                    <h3>联系方式：</h3>
                                 </div>
                                 <div class="col-md-10">
                                     <ul class="sortable-list connectList agile-list ui-sortable">
-                                        @foreach($contacts as $item)
-                                            <li class="success-element">
-                                                <div class="agile-detail">
-                                                    <div><label><i class="fa fa-phone" style="font-size: 20px;margin-right: 50px"></i></label>
-                                                        <span> {{ $item->phone }}</span></div>
+                                        @if(count($contacts))
+                                            @foreach($contacts as $item)
+                                                <li class="success-element">
+                                                    <div class="agile-detail">
+                                                        <div><label><i class="fa fa-phone"
+                                                                       style="font-size: 20px;margin-right: 50px"></i></label>
+                                                            <span> {{ $item->phone }}</span></div>
+
+                                                        <div><label>联系人：</label><span>{{ $item->linkman }}</span>
+                                                        </div>
 
-                                                    <div><label>联系人：</label><span>{{ $item->linkman }}</span>
-                                                    </div>
+                                                        <div><label>QQ号码：</label><span>{{ $item->qq }}</span></div>
 
-                                                    <div><label>QQ号码：</label><span>{{ $item->qq }}</span></div>
+                                                        <div><label>电子邮箱：</label><span>{{ $item->email }}</span>
+                                                        </div>
 
-                                                    <div><label>电子邮箱：</label><span>{{ $item->email }}</span>
+                                                        @if(!$data->isThread())
+                                                            <a href='{{ U('User/Threads/create',['company_id'=>$data->id])}}'
+                                                               class="btn btn-primary btn-rounded btn-block">领取线索</a>
+                                                        @endif
                                                     </div>
-
-                                                </div>
+                                                </li>
+                                            @endforeach
+                                        @else
+                                            <li class="success-element">
+                                                @if(!$data->isThread())
+                                                    <div class="agile-detail" style="text-align: center">
+                                                    <textarea name="remark" id="" style="width: 100%;height: 100px"
+                                                              placeholder="备注..."></textarea>
+                                                        <a href='{{ U('User/Threads/create',['company_id'=>$data->id])}}'
+                                                           class="btn btn-primary btn-rounded btn-block">领取线索</a>
+                                                    </div>
+                                                @endif
                                             </li>
-                                        @endforeach
+                                        @endif
                                     </ul>
                                 </div>
 
@@ -264,4 +282,8 @@
         </div>
 
     </div>
+@endsection
+
+@section('js')
+
 @endsection

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

@@ -15,76 +15,33 @@
         <div class="col-sm-12">
             <div class="ibox float-e-margins">
                 <div class="ibox-title">
-                    <h5>我的线索</h5>
+                    <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('User/Threads/index'))
-                        <div class="row">
-                            <div class="col-sm-10 pull-right">
-                                <a href="{{ U('User/Threads/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_ower_id" name="data[ower_id]" class="form-control" value="{{ $data['ower_id'] or ''}}" required="" aria-required="true"  placeholder=""> 
-                    </div>
-                                
-                </div>    
-                <div class="form-group row">
-                                    
-                 <label class="col-form-label col-sm-3">企业ID</label>
-                                    
-                   <div class="col-sm-9">
-                     <input id="data_company_id" name="data[company_id]" class="form-control" value="{{ $data['company_id'] 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_status" name="data[status]" class="form-control" value="{{ $data['status'] 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_remark" name="data[remark]" class="form-control" value="{{ $data['remark'] 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>
+                                    <textarea name="data[remark]" id="remark"
+                                              style="width: 100%;height: 80px;margin-bottom: 8px" required></textarea>
+                                    <br/>
+                                    <input type="hidden" name="data[threads_id]" value="{{ $data['id'] }}">
+                                    {{ csrf_field() }}
 
+                                </div>
                             </form>
+                            <button class="btn btn-primary btn-rounded btn-block" onclick="addProgress()">添加进度</button>
+                            <div id="progress_list">
+                                @include('admin.user.threads.progress')
+                            </div>
                         </div>
                         <!-- /.col-lg-10 -->
                     </div>
@@ -94,4 +51,27 @@
         </div>
     </div>
 
+@endsection
+
+@section('js')
+    <script type="text/javascript">
+        function addProgress(){
+            data = $("#form-validation").serialize()
+            if(!$('#remark').val()){
+                layer.alert('请填写跟进内容')
+            }else {
+                $.ajax({
+                    type: 'post',
+                    data: data,
+                    dataType: "json",
+                    success:function (data) {
+                        $('#remark').val('')
+                        $('#progress_list').html(data.html)
+                    }
+                })
+            }
+
+        }
+
+    </script>
 @endsection

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

@@ -46,7 +46,7 @@
                             <th class="sorting">企业网址</th>
                             <th class="sorting">注册资本</th>
                             <th class="sorting" data-sort="status"> 线索状态</th>
-                            <th class="sorting" data-sort="created_at"> 创建时间</th>
+                            <th class="sorting" data-sort="created_at"> 领取时间</th>
                             <th width="22%">相关操作</th>
                         </tr>
                         </thead>
@@ -67,9 +67,8 @@
                                     <td>{{ $item->created_at }}</td>
                                     <td>
                                         @if(role('User/Threads/update'))
-                                            <button class="btn btn-sm btn-success"
-                                                    onclick="window.location.href='{{ U('User/Threads/update',['id'=>$item->id])}}' ">
-                                                修改
+                                            <button onclick="layer.open({type: 2,area: ['25%', '60%'],content: '{{ U('User/Threads/update',['id'=>$item->id])}}'});"
+                                                    class="btn btn-sm btn-primary ">跟进
                                             </button>
 
                                         @endif
@@ -81,9 +80,7 @@
                                         @endif
 
                                         @if(role('User/Threads/view'))
-                                            <button onclick="layer.open({type: 2,area: ['80%', '90%'],content: '{{ U('User/Threads/view',['id'=>$item->id])}}'});"
-                                                    class="btn btn-sm btn-primary ">查看
-                                            </button>
+
                                         @endif
                                     </td>
                                 </tr>

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

@@ -0,0 +1,16 @@
+<div class="ibox-content inspinia-timeline">
+        @foreach($progress as $item)
+        <div class="timeline-item">
+                <div class="row">
+                        <div class="col-xs-2 date">
+                                <i class="fa fa-file-text"></i>
+                                {{$item->created_at}}
+                        </div>
+                        <div class="col-xs-7 content">
+                                <p> {{$item->remark}}</p>
+                        </div>
+                </div>
+        </div>
+        @endforeach
+</div>
+