|
|
@@ -196,7 +196,7 @@ class OrderClass extends BaseClass
|
|
|
$objPHPExcel->getActiveSheet()->setCellValue('I1', '在线支付');
|
|
|
$objPHPExcel->getActiveSheet()->setCellValue('J1', '结清状态');
|
|
|
$objPHPExcel->getActiveSheet()->setCellValue('K1', '编号');
|
|
|
- $objPHPExcel->getActiveSheet()->setCellValue('L1', '预订单');
|
|
|
+ $objPHPExcel->getActiveSheet()->setCellValue('L1', '备注');
|
|
|
$objPHPExcel->getActiveSheet()->setCellValue('M1', '开单人');
|
|
|
$objPHPExcel->getActiveSheet()->setCellValue('N1', '花材Id');
|
|
|
$objPHPExcel->getActiveSheet()->setCellValue('O1', '花材名称');
|
|
|
@@ -299,7 +299,7 @@ class OrderClass extends BaseClass
|
|
|
$objPHPExcel->getActiveSheet()->setCellValue('I' . $i, $orderData['onlinePay'] == 1 ? '否' : '是');
|
|
|
$objPHPExcel->getActiveSheet()->setCellValue('J' . $i, $orderData['debt'] == 1 ? '未结清' : '已结清');
|
|
|
$objPHPExcel->getActiveSheet()->setCellValue('K' . $i, $orderData['sendNum']);
|
|
|
- $objPHPExcel->getActiveSheet()->setCellValue('L' . $i, $orderData['book'] == 1 ? '是' : '否');
|
|
|
+ $objPHPExcel->getActiveSheet()->setCellValue('L' . $i, $orderData['remark']);
|
|
|
$objPHPExcel->getActiveSheet()->setCellValue('M' . $i, $orderData['shopAdminName']);
|
|
|
$objPHPExcel->getActiveSheet()->setCellValue('N' . $i, $orderInfo['productId']);
|
|
|
$objPHPExcel->getActiveSheet()->setCellValue('O' . $i, $orderInfo['name']);
|
