diff --git a/admin/controllers/items/goods/Goods.php b/admin/controllers/items/goods/Goods.php index c317bd10..1f11cd10 100644 --- a/admin/controllers/items/goods/Goods.php +++ b/admin/controllers/items/goods/Goods.php @@ -172,6 +172,8 @@ class Goods extends HD_Controller } else if('admin_id' == $params['order']){//销售员ID排序 $order = $params['order']; $search_type = 0 == $search_type || 2 == $search_type ? 2 : 3; + } else if('sold_time' == $params['order']){//售卖时间排序 + $order = 'bill_time'; } else if($params['order']){ $order = $params['order']; } else { @@ -204,17 +206,17 @@ class Goods extends HD_Controller if ($count) { switch($search_type){ case 1://精品筛选 - $fileds = 'id,brand_id,s_id,vin,v_id,cor_id,incor_id,in_time,out_time,addr_id,count(type_id) as fine_num'; + $fileds = 'id,brand_id,s_id,vin,v_id,cor_id,incor_id,in_time,bill_time,addr_id,count(type_id) as fine_num'; $orderby = "{$order} {$sort}"; $rows = $this->mdItems->select_fine($where_1, $orderby, $page, $size, $fileds); 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.out_time, m.addr_id'; + $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}"; $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.out_time, m.addr_id, count(j2.type_id) as fine_num'; + $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}"; } else { @@ -223,7 +225,7 @@ class Goods extends HD_Controller $rows = $this->mdItems->select_order_fine($where_3, $orderby, $page, $size, $fileds); break; default: - $fileds = 'id,brand_id,s_id,vin,v_id,cor_id,incor_id,in_time,out_time,addr_id'; + $fileds = 'id,brand_id,s_id,vin,v_id,cor_id,incor_id,in_time,bill_time,addr_id'; $orderby = "{$order} {$sort}"; $rows = $this->mdItems->select($where, $orderby, $page, $size, $fileds); } @@ -353,7 +355,7 @@ class Goods extends HD_Controller 'vin' => $v['vin'], 'address' => $v['addr_id'] ? $map_addr[$v['addr_id']] : '', 'in_time' => '0000-00-00 00:00:00' == $v['in_time'] ? '' : substr($v['in_time'], 0, 10), - 'out_time' => '0000-00-00 00:00:00' == $v['out_time'] ? '' : substr($v['out_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'] : '', ); @@ -876,6 +878,8 @@ class Goods extends HD_Controller } else if('admin_id' == $params['order']){//销售员ID排序 $order = $params['order']; $search_type = 0 == $search_type || 2 == $search_type ? 2 : 3; + } else if('sold_time' == $params['order']){//售卖时间排序 + $order = 'bill_time'; } else if($params['order']){ $order = $params['order']; } else { diff --git a/admin/views/items/goods/lists_sold.php b/admin/views/items/goods/lists_sold.php index 5f141947..7e01c0ed 100644 --- a/admin/views/items/goods/lists_sold.php +++ b/admin/views/items/goods/lists_sold.php @@ -283,11 +283,11 @@ - - + + 销售日期 - - + + @@ -302,7 +302,7 @@ {{v.vin}} {{v.admin_name}} - {{v.out_time}} + {{v.sold_time}} 编辑