瀏覽代碼

关注人时,附件按钮隐藏,右键菜单“在线签署”隐藏。

Chenshilong 8 年之前
父節點
當前提交
de35678597
共有 6 個文件被更改,包括 22 次插入9 次删除
  1. 2 2
      Dprs/CSL/Measure_Cloud.dof
  2. 二進制
      Dprs/CSL/Measure_Cloud.res
  3. 1 0
      Forms/MainFrm.pas
  4. 4 1
      Frames/ProjectFme.pas
  5. 7 6
      Frames/ProjectManagerFme.pas
  6. 8 0
      Units/ProjectData.pas

+ 2 - 2
Dprs/CSL/Measure_Cloud.dof

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

二進制
Dprs/CSL/Measure_Cloud.res


+ 1 - 0
Forms/MainFrm.pas

@@ -417,6 +417,7 @@ function TMainForm.CreateProjectView(ARec: TsdDataRecord): TProjectFrame;
     ProjectFrame: TProjectFrame;
   begin
     ProjectFrame := TProjectFrame.Create(AProjectData);
+    AProjectData.IsGuest := FProjectManagerFrame.IsGuest;
     FProjectFrames.Add(ProjectFrame);
     ProjectFrame.Parent := APage;
     ProjectFrame.Align := alClient;

+ 4 - 1
Frames/ProjectFme.pas

@@ -254,6 +254,9 @@ begin
     ButtonControl_NewPhase;
     ButtonControl_UpToWeb;
     RepairAudits;
+
+    if FProjectData.IsGuest then
+      tobtnUpFile.Visible := False;
   end;
 end;
 
@@ -530,7 +533,7 @@ procedure TProjectFrame.dxsbViewControlItemClick(Sender: TObject;
       if (Item.Tag = xbiBillsCompile.Tag) or (Item.Tag = xbiBillsMeasure.Tag) then
         CheckUpFile;
 
-      tobtnUpFile.Visible := Item.Tag = xbiBillsMeasure.Tag;
+      tobtnUpFile.Visible := (Item.Tag = xbiBillsMeasure.Tag) and (not ProjectData.IsGuest);
       if (tobtnUpFile.Visible = False) and (jpsAssistant.ActivePage = jpsAssistantUpFile) then
         jpsAssistant.ActivePage := jpsAssistantStandardBills;
     end;

+ 7 - 6
Frames/ProjectManagerFme.pas

@@ -173,7 +173,7 @@ type
     function CurRecAttachmentPath: string;
     function AttachmentFileCountsWithoutManageFile(ANode: TsdIDTreeNode): Integer;
     function UserIsChecker(UserID: Integer): Boolean; // 判断指定ID的用户是否是参与人
-    function CurUserIsGuest: Boolean;
+    function IsGuest: Boolean;
     property ProjectCheckStatus: TCheckStatus read FWebCheckStatusProject;
   end;
 
@@ -395,9 +395,9 @@ begin
 
       if not MainForm.CurProjectFrame.CheckFileAndCloudChekerList then
       begin
-        sHint := '“'+ FWebBidName_OnLine +'”无法打开,本地与云端审批人不一致。' + #10#13 +
-          '1、如当前项目审批不通过并已重新开始计量:请回到原电脑操作' + #10#13 +
-          '2、审批中/审批完成项目:请删除本地项目重新从云端获取' + #10#13 +
+        sHint := '“'+ FWebBidName_OnLine +'”无法打开,本地与云端审批人不一致。' + #10#13 +
+          '1、如当前项目审批不通过并已重新开始计量:请回到原电脑操作' + #10#13 +
+          '2、审批中/审批完成项目:请删除本地项目重新从云端获取' + #10#13 +
           '如仍然存在同样问题,请联系纵横服务人员。';
         Application.MessageBox(PChar(sHint), '文件错误', MB_OK +MB_ICONWARNING);
         MainForm.actnCloseProject.Execute;
@@ -1105,6 +1105,7 @@ begin
   begin
     FCheckers := vCArr;
 
+
     LockWindowUpdate(pnlWeb.Handle);
     try
       FPhaseNo := StrToInt(vPSArr[0]);
@@ -1889,7 +1890,7 @@ procedure TProjectManagerFrame.actnSignOnlineUpdate(Sender: TObject);
   end;
 
 begin
-  TAction(Sender).Visible := G_IsCloud;
+  TAction(Sender).Visible := G_IsCloud and (not IsGuest);
   TAction(Sender).Enabled := Assigned(stdProjects.IDTree.Selected) and
       (stdProjects.IDTree.Selected.Rec.ValueByName('Type').AsInteger = 1) and
       HasCompletePhase(stdProjects.IDTree.Selected.Rec);
@@ -1935,7 +1936,7 @@ begin
   end;
 end;
 
-function TProjectManagerFrame.CurUserIsGuest: Boolean;
+function TProjectManagerFrame.IsGuest: Boolean;
 begin
   Result := not UserIsChecker(PHPWeb.UserID);
 end;

+ 8 - 0
Units/ProjectData.pas

@@ -58,6 +58,7 @@ type
     FProjectReadOnly: Boolean;
     FAttachmentData: TUpFiles;
     FCheckers: TCheckers;
+    FIsGuest: Boolean;
 
     {For Open}
     procedure UpdateProjectDataBase;
@@ -104,6 +105,7 @@ type
     function GetCanInsertNormalBills: Boolean;
     function GetValidStageIsRefer: Boolean;
     function GetStartMeasure: Boolean;
+    procedure SetIsGuest(const Value: Boolean);
   public
     constructor Create;
     destructor Destroy; override;
@@ -256,6 +258,7 @@ type
 
     property ProjectReadOnly: Boolean read FProjectReadOnly;
     property Checkers: TCheckers read FCheckers write SetCheckers;
+    property IsGuest: Boolean read FIsGuest write SetIsGuest;
   end;
 
 implementation
@@ -2198,4 +2201,9 @@ begin
     MeasureLog.AppendLogTo(Format('%s: %s', [FProjectName, ALog]));
 end;
 
+procedure TProjectData.SetIsGuest(const Value: Boolean);
+begin
+  FIsGuest := Value;
+end;
+
 end.