Merge branch 'master' of http://192.168.1.12:3000/MaiXinRong/Measure

DataModules/DealPaymentDm.pas

@@ -452,7 +452,7 @@ procedure TDealPaymentData.sdvDealPaymentSetText(var Text: string;
     if CheckStringNull(Text) or CheckNumeric(Text) then
     begin
       Rec.ValueByName('Formula').AsString := '';
-      AValue.Owner.ValueByName(sFField).AsString := '';
+      AValue.Owner.ValueByName(sFField).AsString := Text;
       fTotalPrice := StrToFloatDef(Text, 0);
     end
     else

Forms/ReportsFrm.pas

@@ -773,6 +773,10 @@ procedure TReportsForm.InitPageSettings;
 begin
   // ÉèÖÃÒ³Ãæ´óС
   PreviewComXML.setPageSize(ReportConfig.PageSize);
+  if ReportConfig.PageSize = 'A3' then
+    PreviewComXML.PrintPageSizeIdx := DMPAPER_A3
+  else if ReportConfig.PageSize = 'A4' then
+    PreviewComXML.PrintPageSizeIdx := DMPAPER_A4;  
   // ÉèÖñ߾à
   PreviewComXML.setEdge(0, '', ReportConfig.LeftEdge/10);
   PreviewComXML.setEdge(1, '', ReportConfig.RightEdge/10);