|  | @@ -121,7 +121,6 @@ type
 | 
	
		
			
				|  |  |     6. 删除临时文件夹}
 | 
	
		
			
				|  |  |    TTenderExport = class
 | 
	
		
			
				|  |  |    private
 | 
	
		
			
				|  |  | -    FIngore: Boolean;
 | 
	
		
			
				|  |  |      // 临时文件夹(生成的项目文件、xml属性文件)
 | 
	
		
			
				|  |  |      FTempFolder: string;
 | 
	
		
			
				|  |  |      FProjectName: string;
 | 
	
	
		
			
				|  | @@ -139,7 +138,7 @@ type
 | 
	
		
			
				|  |  |      procedure SaveInfoToXmlDocument(AXmlNode: IXMLNode);
 | 
	
		
			
				|  |  |      procedure ExportXmlInfo;
 | 
	
		
			
				|  |  |    public
 | 
	
		
			
				|  |  | -    constructor Create(ARec: TsdDataRecord; const AFileName: string; AIngore: Boolean = False);
 | 
	
		
			
				|  |  | +    constructor Create(ARec: TsdDataRecord; const AFileName: string);
 | 
	
		
			
				|  |  |      destructor Destroy; override;
 | 
	
		
			
				|  |  |      // 参数AExportAttachment:是否导出附件
 | 
	
		
			
				|  |  |      procedure Execute(AExportAttachment: Boolean = False);
 | 
	
	
		
			
				|  | @@ -610,9 +609,8 @@ end;
 | 
	
		
			
				|  |  |  { TTenderExport }
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |  constructor TTenderExport.Create(ARec: TsdDataRecord;
 | 
	
		
			
				|  |  | -  const AFileName: string; AIngore: Boolean = False);
 | 
	
		
			
				|  |  | +  const AFileName: string);
 | 
	
		
			
				|  |  |  begin
 | 
	
		
			
				|  |  | -  FIngore := AIngore;
 | 
	
		
			
				|  |  |    FProjectName := ARec.ValueByName('Name').AsString;
 | 
	
		
			
				|  |  |    FFileName := GetMyProjectsFilePath +  ARec.ValueByName('FileName').AsString;
 | 
	
		
			
				|  |  |    if not G_IsCloud then
 | 
	
	
		
			
				|  | @@ -641,9 +639,7 @@ begin
 | 
	
		
			
				|  |  |      if AExportAttachment then
 | 
	
		
			
				|  |  |        CopyFolder(FAttachmentPath, FTempFolder + '\' + sFileName + '[附件包]');
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  | -  if FIngore or (not FileExists(FResultFile) or
 | 
	
		
			
				|  |  | -      QuestMessage(Format('存在同名文件“%s”,是否替换?', [ExtractFileName(FResultFile)]))) then
 | 
	
		
			
				|  |  | -    ZipFolder(FTempFolder, FResultFile);
 | 
	
		
			
				|  |  | +  ZipFolder(FTempFolder, FResultFile);
 | 
	
		
			
				|  |  |  end;
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |  procedure TTenderExport.ExportXmlInfo;
 | 
	
	
		
			
				|  | @@ -725,8 +721,7 @@ procedure TProjectExport.Execute;
 | 
	
		
			
				|  |  |  begin
 | 
	
		
			
				|  |  |    ExportXmlInfo;
 | 
	
		
			
				|  |  |    ExportNode(FExportNode.FirstChild, FTempFolder + '\');
 | 
	
		
			
				|  |  | -  if not FileExists(FResultFile) or QuestMessage('存在同名文件,是否替换?') then
 | 
	
		
			
				|  |  | -    ZipFolder(FTempFolder, FResultFile);
 | 
	
		
			
				|  |  | +  ZipFolder(FTempFolder, FResultFile);
 | 
	
		
			
				|  |  |  end;
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |  procedure TProjectExport.ExportNode(ANode: TsdIDTreeNode;
 | 
	
	
		
			
				|  | @@ -750,7 +745,7 @@ procedure TProjectExport.ExportTender(ANode: TsdIDTreeNode;
 | 
	
		
			
				|  |  |    const AExportPath: string);
 | 
	
		
			
				|  |  |  begin
 | 
	
		
			
				|  |  |    FTenderExportor := TTenderExport.Create(ANode.Rec,
 | 
	
		
			
				|  |  | -    AExportPath + ANode.Rec.ValueByName('Name').AsString, True);
 | 
	
		
			
				|  |  | +    AExportPath + ANode.Rec.ValueByName('Name').AsString);
 | 
	
		
			
				|  |  |    try
 | 
	
		
			
				|  |  |      FTenderExportor.Execute(FExportAttachment);
 | 
	
		
			
				|  |  |    finally
 |