shish 2 gadi atpakaļ
vecāks
revīzija
9f5a511111
1 mainītis faili ar 4 papildinājumiem un 4 dzēšanām
  1. 4 4
      biz-ghs/order/classes/OrderClass.php

+ 4 - 4
biz-ghs/order/classes/OrderClass.php

@@ -181,8 +181,8 @@ class OrderClass extends BaseClass
         $objPHPExcel->getActiveSheet()->setCellValue('O1', '花材名称');
         $objPHPExcel->getActiveSheet()->setCellValue('P1', '单价');
         $objPHPExcel->getActiveSheet()->setCellValue('Q1', '数量');
-        $objPHPExcel->getActiveSheet()->setCellValue('R1', '金额');
-        $objPHPExcel->getActiveSheet()->setCellValue('S1', '已退数量');
+        $objPHPExcel->getActiveSheet()->setCellValue('R1', '已退数量');
+        $objPHPExcel->getActiveSheet()->setCellValue('S1', '金额');
 
         //设置宽度
         $objPHPExcel->getActiveSheet()->getColumnDimension('A')->setWidth(20);
@@ -280,8 +280,8 @@ class OrderClass extends BaseClass
                         $remainNum = bcsub($orderInfo['xhNum'],$orderInfo['refundNum']);
                         $price = bcmul($remainNum,$orderInfo['xhUnitPrice'],2);
                         $objPHPExcel->getActiveSheet()->setCellValue('Q' . $i, $remainNum);
-                        $objPHPExcel->getActiveSheet()->setCellValue('R' . $i, $price);
-                        $objPHPExcel->getActiveSheet()->setCellValue('S' . $i, $orderInfo['refundNum']);
+                        $objPHPExcel->getActiveSheet()->setCellValue('R' . $i, $orderInfo['refundNum']);
+                        $objPHPExcel->getActiveSheet()->setCellValue('S' . $i, $price);
                     }
                     //居左
                     $objPHPExcel->getActiveSheet()->getStyle('A' . $i)->getAlignment()->setHorizontal(\PHPExcel_Style_Alignment::HORIZONTAL_LEFT);