diff --git a/admin/controllers/items/goods/Goods.php b/admin/controllers/items/goods/Goods.php
index 1f11cd10..f8ebd77b 100644
--- a/admin/controllers/items/goods/Goods.php
+++ b/admin/controllers/items/goods/Goods.php
@@ -169,10 +169,10 @@ class Goods extends HD_Controller
if('fine_num' == $params['order']){//精品标签数排序
$order = $params['order'];
$search_type = 0 == $search_type || 1 == $search_type ? 1: 3;
- } else if('admin_id' == $params['order']){//销售员ID排序
+ } else if(in_array($params['order'], array('admin_id', 'mobile', 'uname'))){//销售员ID、订单用户电话、订单用户名称
$order = $params['order'];
$search_type = 0 == $search_type || 2 == $search_type ? 2 : 3;
- } else if('sold_time' == $params['order']){//售卖时间排序
+ }else if('sold_time' == $params['order']){//售卖时间排序
$order = 'bill_time';
} else if($params['order']){
$order = $params['order'];
@@ -212,13 +212,21 @@ class Goods extends HD_Controller
break;
case 2://订单筛选
$fileds = 'm.id, m.brand_id, m.s_id, m.vin, m.v_id, m.cor_id, m.incor_id, m.in_time, m.bill_time, m.addr_id';
- $orderby = "{$order} {$sort}";
+ if(in_array($order, array('admin_id', 'mobile'))){
+ $orderby = "j.{$order} {$sort}";
+ } else if('uname' == $order){
+ $orderby = "j.name {$sort}";
+ } else {
+ $orderby = "{$order} {$sort}";
+ }
$rows = $this->mdItems->select_order($where_2, $orderby, $page, $size, $fileds);
break;
case 3://精品+订单筛选
$fileds = 'm.id, m.brand_id, m.s_id, m.vin, m.v_id, m.cor_id, m.incor_id, m.in_time, m.bill_time, m.addr_id, count(j2.type_id) as fine_num';
- if(in_array($order, array('admin_id'))){
- $orderby = "{$order} {$sort}";
+ if(in_array($order, array('admin_id', 'mobile'))){
+ $orderby = "j.{$order} {$sort}";
+ } else if('uname' == $order){
+ $orderby = "j.name {$sort}";
} else {
$orderby = "m.{$order} {$sort}";
}
@@ -279,7 +287,7 @@ class Goods extends HD_Controller
}
$map_item_fine = array();
- $map_item_admin = array();
+ $map_order = array();
if($ids){
//获取精品加装
$str_ids = implode(',', $ids);
@@ -291,15 +299,14 @@ class Goods extends HD_Controller
$map_item_fine[$v['item_id']][] = $v['type_id'];
}
- //获取销售员信息
- //订单列表
+ //已售商品订单信息
$this->load->model('receiver/order/receiver_orders_model','orders_model');
$str_ids = implode(',', $ids);
$where = array("item_id in ({$str_ids})" => null);
- $rows_order = $this->orders_model->select($where, 'id desc', 0, 0, 'item_id, admin_id');
+ $rows_order = $this->orders_model->select($where, 'id desc', 0, 0, 'item_id, admin_id, name, mobile');
$admin_ids = array();
foreach($rows_order as $v){
- $map_item_admin[$v['item_id']] = array('admin_id' => $v['admin_id']);
+ $map_order[$v['item_id']] = array('admin_id' => $v['admin_id'], 'uname' => $v['name'], 'mobile' => $v['mobile']);
$v['admin_id'] && !in_array($v['admin_id'], $admin_ids) && $admin_ids[] = $v['admin_id'];
}
if($admin_ids){
@@ -324,7 +331,7 @@ class Goods extends HD_Controller
$map_biz_name = $this->biz_model->map('id', 'biz_name', $where);
}
- foreach($map_item_admin as $k => $v){
+ foreach($map_order as $k => $v){
$admin_id = $v['admin_id'];
$admin = $map_admin[$admin_id];
if(!$admin){
@@ -332,19 +339,20 @@ class Goods extends HD_Controller
}
$biz_name = $map_biz_name[$admin['biz_id']];
$admin_name = "{$biz_name} {$admin['uname']}";
- $map_item_admin[$k] = array(
+ $map_order[$k] = array(
'admin_id' => $admin_id,
'biz_id' => $admin['biz_id'],
- 'admin_name' => $admin_name
+ 'admin_name' => $admin_name,
+ 'uname' => $v['uname'],
+ 'mobile' => $v['mobile']
);
}
}
}
}
-
foreach ($rows as $k => $v) {
- $admin = $map_item_admin[$v['id']];
+ $order = $map_order[$v['id']];
$lists[] = array(
'id' => $v['id'],
'brand_name' => $map_brand[$v['brand_id']],
@@ -357,7 +365,9 @@ class Goods extends HD_Controller
'in_time' => '0000-00-00 00:00:00' == $v['in_time'] ? '' : substr($v['in_time'], 0, 10),
'sold_time' => '0000-00-00 00:00:00' == $v['bill_time'] ? '' : substr($v['bill_time'], 0, 10),
'fine_ids' => $map_item_fine[$v['id']] ? $map_item_fine[$v['id']] : array(),
- 'admin_name' => $admin ? $admin['admin_name'] : '',
+ 'admin_name' => $order ? $order['admin_name'] : '',
+ 'uname' => $order ? $order['uname'] : '',
+ 'mobile' => $order ? (SUPER_ADMIN == $this->role ? $order['mobile'] : substr_replace($order['mobile'], '*****', 0, 5)) : '',
);
}
}
diff --git a/admin/views/items/goods/lists_sold.php b/admin/views/items/goods/lists_sold.php
index 7e01c0ed..132e8e07 100644
--- a/admin/views/items/goods/lists_sold.php
+++ b/admin/views/items/goods/lists_sold.php
@@ -274,6 +274,24 @@
+ |
+
+
+ 客户姓名
+
+
+
+
+ |
+
+
+
+ 客户电话
+
+
+
+
+ |
@@ -281,8 +299,9 @@
- |
-
+
+ |
+
销售日期
@@ -301,6 +320,8 @@
|
{{v.vin}}
|
+ {{v.uname}} |
+ {{v.mobile}} |
{{v.admin_name}} |
{{v.sold_time}} |
|