add label

app/Http/Controllers/Admin/Call/ListController.php

@@ -150,10 +150,12 @@ class ListController extends Controller
      */
     public function syncAdd(Request $request)
     {
+        $ip = $request->get('ip');
+        $label = $request->get('label');
+
         /*从线索导入*/
         if (count($request->get('thread_ids'))) {
             $thread_ids = $request->get('thread_ids');
-            $ip = $request->get('ip');
 
             foreach ($thread_ids as $thread_id) {
                 $thread = UserThreadsModel::find($thread_id);
@@ -161,7 +163,7 @@ class ListController extends Controller
                     $phone = $thread->contact->phone;
                     $hasAdd = CallListModel::where('phone', $phone)->where('sync', 0)->count();
                     if (!$hasAdd) {
-                        CallListModel::create(['phone' => $phone, 'sync' => 0, 'ip' => $ip]);
+                        CallListModel::create(['phone' => $phone, 'sync' => 0, 'ip' => $ip,'label' =>$label]);
                         ThreadsProgressModel::create(['threads_id' => $thread->id, 'remark' => '添加到AI电话列表']);
                     }
 
@@ -173,14 +175,12 @@ class ListController extends Controller
         if (count($request->get('contact_phones'))) {
             $ids = $request->get('contact_phones');
 
-            $ip = $request->get('ip');
-
             $phones = CallRecordsModel::whereIn('id', $ids)->get();
 
             foreach ($phones as $phone) {
                 $hasAdd = CallListModel::where('phone', $phone->phone)->where('sync', 0)->count();
                 if (!$hasAdd) {
-                    CallListModel::create(['phone' => $phone->phone, 'sync' => 0, 'ip' => $ip]);
+                    CallListModel::create(['phone' => $phone->phone, 'sync' => 0, 'ip' => $ip, 'label' =>$label]);
                 }
 
 
@@ -190,7 +190,6 @@ class ListController extends Controller
         /*从公海导入*/
         if (count($request->get('contact_ids'))) {
             $contact_ids = $request->get('contact_ids');
-            $ip = $request->get('ip');
 
             foreach ($contact_ids as $contact_id) {
                 $contact = CompanyContactsModel::find($contact_id);
@@ -198,7 +197,7 @@ class ListController extends Controller
 
                 $hasAdd = CallListModel::where('phone', $phone)->where('sync', 0)->count();
                 if (!$hasAdd) {
-                    CallListModel::create(['phone' => $phone, 'sync' => 0, 'ip' => $ip]);
+                    CallListModel::create(['phone' => $phone, 'sync' => 0, 'ip' => $ip, 'label' =>$label]);
                 }
 
             }

app/Http/Controllers/Admin/Call/RecordsController.php

@@ -149,7 +149,6 @@ class RecordsController extends Controller
                 CallListModel::create(['phone' => $phone->phone, 'sync' => 0, 'ip' => $ip]);
             }
 
-
         }
         return 200;
     }

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

@@ -100,6 +100,23 @@ class ThreadsController extends Controller
         }
     }
 
+    public function syncAdd(Request $request)
+    {
+        $ower_id = \Auth::guard('admin')->user()->id;
+        $label = $request->get('label');
+        $contacts_ids = $request->get('company_ids');
+        foreach ($contacts_ids as $contacts_id) {
+            $company_id = CompanyContactsModel::find($contacts_id)->company_id;
+            $this->repository->create([
+                'ower_id' => $ower_id,
+                'label' => $label,
+                'contact_id' => $contacts_id,
+                'company_id' => $company_id,
+                'status' => 0
+            ]);
+        }
+        return 200;
+    }
 
     /**
      * 添加线索跟进
@@ -179,15 +196,15 @@ class ThreadsController extends Controller
      */
     public function export_threads(Request $request)
     {
-        $type =  $request->get('type');
-        if($type){
+        $type = $request->get('type');
+        if ($type) {
             return 200;
         }
 
         $thread_ids = $request->get('threads_ids');
 
         $threads = UserThreadsModel::whereIn('id', $thread_ids)->get();
-        $fileds =$request->get('check_fields');
+        $fileds = $request->get('check_fields');
 
         return Excel::download(new ThreadsExport($threads, $fileds), '我的线索.xlsx');
     }

app/Repositories/Call/ListRepository.php

@@ -23,7 +23,9 @@ class ListRepository extends Repository {
         if (isset($search['keyword']) && !empty($search['keyword'])) {
             $keywords = '%'.$search['keyword'].'%';
             $currentQuery = $currentQuery->where(function ($query) use ($keywords) {
-                $query->where('ip','like', $keywords)->orWhere('phone','like', $keywords);
+                $query->where('ip','like', $keywords)
+                    ->orWhere('phone','like', $keywords)
+                    ->orWhere('label','like', $keywords);
             });
         };
 

resources/views/admin/call/list/data.blade.php

@@ -9,6 +9,7 @@
         <th class="sorting" data-sort="phone"> 电话号码</th>
         <th class="sorting" data-sort="ip"> 拨打IP</th>
         <th class="sorting" data-sort="sync"> 是否同步到拨打列表：</th>
+        <th class="sorting" data-sort="sync"> 标签：</th>
         <th class="sorting" data-sort="created_at"> 添加时间</th>
         <th class="sorting" data-sort="updated_at"> 更新时间</th>
         <th width="22%">相关操作</th>
@@ -26,6 +27,7 @@
                 <td>{{ $item->phone }}</td>
                 <td>{{ $item->ip }}</td>
                 <td>{{ dict()->get('call_list','sync',$item->sync) }}</td>
+                <td>{{ $item->label }}</td>
                 <td>{{ $item->created_at }}</td>
                 <td>{{ $item->updated_at }}</td>
                 <td>

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

@@ -13,7 +13,7 @@
         <th class="sorting" data-sort="term_status"> 接通状态</th>
         <th class="sorting" data-sort="hangup_dispostion"> 挂断原因</th>
         <th class="sorting" data-sort="ip"> 拨打IP</th>
-        <th class="sorting" data-sort="tag"> 标签</th>
+        <th class="sorting" data-sort="tag"> 机器人标签</th>
         <th width="22%">相关操作</th>
     </tr>
     </thead>

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

@@ -109,22 +109,34 @@
             <div class="modal-dialog">
                 <div class="modal-content animated flipInY">
                     <div class="modal-header">
-                        <h4 class="modal-title">选择拨打的IP</h4></div>
+                        <h4 class="modal-title">添加到待导列表</h4></div>
                     <small class="font-bold">
                         <div class="modal-body">
                             <div class="ibox float-e-margins">
                                 <div class="ibox-content">
-                                    <select name="ip" class="form-control" id="ip">
-                                        <option value="172.31.20.181">172.31.20.181</option>
-                                        <option value="172.31.20.182">172.31.20.182</option>
-                                        <option value="172.31.20.183">172.31.20.183</option>
-                                        <option value="172.31.20.184">172.31.20.184</option>
-                                        <option value="172.31.20.185">172.31.20.185</option>
-                                        <option value="172.31.20.186">172.31.20.186</option>
-                                        <option value="172.31.20.187">172.31.20.187</option>
-                                        <option value="172.31.20.188">172.31.20.188</option>
-
-                                    </select>
+                                    <div class="form-group">
+                                        <label>&nbsp;标签</label>
+                                        <div class="col-sm-9">
+                                            <input type="text" name="label" id="calllist_label" class="form-control">
+
+                                        </div>
+                                    </div>
+
+                                    <div class="form-group">
+                                        <label>&nbsp;拨打IP：</label>
+
+                                        <select name="ip" class="form-control" id="ip">
+                                            <option value="172.31.20.181">172.31.20.181</option>
+                                            <option value="172.31.20.182">172.31.20.182</option>
+                                            <option value="172.31.20.183">172.31.20.183</option>
+                                            <option value="172.31.20.184">172.31.20.184</option>
+                                            <option value="172.31.20.185">172.31.20.185</option>
+                                            <option value="172.31.20.186">172.31.20.186</option>
+                                            <option value="172.31.20.187">172.31.20.187</option>
+                                            <option value="172.31.20.188">172.31.20.188</option>
+
+                                        </select>
+                                    </div>
 
                                     <div class="form-group">
                                         <label class="control-label col-sm-3">&nbsp;</label>
@@ -215,11 +227,12 @@
             contact_phones = checkedIds;
             csrf_token = "{{ csrf_token() }}";
             ip = $('#ip').val()
+            label = $('#calllist_label').val()
 
             $.ajax({
                 type: 'post',
                 url: '{{ U('Call/List/syncAdd') }}',
-                data: {_token: csrf_token, ip: ip,contact_phones: contact_phones},
+                data: {_token: csrf_token, ip: ip,contact_phones: contact_phones,label:label},
                 success: function (data) {
                     if (data == 200) {
                         layer.msg('导入成功', {

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

@@ -47,7 +47,8 @@
 
                             <div class="col-sm-8 pull-right">
                                 @if(role('Call/Threads/create'))
-                                    <span class="btn btn-info pull-right fa fa-user" id="addthread" style="display: none">
+                                    <span class="btn btn-info pull-right fa fa-user" data-toggle="modal"
+                                          data-target="#myModal" style="display: none">
                                         添加到我的线索
                                     </span>
 
@@ -149,27 +150,80 @@
         </div>
 
 
+        <div class="modal inmodal" id="myModal" tabindex="-1" role="dialog" aria-hidden="true">
+            <div class="modal-dialog">
+                <div class="modal-content animated flipInY">
+                    <div class="modal-header">
+                        <h4 class="modal-title">添加到我的线索</h4></div>
+                    <small class="font-bold">
+                        <div class="modal-body">
+                            <div class="ibox float-e-margins">
+                                <div class="ibox-content">
+                                    <div class="form-group">
+                                        <label class="control-label col-sm-3">&nbsp;标签</label>
+                                        <div class="col-sm-9">
+                                            <input type="text" name="label" id="thread_label" class="form-control">
+
+                                        </div>
+                                    </div>
+
+
+                                    <div class="form-group">
+                                        <label class="control-label col-sm-3">&nbsp;</label>
+                                        <div class="col-sm-9">
+                                            <input type="submit" class="btn btn-success" style="margin-right:20px;"
+                                                   id="addThread">
+                                            <input type="reset" class="btn btn-default">
+                                        </div>
+                                    </div>
+
+                                </div>
+                            </div>
+                        </div>
+                        <div class="modal-footer">
+                            <button type="button" class="btn btn-white" data-dismiss="modal">关闭</button>
+                        </div>
+                    </small>
+                </div>
+                <small class="font-bold">
+                </small>
+            </div>
+            <small class="font-bold">
+            </small>
+        </div>
+
         <div class="modal inmodal" id="myModal2" tabindex="-1" role="dialog" aria-hidden="true">
             <div class="modal-dialog">
                 <div class="modal-content animated flipInY">
                     <div class="modal-header">
-                        <h4 class="modal-title">选择拨打的IP</h4></div>
+                        <h4 class="modal-title">添加到待导列表</h4></div>
                     <small class="font-bold">
                         <div class="modal-body">
                             <div class="ibox float-e-margins">
                                 <div class="ibox-content">
-                                    <select name="ip" class="form-control" id="ip">
-                                        <option value="172.31.20.181">172.31.20.181</option>
-                                        <option value="172.31.20.182">172.31.20.182</option>
-                                        <option value="172.31.20.183">172.31.20.183</option>
-                                        <option value="172.31.20.184">172.31.20.184</option>
-                                        <option value="172.31.20.185">172.31.20.185</option>
-                                        <option value="172.31.20.186">172.31.20.186</option>
-                                        <option value="172.31.20.187">172.31.20.187</option>
-                                        <option value="172.31.20.188">172.31.20.188</option>
+                                    <div class="form-group">
+                                        <label>&nbsp;标签</label>
+                                        <div class="col-sm-9">
+                                            <input type="text" name="label" id="calllist_label" class="form-control">
 
-                                    </select>
+                                        </div>
+                                    </div>
 
+                                    <div class="form-group">
+                                        <label>&nbsp;拨打IP：</label>
+
+                                        <select name="ip" class="form-control" id="ip">
+                                            <option value="172.31.20.181">172.31.20.181</option>
+                                            <option value="172.31.20.182">172.31.20.182</option>
+                                            <option value="172.31.20.183">172.31.20.183</option>
+                                            <option value="172.31.20.184">172.31.20.184</option>
+                                            <option value="172.31.20.185">172.31.20.185</option>
+                                            <option value="172.31.20.186">172.31.20.186</option>
+                                            <option value="172.31.20.187">172.31.20.187</option>
+                                            <option value="172.31.20.188">172.31.20.188</option>
+
+                                        </select>
+                                    </div>
                                     <div class="form-group">
                                         <label class="control-label col-sm-3">&nbsp;</label>
                                         <div class="col-sm-9">
@@ -232,14 +286,15 @@
         $('body').on('click', '.contactlist', function () {
             checkedLength = $('.contactlist:checked').length
             if (checkedLength) {
-                $('#addthread').show()
+                $('.fa-user').show()
                 $('.fa-phone').show()
             } else {
-                $('#addthread').hide()
+                $('.fa-user').hide()
                 $('.fa-phone').hide()
             }
             saveChecked($(this))
         });
+
         /*保存选中的项*/
         function saveChecked(e) {
             if (e.is(":checked") && checkedIds.indexOf(e.data("id"), 0) == -1) {
@@ -260,11 +315,12 @@
             contact_ids = checkedIds;
             csrf_token = "{{ csrf_token() }}";
             ip = $('#ip').val()
+            label = $('#calllist_label').val()
 
             $.ajax({
                 type: 'post',
                 url: '{{ U('Call/List/syncAdd') }}',
-                data: {_token: csrf_token, ip: ip, contact_ids: contact_ids},
+                data: {_token: csrf_token, ip: ip, contact_ids: contact_ids, label: label},
                 success: function (data) {
                     if (data == 200) {
                         layer.msg('导入成功', {
@@ -280,8 +336,29 @@
             })
         });
 
-        /*添加到待导列表*/
-        $('body').on('click', '#addCallList', function () {
+        /*添加到我的线索*/
+        $('body').on('click', '#addThread', function () {
+            company_ids = checkedIds
+            csrf_token = "{{ csrf_token() }}";
+            label = $('#thread_label').val();
+
+            $.ajax({
+                type: 'post',
+                url: '{{ U('User/Threads/syncAdd') }}',
+                data: {_token: csrf_token, company_ids: company_ids, label: label},
+                success: function (data) {
+                    if (data == 200) {
+                        layer.msg('导入成功', {
+                            icon: 1,
+                            time: 2000 //2秒关闭（如果不配置，默认是3秒）
+                        }, function () {
+                            window.location.href = window.location.href
+                        });
+
+                    }
+                }
+
+            })
 
         })
 

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

@@ -7,11 +7,13 @@
         </th>
         <th class="sorting" data-sort="id"> ID</th>
         <th class="sorting"> 联系方式</th>
+        <th class="sorting"> 联系人姓名</th>
         <th class="sorting" data-sort="ower_id"> 线索拥有者</th>
         <th class="sorting">企业名称</th>
         <th class="sorting">企业网址</th>
         <th class="sorting">注册资本</th>
         <th class="sorting"> 最新跟进</th>
+        <th class="sorting"> 标签</th>
         <th class="sorting" data-sort="created_at"> 领取时间</th>
         <th width="22%">相关操作</th>
     </tr>
@@ -27,6 +29,7 @@
                 </td>
                 <td>{{ $item->id }}</td>
                 <td>{{ $item->contact?$item->contact->phone:'暂无联系人信息' }}</td>
+                <td>{{ $item->contact?$item->contact->linkman:'' }}</td>
                 <td>{{ $item->ower->real_name }}</td>
                 <td>
                     <a href="{{ U('Company/Info/view',['id'=> $item->company->id]) }}"> {{ $item->company->company_name }} </a>
@@ -35,6 +38,7 @@
                        target="_blank">{{ $item->company->website }}</a></td>
                 <td>{{ $item->company->reg_capital }}</td>
                 <td>{{ $item->latestProgress() }}</td>
+                <td>{{ $item->label }}</td>
                 <td>{{ $item->created_at }}</td>
                 <td>
                     @if(role('User/Threads/update'))

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

@@ -73,22 +73,33 @@
             <div class="modal-dialog">
                 <div class="modal-content animated flipInY">
                     <div class="modal-header">
-                        <h4 class="modal-title">选择拨打的IP</h4></div>
+                        <h4 class="modal-title">添加到待导列表</h4></div>
                     <small class="font-bold">
                         <div class="modal-body">
                             <div class="ibox float-e-margins">
                                 <div class="ibox-content">
-                                    <select name="ip" class="form-control" id="ip">
-                                        <option value="172.31.20.181">172.31.20.181</option>
-                                        <option value="172.31.20.182">172.31.20.182</option>
-                                        <option value="172.31.20.183">172.31.20.183</option>
-                                        <option value="172.31.20.184">172.31.20.184</option>
-                                        <option value="172.31.20.185">172.31.20.185</option>
-                                        <option value="172.31.20.186">172.31.20.186</option>
-                                        <option value="172.31.20.187">172.31.20.187</option>
-                                        <option value="172.31.20.188">172.31.20.188</option>
-
-                                    </select>
+                                    <div class="form-group">
+                                        <label>&nbsp;标签</label>
+                                        <div class="col-sm-9">
+                                            <input type="text" name="label" id="calllist_label" class="form-control">
+
+                                        </div>
+                                    </div>
+
+                                    <div class="form-group">
+                                        <label>&nbsp;拨打IP：</label>
+                                        <select name="ip" class="form-control" id="ip">
+                                            <option value="172.31.20.181">172.31.20.181</option>
+                                            <option value="172.31.20.182">172.31.20.182</option>
+                                            <option value="172.31.20.183">172.31.20.183</option>
+                                            <option value="172.31.20.184">172.31.20.184</option>
+                                            <option value="172.31.20.185">172.31.20.185</option>
+                                            <option value="172.31.20.186">172.31.20.186</option>
+                                            <option value="172.31.20.187">172.31.20.187</option>
+                                            <option value="172.31.20.188">172.31.20.188</option>
+
+                                        </select>
+                                    </div>
 
                                     <div class="form-group">
                                         <label class="control-label col-sm-3">&nbsp;</label>
@@ -381,11 +392,12 @@
             thread_ids = checkedIds
             csrf_token = "{{ csrf_token() }}"
             ip = $('#ip').val()
+            label = $('#calllist_label').val()
 
             $.ajax({
                 type: 'post',
                 url: '{{ U('Call/List/syncAdd') }}',
-                data: {_token: csrf_token, ip: ip, thread_ids: thread_ids},
+                data: {_token: csrf_token, ip: ip, thread_ids: thread_ids, label: label},
                 success: function (data) {
                     if (data == 200) {
                         layer.msg('导入成功', {