admin/liche
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

liche update for admin goods show order user

Browse Source
This commit is contained in:
xxb
2021-09-14 14:38:09 +08:00
committed by lccsw
parent 9a7b757b88
commit cdb25669a5
2 changed files with 49 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin/controllers/items/goods/Goods.php
+26 -16
View File
@@ -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)) : '',
);
}
}
admin/views/items/goods/lists_sold.php
+23 -2
View File
@@ -274,6 +274,24 @@
</a>
</span>
</th>
<th width="10%">
<span :class="'order'+('uname'==params.order?' order-on':' order-none')">
<a href="javascript:void(0)" @click="set_order('uname')">
<span>客户姓名</span>
<i class="angle_top" v-if="'desc'==params.sort||'uname'!=params.order"></i>
<i class="angle_bottom" v-if="'asc'==params.sort||'uname'!=params.order"></i>
</a>
</span>
</th>
<th width="10%">
<span :class="'order'+('mobile'==params.order?' order-on':' order-none')">
<a href="javascript:void(0)" @click="set_order('mobile')">
<span>客户电话</span>
<i class="angle_top" v-if="'desc'==params.sort||'mobile'!=params.order"></i>
<i class="angle_bottom" v-if="'asc'==params.sort||'mobile'!=params.order"></i>
</a>
</span>
</th>
<th width="15%">
<span :class="'order'+('admin_id'==params.order?' order-on':' order-none')">
<a href="javascript:void(0)" @click="set_order('admin_id')">
@@ -281,8 +299,9 @@
<i class="angle_top" v-if="'desc'==params.sort||'admin_id'!=params.order"></i>
<i class="angle_bottom" v-if="'asc'==params.sort||'admin_id'!=params.order"></i>
</a>
</span></th>
<th width="15%">
</span>
</th>
<th width="12%">
<span :class="'order'+('sold_time'==params.order?' order-on':' order-none')">
<a href="javascript:void(0)" @click="set_order('sold_time')">
<span>销售日期</span>
@@ -301,6 +320,8 @@
<td>
<a href="javascript:void(0);" :data-modal="'/items/goods/goods/get_info?id='+v.id" data-title="详情">{{v.vin}}</a>
</td>
<td>{{v.uname}}</td>
<td>{{v.mobile}}</td>
<td>{{v.admin_name}}</td>
<td>{{v.sold_time}}</td>
<td>