Pārlūkot izejas kodu

审核人信息对齐等小Bug.

CSL 9 gadi atpakaļ
vecāks
revīzija
22fd8590f0

+ 2 - 2
Dprs/CSL/Measure_Cloud.dof

@@ -115,7 +115,7 @@ AutoIncBuild=1
 MajorVer=3
 MinorVer=1
 Release=3
-Build=1072
+Build=1076
 Debug=0
 PreRelease=0
 Special=0
@@ -126,7 +126,7 @@ CodePage=936
 [Version Info Keys]
 CompanyName=珠海纵横创新软件有限公司
 FileDescription=纵横结算决算计量一体化云版
-FileVersion=3.1.3.1072
+FileVersion=3.1.3.1076
 InternalName=Measure
 LegalCopyright=版权所有(C) 珠海纵横创新软件有限公司 2003-2014。保留所有权利。
 LegalTrademarks=Measure

BIN
Dprs/CSL/Measure_Cloud.res


+ 3 - 0
Frames/CheckerFme.pas

@@ -324,7 +324,10 @@ begin
   begin
     if (TOrderCheckerFrame(FList[i]) <> OwnerFrame) and
       (TOrderCheckerFrame(FList[i]) <> AddFrame) then
+    begin
+      TOrderCheckerFrame(FList[i]).lblOrderStatus.Visible := (not ACanDelete);
       TOrderCheckerFrame(FList[i]).btnDelete.Visible := ACanDelete;
+    end;
   end;
 end;
 

+ 14 - 6
Frames/OrderCheckerFme.pas

@@ -62,6 +62,7 @@ type
     procedure SetCheckStatus(const Value: TCheckStatus);
     procedure SetCheckerMemo(const Value: string);
     procedure SetCheckeTime(const Value: string);
+    procedure RightAlign(ALabel: TLabel);
     { Private declarations }
   public
     { Public declarations }
@@ -107,11 +108,8 @@ begin
   lblOrderCheckerName.Visible := not bAdd;
   lblOrderCheckerRole.Visible := not bAdd;
   lblOrderCheckerCompany.Visible := not bAdd;
-  lblOrderStatus.Visible := not bAdd;
-
   shpImage.Visible := not bAdd;
   lblOrderCheckerMemo.Visible := not bAdd;
-
   bOwner := AType = cftOwner;
   lblLast.Visible := bOwner;
   lblOrderCheckerNum.Visible := not bOwner;
@@ -119,9 +117,13 @@ begin
   CheckerFrameType := AType;
   CheckStatus := ACheckStatus;
 
+  lblOrderStatus.Visible := not bAdd;
   if lblOrderStatus.Visible then
-    lblOrderStatus.Left := btnDelete.Left + btnDelete.Width - lblOrderStatus.Width;
+    RightAlign(lblOrderStatus);
+
   lblOrderCheckerTime.Visible := (not bAdd) and (CheckStatus in [csFinished, csNotPass]);
+  if lblOrderCheckerTime.Visible then
+    RightAlign(lblOrderCheckerTime);
 
   case AType of
     cftChecker, cftOwner:
@@ -184,7 +186,7 @@ var vColor: TColor;
 begin
   FCheckStatus := Value;
   lblOrderStatus.Caption := CheckStatusNames[Value];
-
+  RightAlign(lblOrderStatus);
   vColor := CheckStatusColors[Value];
   lblOrderCheckerNum.Font.Color := vColor;
   lblOrderStatus.Font.Color := vColor;
@@ -290,7 +292,13 @@ begin
   FCheckeTime := Value;
 
   lblOrderCheckerTime.Caption := Value;
-  lblOrderCheckerTime.Left := btnDelete.Left + btnDelete.Width - lblOrderCheckerTime.Width;
+  lblOrderCheckerTime.Visible := (CheckStatus in [csFinished, csNotPass]);
+  RightAlign(lblOrderCheckerTime);
+end;
+
+procedure TOrderCheckerFrame.RightAlign(ALabel: TLabel);
+begin
+  ALabel.Left := btnDelete.Left + btnDelete.Width - ALabel.Width;
 end;
 
 end.