Merge branch 'ProjGather-beforeReportManagement' of http://192.168.1.12:3000/maixinrong/measure into ProjGather-beforeReportManagement

Forms/ReportsFrm.pas

@@ -1442,13 +1442,10 @@ procedure TReportsForm.ExportXlsReport(AStartPage, AEndPage: Integer;
 
   procedure ExportPagesXlsReport(AStartPage, AEndPage: Integer; const AFileName: string);
   var
-    Border : TColumnLineRec;
+    Border: TColumnLineRec;
   begin
     LoadExcelBorder(Border);
     if IsExcel2010 then
-      // 康博士代码中写批量打印是，用Printer.Canvas，打印当前时，用PreviewBox.Canvas。不懂为什么
-      //APrintCom.OutputToExcelRangeXMLEx(PreviewBox.Canvas, AStartPage,
-          //AEndPage, GetTemplateXlsFileName, AFileName, Border, ExcelMode)
       APrintCom.OutputToExcelFileOE(PreviewBox.Canvas, AStartPage, AEndPage, AFileName, ExcelMode, Border, nil)
     else
       APrintCom.OutputToExcelFile(PreviewBox.Canvas, AStartPage,
@@ -1469,7 +1466,7 @@ begin
       repeat
       begin
         if IsExcel2010 then
-          sFileName := Format('%s[%d].xlsx', [ExtractSimpleFileName(AFileName), iCount]);
+          sFileName := Format('%s[%d].xlsx', [ExtractSimpleFileName(AFileName), iCount])
         else
           sFileName := Format('%s[%d].xls', [ExtractSimpleFileName(AFileName), iCount]);
         ExportPagesXlsReport(iStartPage, iEndPage, sFileName);