fix bugs

html/application/controllers/admin/channeladmin.php

@@ -376,7 +376,7 @@ class Channeladmin extends CI_Controller
 			$admins = array();
 			$admins = $this->channel->get_all_info($where, $page_no, self::PAGE_SIZE);
 			$this->data['customers'] = $admins;
-
+			$this->data['num_start'] = ($page_no - 1) * self::PAGE_SIZE  + 1;
 			//获取分页
 			$this->data['num_link'] = set_page1(
 				$this,site_url('admin/channeladmin/customerSearch?distributor_name='.$get['distributor_name'].'&status='.$get['status'].'&channel_id='.$get['channel_id'].'&building_title='.$get['building_title'].'&time='.$get['time']),
@@ -467,7 +467,7 @@ class Channeladmin extends CI_Controller
 			$admins = array();
 			$admins = $this->channel->get_all_info($where, $page_no, self::PAGE_SIZE);
 			$this->data['customers'] = $admins;
-
+			$this->data['num_start'] = ($page_no - 1) * self::PAGE_SIZE  + 1;
 			//获取分页
 			$this->data['num_link'] = set_page1(
 				$this,site_url('admin/channeladmin/customerExport?distributor_name='.$get['distributor_name'].'&status='.$get['status'].'&channel_id='.$get['channel_id'].'&building_title='.$get['building_title'].'&time='.$get['time']),

html/application/controllers/admin/kpiadmin.php

@@ -167,7 +167,7 @@ class Kpiadmin extends CI_Controller
         }
 
         if ($con_arr['channel']) {
-            $where .= ' and D.channel like "%' . $con_arr['channel'] . '%"';
+            $where .= ' and M.manager_name like "%' . $con_arr['channel'] . '%"';
         }
 
         if ($con_arr['customer_user']) {

html/application/models/customer_model.php

@@ -372,6 +372,8 @@ class Customer_model extends MY_Model{
 		$this->db->join('tb_user US', 'US.id = CB.sale_id', 'left');
 		$this->db->join('tb_distributor D', 'D.id = CB.distributor_id', 'left');
         $this->db->join('tb_building_distributor_relate RR', 'RR.distributor_id = D.id', 'left');
+        $this->db->join('tb_channel TC', 'TC.id = D.channel_id', 'left');
+        $this->db->join('tb_manager M', 'M.id = TC.manager_id', 'left');
 		if(!empty($where))
 		{
 			$this->db->where($where);

html/application/views/admin/channel/customerExport.php

@@ -90,6 +90,7 @@
                                 <table class="table table-striped table-bordered table-hover" id="sample_1">
                                     <thead>
                                         <tr>
+                                            <th>序号</th>
                                             <th>用户ID</th>
                                             <th>客户姓名</th>
                                             <th>客户电话</th>
@@ -109,6 +110,7 @@
 									   foreach($customers as $customer):
 								    ?>
 									<tr>
+                  <td><?php echo $num_start++ ; ?></td>
 									<td><?php echo $customer['id'];?></td>
 									<td><?php echo $customer['customer_user'];?></td>
 									<td><?php echo $customer['customer_mobile']?></td>

html/application/views/admin/channel/customerSearch.php

@@ -88,6 +88,7 @@
                                 <table class="table table-striped table-bordered table-hover" id="sample_1">
                                     <thead>
                                         <tr>
+                                            <th>序号</th>
                                             <th>用户ID</th>
                                             <th>客户姓名</th>
                                             <th>客户电话</th>
@@ -107,6 +108,7 @@
 									   foreach($customers as $customer):
 								    ?>
 									<tr>
+                  <td><?php echo $num_start++ ; ?></td>
 									<td><?php echo $customer['id'];?></td>
 									<td><?php echo $customer['customer_user'];?></td>
 									<td><?php echo $customer['customer_mobile']?></td>