Merge pull request 'refactor(xlsx): 调整订单供货出库表格的列标题和数据顺序' (#372) from dev3 into main
Reviewed-on: #372
This commit is contained in:
commit
83151c140d
@ -47,9 +47,9 @@ class OrderSupplyOutbound
|
||||
$sheet->setCellValue('B3', '品名');
|
||||
$sheet->setCellValue('C3', '单位');
|
||||
$sheet->setCellValue('D3', '数量');
|
||||
$sheet->setCellValue('E3', '供货价');
|
||||
$sheet->setCellValue('F3', '出库价');
|
||||
$sheet->setCellValue('G3', '出库总价');
|
||||
$sheet->setCellValue('E3', '出库单价');
|
||||
$sheet->setCellValue('F3', '供货价');
|
||||
$sheet->setCellValue('G3', '供货总价');
|
||||
$sheet->setCellValue('H3', '备注');
|
||||
|
||||
// 设置默认的单元格样式
|
||||
@ -68,8 +68,8 @@ class OrderSupplyOutbound
|
||||
$sheet->setCellValue('B' . ($k + 4), $v['store_name']);
|
||||
$sheet->setCellValue('C' . ($k + 4), $v['unit_name']);
|
||||
$sheet->setCellValue('D' . ($k + 4), $v['nums']);
|
||||
$sheet->setCellValue('E' . ($k + 4), $v['purchase']);
|
||||
$sheet->setCellValue('F' . ($k + 4), $v['price']);
|
||||
$sheet->setCellValue('E' . ($k + 4), $v['price']);
|
||||
$sheet->setCellValue('F' . ($k + 4), $v['purchase']);
|
||||
$sheet->setCellValue('G' . ($k + 4), $v['total_price']);
|
||||
$sheet->mergeCells('H' . ($k + 4) . ':I' . $k + 4);
|
||||
$sheet->setCellValue('H' . ($k + 4), $v['mark']);
|
||||
|
Loading…
x
Reference in New Issue
Block a user