|
@@ -108,7 +108,7 @@ implementation
|
|
|
uses
|
|
|
UtilMethods, TemplateManagerHelper, Globals, AuditSelectFrm,
|
|
|
ScFileArchiver, ZhAPI, PHPWebDm, imageenio, ReportPdfHelper,
|
|
|
- mProgressFrm, RenameSignReportFrm;
|
|
|
+ mProgressFrm, RenameSignReportFrm, Math;
|
|
|
|
|
|
{$R *.dfm}
|
|
|
|
|
@@ -1047,9 +1047,30 @@ begin
|
|
|
end;
|
|
|
|
|
|
procedure TSignOnlineReportsForm.pbGenerateClick(Sender: TObject);
|
|
|
+
|
|
|
+ function GetWidthHeight(APrintCom: TPrintComXML): string;
|
|
|
+ var
|
|
|
+ iHeight, iWidth: Integer;
|
|
|
+ begin
|
|
|
+ if APrintCom.PrintPageSizeIdx = DMPAPER_A3 then
|
|
|
+ begin
|
|
|
+ if APrintCom.PrintHeight > APrintCom.PrintWidth then
|
|
|
+ result := Format('%d_%d', [297, 420])
|
|
|
+ else
|
|
|
+ result := Format('%d_%d', [420, 297]);
|
|
|
+ end
|
|
|
+ else if APrintCom.PrintPageSizeIdx = DMPAPER_A4 then
|
|
|
+ begin
|
|
|
+ if APrintCom.PrintHeight > APrintCom.PrintWidth then
|
|
|
+ result := Format('%d_%d', [210, 297])
|
|
|
+ else
|
|
|
+ result := Format('%d_%d', [297, 210]);
|
|
|
+ end;
|
|
|
+ end;
|
|
|
+
|
|
|
var
|
|
|
sReportName, sZipFile, sPdfFile, sErrorMessage: string;
|
|
|
- vInFields, vInValues: array [0..4] of string;
|
|
|
+ vInFields, vInValues: array [0..5] of string;
|
|
|
vUpFileFields, vUpFileNames: array [0..1] of string;
|
|
|
begin
|
|
|
sReportName := ReportTemplateManager.Current.TemplateName;
|
|
@@ -1066,6 +1087,9 @@ begin
|
|
|
vInValues[3] := sReportName;
|
|
|
vInFields[4] := 'ownuid';
|
|
|
vInValues[4] := IntToStr(PHPWeb.UserID);
|
|
|
+ vInFields[5] := 'widhei';
|
|
|
+ //vInValues[5] := GetWidthHeight(PreviewComXML);
|
|
|
+ vInValues[5] := Format('%d_%d', [Round(PreviewComXML.ReportSizeDou.X * 10), Round(PreviewComXML.ReportSizeDou.Y * 10)]);
|
|
|
|
|
|
vUpFileFields[0] := 'upfile';
|
|
|
vUpFileNames[0] := GetTempFileName(FTempPath, '.zip');
|