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

liche update for admin goods sold lists show sold_time from bill_time

Browse Source
This commit is contained in:
xxb
2021-09-10 15:42:12 +08:00
committed by lccsw
parent 703aafc5ce
commit 56925ee872
2 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin/controllers/items/goods/Goods.php
+9 -5
View File
@@ -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 {
admin/views/items/goods/lists_sold.php
+5 -5
View File
@@ -283,11 +283,11 @@
</a>
</span></th>
<th width="15%">
<span :class="'order'+('out_time'==params.order?' order-on':' order-none')">
<a href="javascript:void(0)" @click="set_order('out_time')">
<span :class="'order'+('sold_time'==params.order?' order-on':' order-none')">
<a href="javascript:void(0)" @click="set_order('sold_time')">
<span>销售日期</span>
<i class="angle_top" v-if="'desc'==params.sort||'out_time'!=params.order"></i>
<i class="angle_bottom" v-if="'asc'==params.sort||'out_time'!=params.order"></i>
<i class="angle_top" v-if="'desc'==params.sort||'sold_time'!=params.order"></i>
<i class="angle_bottom" v-if="'asc'==params.sort||'sold_time'!=params.order"></i>
</a>
</span>
</th>
@@ -302,7 +302,7 @@
<a href="javascript:void(0);" :data-modal="'/items/goods/goods/get_info?id='+v.id" data-title="详情">{{v.vin}}</a>
</td>
<td>{{v.admin_name}}</td>
<td>{{v.out_time}}</td>
<td>{{v.sold_time}}</td>
<td>
<a href="javascript:void(0);" class="am-btn am-btn-primary am-btn-xs"
:data-open="'/items/goods/goods/get?id='+v.id">编辑</a>