ソースを参照

在线审批Bug修复:当前审核完成不显示时间等。

CSL 9 年 前
コミット
1f74d6ded4

+ 2 - 2
Dprs/CSL/Measure_Cloud.dof

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

BIN
Dprs/CSL/Measure_Cloud.res


+ 11 - 4
Frames/OrderCheckerFme.pas

@@ -61,6 +61,7 @@ type
     procedure SetOrder(const Value: Integer);
     procedure SetCheckStatus(const Value: TCheckStatus);
     procedure SetCheckerMemo(const Value: string);
+    procedure SetCheckeTime(const Value: string);
     { Private declarations }
   public
     { Public declarations }
@@ -80,7 +81,7 @@ type
     property CheckerFrameType: TCheckerFrameType read FCheckerFrameType write FCheckerFrameType;   // 审核人类型
     property CheckStatus: TCheckStatus read FCheckStatus write SetCheckStatus;     // 审核状态
     property CheckerMemo: string read FCheckerMemo write SetCheckerMemo;           // 审核意见
-    property CheckeTime: string read FCheckeTime write FCheckeTime;
+    property CheckeTime: string read FCheckeTime write SetCheckeTime;
     property CheckeOnLine: Integer read FCheckeOnLine write FCheckeOnLine;  // 0 线下审批(默认);1 线上审批。
   end;
 
@@ -135,15 +136,13 @@ begin
 
       if CheckStatus in [csFinished, csNotPass] then
       begin
-        CheckeTime := ACheckeTime;
         CheckeOnLine := ACheckeOnLine;
         if ACheckeOnLine = 0 then
           sOnLine := '线下审核'
         else if ACheckeOnLine = 1 then
           sOnLine := '线上审核';
 
-        lblOrderCheckerTime.Caption := Format('[%s][%s]', [ACheckeTime, sOnLine]);
-        lblOrderCheckerTime.Left := btnDelete.Left + btnDelete.Width - lblOrderCheckerTime.Width;
+        CheckeTime := Format('[%s][%s]', [ACheckeTime, sOnLine]);
       end;
 
       CheckerMemo := RecoverCharsFromJson(ACheckerMemo);
@@ -286,4 +285,12 @@ begin
 end;
 
 
+procedure TOrderCheckerFrame.SetCheckeTime(const Value: string);
+begin
+  FCheckeTime := Value;
+
+  lblOrderCheckerTime.Caption := Value;
+  lblOrderCheckerTime.Left := btnDelete.Left + btnDelete.Width - lblOrderCheckerTime.Width;
+end;
+
 end.

+ 4 - 9
Frames/ProjectFme.pas

@@ -990,24 +990,19 @@ begin
             CheckerFrame.FirstChecker.CheckStatus := csChecking;
             CheckerFrame.AddFrame.Visible := False;
           end
-          else if ProjectData.CurUserIsChecker then
+          else
           begin
             if ACheckPassed then
             begin
               CheckerFrame.Me.CheckStatus := csFinished;
-              CheckerFrame.NextChecker.CheckStatus := csChecking;
+              if ProjectData.CurUserIsChecker then
+                CheckerFrame.NextChecker.CheckStatus := csChecking;
             end
             else
               CheckerFrame.Me.CheckStatus := csNotPass;
 
             CheckerFrame.Me.CheckerMemo := sCheckerMemo;
-          end
-          else if ProjectData.CurUserIsOwner then
-          begin
-            if ACheckPassed then
-              CheckerFrame.Me.CheckStatus := csFinished
-            else
-              CheckerFrame.Me.CheckStatus := csNotPass;
+            CheckerFrame.Me.CheckeTime := Format('[%s][ÏßÏÂÉóºË]',[DateToStr(Date)]);
           end;
         end;