mkm/multi-store
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(admin): 优化预订单商品列表导出功能

Browse Source 
- 添加创建时间字段，支持时间区间筛选
- 修复导出功能，确保按订单ID筛选时能正确导出
- 优化导出文件命名规则
- 调整导出字段，根据不同筛选条件显示相应信息
This commit is contained in:
mkm 2024-11-08 17:24:14 +08:00
parent ae439f1389
commit 37f6381c2d
1 changed files with 69 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
app/admin/lists/beforehand_order_cart_info/BeforehandOrderCartInfoLists.php
View File

@ -36,6 +36,7 @@ class BeforehandOrderCartInfoLists extends BaseAdminDataLists implements ListsSe
{ {
return [ return [
'=' => ['bhoid', 'uid', 'product_id'], '=' => ['bhoid', 'uid', 'product_id'],
'between_time' => 'create_time'
]; ];
} }
@ -54,7 +55,7 @@ class BeforehandOrderCartInfoLists extends BaseAdminDataLists implements ListsSe
$id = $this->request->get('bhoid'); $id = $this->request->get('bhoid');
$system_store = ''; $system_store = '';
$order_mark = ''; $order_mark = '';
if($this->request->get('export')==2){ if ($this->request->get('export') == 2 && $id) {
$find = BeforehandOrder::where('id', $id)->field('store_id,order_id,mark')->find(); $find = BeforehandOrder::where('id', $id)->field('store_id,order_id,mark')->find();
$system_store = SystemStore::where('id', $find['store_id'])->value('name'); $system_store = SystemStore::where('id', $find['store_id'])->value('name');
$this->fileName = $system_store . '-' . $find['order_id'] . '.xlsx'; $this->fileName = $system_store . '-' . $find['order_id'] . '.xlsx';
@ -71,7 +72,7 @@ class BeforehandOrderCartInfoLists extends BaseAdminDataLists implements ListsSe
} }
$list = BeforehandOrderCartInfo::where($this->searchWhere) $list = BeforehandOrderCartInfo::where($this->searchWhere)
->field(['id', 'bhoid','package','store_info','marques','gross_weight','net_weight','accept_num','after_sales','loss', 'uid','pay_price', 'is_buyer', 'buyer_uid', 'product_id', 'attr_value_id', 'purchase', 'price', 'total_price', 'cart_num', 'mark']) ->field(['id', 'bhoid', 'package', 'store_info', 'marques', 'gross_weight', 'net_weight', 'accept_num', 'after_sales', 'loss', 'uid', 'pay_price', 'is_buyer', 'buyer_uid', 'product_id', 'attr_value_id', 'purchase', 'price', 'total_price', 'cart_num', 'mark','create_time'])
->limit($this->limitOffset, $this->limitLength) ->limit($this->limitOffset, $this->limitLength)
->order(['id' => 'desc']) ->order(['id' => 'desc'])
->select()->each(function ($item) use ($system_store, $order_mark) { ->select()->each(function ($item) use ($system_store, $order_mark) {
@ -93,6 +94,14 @@ class BeforehandOrderCartInfoLists extends BaseAdminDataLists implements ListsSe
$item->status_name = '采购中'; $item->status_name = '采购中';
} }
} }
$item->is_buyer_name = '';
if ($item->is_buyer == 1) {
$item->is_buyer_name = '采购';
} elseif ($item->is_buyer == 0) {
$item->status_name = '待处理';
} elseif ($item->is_buyer == -1) {
$item->is_buyer_name = '不采购';
}
return $item; return $item;
}) })
->toArray(); ->toArray();
@ -123,7 +132,7 @@ class BeforehandOrderCartInfoLists extends BaseAdminDataLists implements ListsSe
if ($this->fileName != '') { if ($this->fileName != '') {
return $this->fileName; return $this->fileName;
} else { } else {
return '预订单商品'; return '预订单商品列表';
} }
} }
@ -136,6 +145,8 @@ class BeforehandOrderCartInfoLists extends BaseAdminDataLists implements ListsSe
*/ */
public function setExcelFields(): array public function setExcelFields(): array
{ {
if($this->request->get('id')){
$data = [ $data = [
'bhoid' => '订单id', 'bhoid' => '订单id',
'store_name' => '商品名称', 'store_name' => '商品名称',
@ -156,6 +167,25 @@ class BeforehandOrderCartInfoLists extends BaseAdminDataLists implements ListsSe
'order_mark' => '订单备注', 'order_mark' => '订单备注',
]; ];
}else{
$data = [
'bhoid' => '订单id',
'store_name' => '商品名称',
'marques' => '型号',
'package' => '包装',
'top_cate_name' => '分类',
'unit_name' => '单位',
'gross_weight' => '毛重',
'net_weight' => '净重',
'warehouse_stock' => '仓库数量',
'cart_num' => '需求数量',
'price' => '单价',
'total_price' => '总价',
'after_sales' => '售后',
'loss' => '损耗',
'mark' => '备注',
];
}
return $data; return $data;
} }
} }