Browse Source

导入0号台账文件后,重新加载项目属性

MaiXinRong 9 years atrás
parent
commit
1432964015
3 changed files with 16 additions and 3 deletions
  1. 2 2
      Frames/ProjectFme.pas
  2. 3 1
      Units/ProjectData.pas
  3. 11 0
      Units/ProjectProperty.pas

+ 2 - 2
Frames/ProjectFme.pas

@@ -1042,9 +1042,9 @@ begin
         TipMessage('^_^ 恭喜!数据已成功上传到云端服务器。', ProgressProHandle);
       end
       else
-        WarningMessage(PChar('数据上传失败请重试!服务器故障:' + sResult), ProgressProHandle);
+        WarningMessage('数据上传失败请重试!服务器故障:' + sResult, ProgressProHandle);
     except
-      WarningMessage(PChar('数据上传失败请重试!网络较差,数据文件无法送达云端:' + sResult), ProgressProHandle);
+      WarningMessage('数据上传失败请重试!网络较差,数据文件无法送达云端:' + sResult, ProgressProHandle);
     end;
   finally
     ProgressProFree;

+ 3 - 1
Units/ProjectData.pas

@@ -1224,8 +1224,10 @@ procedure TProjectData.ImportCloudTenderFile(const AFileName: string);
   procedure EndCopyData;
   begin
     OpenAllData;
-    ReConnectTree;
+    FProjProperties.Reload;
     FProjProperties.UpdateFlag := 1;
+    ReConnectTree;
+    ResetFloatDigitView;
     BillsCompileData.CalculateAll;
   end;
 

+ 11 - 0
Units/ProjectProperty.pas

@@ -121,6 +121,7 @@ type
 
     procedure Open(AConnection: TADOConnection);
     procedure Save;
+    procedure Reload;
 
     {Submit-Audit-Reply}
     // ¹²¼ÆÖÕÉó¼ÆÁ¿ÆÚÊý
@@ -484,6 +485,16 @@ begin
   FUpdateFlag := GetIntPropertyDef('UpdateFlag', 0);
 end;
 
+procedure TProjProperties.Reload;
+begin
+  LoadBaseProperties;
+  LoadViewProperties;
+  LoadDealInfo;
+  LoadTechParameters;
+  LoadCalcParameters;
+  FUnlockInfoPassword := GetStrPropertyDef('UnlockInfoPassword', '');
+end;
+
 procedure TProjProperties.Save;
 begin
   SaveDealInfo;