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

DataModules/DealPaymentDm.pas

@@ -281,7 +281,6 @@ procedure TDealPaymentData.sdvDealPaymentGetText(var Text: String;
   begin
     if Assigned(AValue) then
     begin
-      Text := AValue.AsString;
       sField := GetFormulaField(AValue.FieldName);
       sFormula := AValue.Owner.ValueByName(sField).AsString;
       if (sField <> '') and (sFormula <> '') then

Forms/ReportsFrm.pas

@@ -1468,7 +1468,10 @@ begin
       iCount := 1;
       repeat
       begin
-        sFileName := Format('%s[%d].xls', [ExtractSimpleFileName(AFileName), iCount]);
+        if IsExcel2010 then
+          sFileName := Format('%s[%d].xlsx', [ExtractSimpleFileName(AFileName), iCount]);
+        else
+          sFileName := Format('%s[%d].xls', [ExtractSimpleFileName(AFileName), iCount]);
         ExportPagesXlsReport(iStartPage, iEndPage, sFileName);
         iStartPage := iStartPage + 20;
         iEndPage := Min(iEndPage + 20, PrintEndPage);