From fe14ed68f20510953b2be8353fc0967dffc963a6 Mon Sep 17 00:00:00 2001
From: lcc <805383944@qq.com>
Date: Mon, 20 Jan 2025 16:53:57 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=90=8E=E5=8F=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 admin/controllers/biz/store/Store.php |  2 ++
 admin/controllers/receiver/Clues.php  | 10 +++++++--
 admin/views/biz/store/lists.php       | 32 ++++++++++++++++++---------
 admin/views/receiver/clues/lists.php  |  6 +++--
 4 files changed, 36 insertions(+), 14 deletions(-)

diff --git a/admin/controllers/biz/store/Store.php b/admin/controllers/biz/store/Store.php
index e1858ced..d3b37f70 100644
--- a/admin/controllers/biz/store/Store.php
+++ b/admin/controllers/biz/store/Store.php
@@ -64,12 +64,14 @@ class Store extends HD_Controller
             $c_time[0] && $where["c_time >="] = strtotime($c_time[0] . ' 00:00:00');
             $c_time[1] && $where["c_time <="] = strtotime($c_time[1] . ' 23:59:59');
         }
+        $params['type'] && $where['type'] = $params['type'];
         $typeAry = $this->biz_model->type_ary();
         $biz_lists = $this->biz_model->select($where, 'id desc', $page, $pagesize);
         $count = $this->biz_model->count($where);
         $bizlists = [];
         foreach ($biz_lists as $v) {
             $v['c_time'] = date('Y-m-d H:i:s', $v['c_time']);
+            $v['biz_type'] = $typeAry[$v['type']];
             $bizlists[] = $v;
         }
         $this->data['params'] = $params;
diff --git a/admin/controllers/receiver/Clues.php b/admin/controllers/receiver/Clues.php
index 9edb428c..f3f38178 100644
--- a/admin/controllers/receiver/Clues.php
+++ b/admin/controllers/receiver/Clues.php
@@ -156,7 +156,7 @@ class Clues extends HD_Controller
         $count = $this->clues_model->count($where);
         $lists = [];
         if ($count) {
-            $fileds = 'id,name,mobile,brand_id,series_id,cf_id,cf2_id,c_time,admin_id,status,status2,en_time,province_id,city_id,county_id,biz_id';
+            $fileds = 'id,name,mobile,brand_id,series_id,cf_id,cf2_id,c_time,admin_id,status,status2,en_time,province_id,city_id,county_id,biz_id,p_time';
             $rows = $this->clues_model->select($where, 'en_time desc,id desc', $page, $size, $fileds);
             $map_admin = $map_cf_pid = $cf_title_arr = [];
 
@@ -250,7 +250,9 @@ class Clues extends HD_Controller
                     $val['brand_detail'] = $brands[$val['brand_id']][0]['name'];
                     $val['series_detail'] = $series[$val['series_id']][0]['name'];
                 }
-
+                if ($val['p_time'] == '0000-00-00 00:00:00') {
+                    $val['p_time'] = '';
+                }
                 $lists[] = $val;
             }
         }
@@ -824,6 +826,7 @@ class Clues extends HD_Controller
             'id' => 'ID',
             'name' => '客户姓名',
             'mobile' => '手机',
+            'poi' => '所在地区',
             'cf_title' => "来源",
             'wxgr' => '是否添加微信',
             'biz_name' => '派单门店',
@@ -831,6 +834,7 @@ class Clues extends HD_Controller
             'brand_detail' => '关注品牌',
             'series_detail' => '关注车型',
             'status_name' => '状态',
+            'p_time' => '分配时间',
             'c_time' => '创建时间',
         ];
         $data = [];
@@ -840,6 +844,7 @@ class Clues extends HD_Controller
                     'id' => $val['id'],
                     'name' => $val['name'],
                     'mobile' => $val['mobile'],
+                    'poi' => $val['poi'],
                     'cf_title' => $val['cf_title'],
                     'wxgr' => $val['wxgr'] ? '是' : '否',
                     'biz_name' => $val['biz_name'],
@@ -847,6 +852,7 @@ class Clues extends HD_Controller
                     'brand_detail' => $val['brand_detail'],
                     'series_detail' => $val['series_detail'],
                     'status_name' => $val['status_name'],
+                    'p_time' => $val['p_time'],
                     'c_time' => date('Y-m-d H:i:s', $val['c_time']),
                 ];
                 $data[] = $item;
diff --git a/admin/views/biz/store/lists.php b/admin/views/biz/store/lists.php
index de9d296b..b9acb15b 100644
--- a/admin/views/biz/store/lists.php
+++ b/admin/views/biz/store/lists.php
@@ -39,7 +39,16 @@
                     </select>
                 </div>
             </div>
-            <div class="am-form-group">
+            <div class="am-form-group fl">
+                <label class="am-para-label w100">门店类型：</label>
+                <div class="am-form-group am-para-inline w150">
+                    <select name="type" v-model="type">
+                        <option value="0">所有</option>
+                        <option :value="i" v-for="(v,i) in typeAry">{{v}}</option>
+                    </select>
+                </div>
+            </div>
+            <div class="am-form-group fl">
                 <div class="am-form-group" style="margin-bottom: 0px;"></div>
                 <label class="am-para-label w100">创建时间：</label>
                 <div class="am-form-group fl">
@@ -73,6 +82,7 @@
                 <th width="50"></th>
                 <th width="5%"><span>ID</span></th>
                 <th><span>门店</span></th>
+                <th width="10%"><span>门店类型</span></th>
                 <th width="15%"><span>创建时间</span></th>
                 <th width="20%"><span>操作</span></th>
             </tr>
@@ -85,6 +95,7 @@
                     </td>
                     <td><?= $v['id'] ?></td>
                     <td><?= $v['biz_name'] ?></td>
+                    <td><?= $v['biz_type'] ?></td>
                     <td><?= $v['c_time'] ?></td>
                     <td>
                         <a data-open="/biz/store/store/get?id=<?= $v['id'] ?>" class="am-btn am-btn-primary am-btn-xs">修改</a>
@@ -179,16 +190,17 @@
     var vm = new Vue({
         el: '#vue-app',
         data: {
-            province_id:<?=$params['province_id'] ? $params['province_id'] : 0?>,
-            city_id:<?=$params['city_id'] ? $params['city_id'] : 0?>,
-            county_id:<?=$params['county_id'] ? $params['county_id'] : 0?>,
+            province_id: <?=$params['province_id'] ? $params['province_id'] : 0?>,
+            city_id: <?=$params['city_id'] ? $params['city_id'] : 0?>,
+            county_id: <?=$params['county_id'] ? $params['county_id'] : 0?>,
+            type: <?=$params['type'] ? $params['type'] : 0?>,
             qdjl_lists: [],
             channel_uid: [],
             biz_manage: {admins: [], group_id: 2, admin_id: 0, biz_id: 0, admin_name: ''},
-            typeAry:<?=$typeAry ? json_encode($typeAry) : '[]'?>,
+            typeAry: <?=$typeAry ? json_encode($typeAry) : '[]'?>,
             provinceAry: <?=json_encode($provinces, JSON_UNESCAPED_UNICODE)?>,
             cityAry: [],
-            countyAry: []
+            countyAry: [],
         },
         mounted: function () {
             this.qdjl_lists = <?=json_encode($qdjl_lists)?>;
@@ -196,7 +208,7 @@
             this.init_countys();
         },
         methods: {
-            channel_modal: function (biz_id,biz_name) {
+            channel_modal: function (biz_id, biz_name) {
                 //选择渠道归属
                 var vm = this;
                 vm.channels = [];
@@ -215,7 +227,7 @@
                     type: 1,
                     area: ['50%', '40%'], //宽高
                     content: $('#channel-modal'),
-                    title: biz_name+'-渠道归属',
+                    title: biz_name + '-渠道归属',
                     shade: false,
                     btn: ['保存选择'],
                     yes: function (index) {
@@ -236,7 +248,7 @@
                     }
                 });
             },
-            biz_manage_modal: function (biz_id,biz_name) {
+            biz_manage_modal: function (biz_id, biz_name) {
                 //选择门店管理员
                 var vm = this;
                 vm.biz_manage = {admins: [], group_id: 2, admin_id: 0, biz_id: biz_id, admin_name: ''};
@@ -245,7 +257,7 @@
                     type: 1,
                     area: ['50%', '50%'], //宽高
                     content: $('#biz_manage-modal'),
-                    title: biz_name+'-门店管理员',
+                    title: biz_name + '-门店管理员',
                     shade: false,
                     btn: ['保存选择'],
                     yes: function (index) {
diff --git a/admin/views/receiver/clues/lists.php b/admin/views/receiver/clues/lists.php
index 86c3202a..c1b7c60e 100644
--- a/admin/views/receiver/clues/lists.php
+++ b/admin/views/receiver/clues/lists.php
@@ -225,9 +225,10 @@
                 <th width="12%"><span>线索来源</span></th>
                 <th width="12%"><span>所在地区</span></th>
                 <th width="12%"><span>所派门店</span></th>
-                <th width="5%"><span>状态</span></th>
+                <th width="8%"><span>状态</span></th>
+                <th width="12%"><span>分配时间</span></th>
                 <th width="12%"><span>创建时间</span></th>
-                <th width="15%"><span>跟进人员</span></th>
+                <th width="10%"><span>跟进人员</span></th>
             </tr>
             </thead>
             <tbody>
@@ -243,6 +244,7 @@
                         <td style="vertical-align: middle;"><?= $v['poi'] ?></td>
                         <td style="vertical-align: middle;"><?= $v['biz_poi'] ?><br><?= $v['biz_name'] ?></td>
                         <td style="vertical-align: middle;"><?= $v['status_name'] ?></td>
+                        <td style="vertical-align: middle;"><?= $v['p_time'] ?></td>
                         <td style="vertical-align: middle;"><?= date('Y-m-d H:i:s', $v['c_time']) ?></td>
                         <td style="vertical-align: middle;"><?= $v['admin_name'] ?></td>
                     </tr>