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

Merge pull request 'fix(xlsx): 修复订单导出 Excel 显示问题' (#305) from dev into main

Browse Source 
Reviewed-on: #305
This commit is contained in:
mkm 2024-11-05 09:47:38 +08:00
commit 2541790a1a
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/common/service/xlsx/OrderOutbound.php
View File

@ -63,7 +63,7 @@ class OrderOutbound
$sheet->setCellValue('D' . ($k + 4), $v['gross_weight']);
$sheet->setCellValue('E' . ($k + 4), $v['accept_num']==0 ? $v['cart_num'] : $v['accept_num']);
$sheet->setCellValue('F' . ($k + 4), $v['price']);
$sheet->setCellValue('G' . ($k + 4), $v['pay_price']);
$sheet->setCellValue('G' . ($k + 4), $v['pay_price']==0 ? $v['total_price'] : $v['pay_price']);
$sheet->mergeCells('H' . ($k + 4) . ':I' . $k + 4);
$sheet->setCellValue('H' . ($k + 4), $v['mark']);
}
@ -89,9 +89,9 @@ class OrderOutbound
$sheet->setCellValue('A' . ($count + 7),'应收:');
$sheet->setCellValue('B' . ($count + 7),$order['pay_price']==0?$order['total_price']:$order['pay_price']);
$sheet->setCellValue('C' . ($count + 7),'应退:');
$sheet->setCellValue('G' . ($count + 7),'门店:');
$sheet->mergeCells('H' . ($count + 7) . ':I' . $count + 7);
$sheet->setCellValue('H' . ($count + 7),$order['system_store_name']);
$sheet->setCellValue('F' . ($count + 7),'门店:');
$sheet->mergeCells('G' . ($count + 7) . ':I' . $count + 7);
$sheet->setCellValue('G' . ($count + 7),$order['system_store_name']);
$sheet->mergeCells('B' . ($count + 8) . ':I' . $count + 8);
$sheet->setCellValue('A'. ($count + 8), '收货地址:');