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

Dprs/CSL/Measure_Cloud.dof

@@ -115,7 +115,7 @@ AutoIncBuild=1
 MajorVer=3
 MinorVer=4
 Release=1
-Build=1003
+Build=1004
 Debug=0
 PreRelease=0
 Special=0
@@ -126,7 +126,7 @@ CodePage=936
 [Version Info Keys]
 CompanyName=珠海纵横创新软件有限公司
 FileDescription=纵横结算决算计量一体化云版
-FileVersion=3.4.1.1003
+FileVersion=3.4.1.1004
 InternalName=
 LegalCopyright=
 LegalTrademarks=

Dprs/CSL/Measure_Cloud.dpr

@@ -245,7 +245,8 @@ uses
   stgSelectFileFrm in '..\..\SubTenderGather\stgSelectFileFrm.pas' {stgSelectFileForm},
   stgSubGatherFile in '..\..\SubTenderGather\stgSubGatherFile.pas',
   stgSubGatherFileDm in '..\..\SubTenderGather\stgSubGatherFileDm.pas' {stgSubGatherData: TDataModule},
-  stgTables in '..\..\SubTenderGather\stgTables.pas';
+  stgTables in '..\..\SubTenderGather\stgTables.pas',
+  rmZhongKaiDm in '..\..\DataModules\ReportMemoryDm\rmZhongKaiDm.pas' {rmZhongKaiData: TDataModule};
 
 {$R *.res}
 

Forms/UpFileFrame.pas

@@ -220,7 +220,7 @@ begin
     begin
       pnlOrder.Visible := False;
 //      pnlPlay.Visible := PHPWeb.UserID = Data.UperID;
-      pnlPlay.Visible := not TProjectData(FProjectData).IsHistoryPhase;
+      pnlPlay.Visible := (not TProjectData(FProjectData).IsHistoryPhase) and (not TProjectData(FProjectData).IsGuest);
       lblInfo.Visible := True;
       lblInfo.Font.Color := clBlack;
       lblInfo.Caption := Data.UperName;

Forms/UpFileManageFrame.pas

@@ -160,7 +160,7 @@ var i: Integer;
 begin
   LockWindowUpdate(Self.Handle);
   try
-    btnSelectUpFile.Visible := not TProjectData(FProjectData).IsHistoryPhase;
+    btnSelectUpFile.Visible := (not TProjectData(FProjectData).IsHistoryPhase) and (not TProjectData(FProjectData).IsGuest);
     ClearViews;
     ClearDetail;
     {'HasAttachment'是不可靠的。一但它不可靠，会导致：有附件却不显示，用户会以为

Frames/ProjectFme.pas

@@ -265,7 +265,7 @@ begin
     ButtonControl_UpToWeb;
     RepairAudits;
 
-    if FProjectData.IsGuest then
+//    if FProjectData.IsGuest then
       tobtnUpFile.Visible := False;
   end;
 end;
@@ -553,7 +553,7 @@ procedure TProjectFrame.dxsbViewControlItemClick(Sender: TObject;
       if (Item.Tag = xbiBillsCompile.Tag) or (Item.Tag = xbiBillsMeasure.Tag) then
         CheckUpFile;
 
-      tobtnUpFile.Visible := (Item.Tag = xbiBillsMeasure.Tag) and (not ProjectData.IsGuest);
+      tobtnUpFile.Visible := (Item.Tag = xbiBillsMeasure.Tag){ and (not ProjectData.IsGuest)};
       if (tobtnUpFile.Visible = False) and (jpsAssistant.ActivePage = jpsAssistantUpFile) then
         jpsAssistant.ActivePage := jpsAssistantStandardBills;
     end;
@@ -1654,7 +1654,7 @@ begin
     if (APageIndex = xbiBillsCompile.Tag) or (APageIndex = xbiBillsMeasure.Tag) then
       CheckUpFile;
 
-    tobtnUpFile.Visible := (APageIndex = xbiBillsMeasure.Tag) and (not ProjectData.IsGuest);
+    tobtnUpFile.Visible := (APageIndex = xbiBillsMeasure.Tag) {and (not ProjectData.IsGuest)};
     if (tobtnUpFile.Visible = False) and (jpsAssistant.ActivePage = jpsAssistantUpFile) then
       jpsAssistant.ActivePage := jpsAssistantStandardBills;
   end;