|
|
@@ -1630,7 +1630,7 @@ class PurchaseOrderClass extends BaseClass
|
|
|
$objPHPExcel->getActiveSheet()->setCellValue('J1', '状态');
|
|
|
$objPHPExcel->getActiveSheet()->setCellValue('K1', '打印次数');
|
|
|
$objPHPExcel->getActiveSheet()->setCellValue('L1', '结清状态');
|
|
|
- $objPHPExcel->getActiveSheet()->setCellValue('M1', '');
|
|
|
+ $objPHPExcel->getActiveSheet()->setCellValue('M1', '备注');
|
|
|
$objPHPExcel->getActiveSheet()->setCellValue('N1', '花材Id');
|
|
|
$objPHPExcel->getActiveSheet()->setCellValue('O1', '花材名称');
|
|
|
$objPHPExcel->getActiveSheet()->setCellValue('P1', '单价');
|
|
|
@@ -1745,7 +1745,7 @@ class PurchaseOrderClass extends BaseClass
|
|
|
$debtName = '已结清';
|
|
|
}
|
|
|
$objPHPExcel->getActiveSheet()->setCellValue('L' . $i, $debtName);
|
|
|
- $objPHPExcel->getActiveSheet()->setCellValue('M' . $i, '');
|
|
|
+ $objPHPExcel->getActiveSheet()->setCellValue('M' . $i, $orderInfo['remark']);
|
|
|
$objPHPExcel->getActiveSheet()->setCellValue('N' . $i, $orderInfo['productId']);
|
|
|
$objPHPExcel->getActiveSheet()->setCellValue('O' . $i, $orderInfo['name']);
|
|
|
$objPHPExcel->getActiveSheet()->setCellValue('P' . $i, $orderInfo['bigPrice']);
|