Updated public

www/protected/controllers/JRecordController.php

@@ -146,10 +146,12 @@ class JRecordController extends AdminController
                     $data[] = $row;
                 }
             }
+            $type_name = JRecord::$status_options[$type]['name'];
         } else {
             $data = $parsedRows;
+            $type_name = '全部';
         }
-        $res=Service::factory('JRecordService')->push($data);
+        $res=Service::factory('JRecordService')->push($data,$type_name);
     }
 
 

www/protected/services/JRecordService.php

@@ -14,7 +14,7 @@ class JRecordService extends Service
      * @param string $name 导出的excel名称
      * @param $export 导出的类型  execute_export 执行订单汇总 order订单明细 tech保洁师明细
      */
-    public function push($data) {
+    public function push($data,$type) {
         error_reporting(E_ALL);
         date_default_timezone_set('Asia/Shanghai');
         $channel_option = ROrder::$channel_option;
@@ -60,7 +60,7 @@ class JRecordService extends Service
         $objPHPExcel->getActiveSheet()->setTitle('User');
         $objPHPExcel->setActiveSheetIndex(0);
         header('Content-Type: application/vnd.ms-excel');
-        $name = date('Y-m-d').'提货记录导出记录';
+        $name = date('Y-m-d').'提货记录导出记录-'.$type;
         header('Content-Disposition: attachment;filename="' . $name . '.xls"');
         header('Cache-Control: max-age=0');
         $objWriter = PHPExcel_IOFactory::createWriter($objPHPExcel, 'Excel5');