Преглед изворни кода

切换至往期任何角色,节点所挂附件应无移除功能。

Chenshilong пре 8 година
родитељ
комит
9bc970614e

+ 2 - 2
Dprs/CSL/Measure_Cloud.dof

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

BIN
Dprs/CSL/Measure_Cloud.res


+ 2 - 2
Forms/UpFileFrame.pas

@@ -220,7 +220,7 @@ begin
     begin
       pnlOrder.Visible := False;
 //      pnlPlay.Visible := PHPWeb.UserID = Data.UperID;
-      pnlPlay.Visible := True;
+      pnlPlay.Visible := not TProjectData(FProjectData).IsHistoryPhase;
       lblInfo.Visible := True;
       lblInfo.Font.Color := clBlack;
       lblInfo.Caption := Data.UperName;
@@ -293,7 +293,7 @@ begin
 
   pnlPlay.ParentColor := True;
   pnlPlay.BevelOuter := bvNone;
-  pnlPlay.Left := G_Left + 45;
+  pnlPlay.Left := G_Left + 53;
   pnlPlay.Top := G_Top;
 
   pnlOrder.ParentColor := True;

+ 4 - 2
Forms/UpFileManageFrame.pas

@@ -76,7 +76,7 @@ type
     procedure RefreshBill;
     procedure ClearViews;
     procedure ClearDetail;
-    procedure RefreshViews;
+
     procedure DetailOutEditStatus;
     procedure DetailIntoEditStatus;
     procedure AddUpFileView(AUpFile: TUpFile);
@@ -90,7 +90,8 @@ type
     constructor Create(AOwner: TComponent); override;
     procedure DeleteViewAndData(AView: TUpFileView; ANeedDeleteOnLine: Boolean);
     procedure DoOnBillChange(ARec: TsdDataRecord);
-
+    procedure RefreshViews;
+    
     property ProjectData: TObject read FProjectData write SetProjectData;
     property Owner: TObject read FOwner write SetOwner;
     property Selected: TUpFileView read FSelected write SetSelected;
@@ -159,6 +160,7 @@ var i: Integer;
 begin
   LockWindowUpdate(Self.Handle);
   try
+    btnSelectUpFile.Visible := not TProjectData(FProjectData).IsHistoryPhase;
     ClearViews;
     ClearDetail;
     {'HasAttachment'是不可靠的。一但它不可靠,会导致:有附件却不显示,用户会以为

+ 5 - 6
Frames/ProjectFme.pas

@@ -338,6 +338,7 @@ begin
       RepairAudits;
     end;
     ButtonControl_UpToWeb;
+    UpFileManageView.RefreshViews;
   end;
 end;
 
@@ -766,13 +767,11 @@ begin
   // 只有0号台帐那肯定没上传过
   if ProjectData.PhaseIndex = 0 then Exit;
 
-  // 当前显示的期小于最新期(当前期是旧期),则当前期肯定已经上传过了
-  if ProjectData.PhaseIndex < ProjectData.ProjProperties.PhaseCount then
-  begin
-    Result := True;
-  end
+  // 当前期是旧期
+  if ProjectData.IsHistoryPhase then
+    Result := True
   // 当前显示的期是最新期,分两种情况判断,如果第一审核人已有状态,则上传过了
-  else if ProjectData.PhaseIndex = ProjectData.ProjProperties.PhaseCount then
+  else
   begin
     // 当用户点击新增一期计量后,会调用该方法,此时,有一期数据,却为上传过
     if not Assigned(CheckerFrame) then

+ 6 - 0
Units/ProjectData.pas

@@ -193,6 +193,7 @@ type
     function CurUserIsOwner: Boolean;
     function CurUserIsAuthor: Boolean;
     function CurUserIsChecker: Boolean;
+    function IsHistoryPhase: Boolean;
 
     property BillsData: TBillsData read FBillsData;
     property BillsCompileData: TBillsCompileData read FBillsCompileData;
@@ -2048,4 +2049,9 @@ begin
   FBillsMeasureData.ResetTreeNodeStageRec;
 end;
 
+function TProjectData.IsHistoryPhase: Boolean;
+begin
+  Result := PhaseIndex < ProjProperties.PhaseCount;
+end;
+
 end.