Browse Source

因为Web代码发布问题,移除审核时间显示相关。

MaiXinRong 9 years ago
parent
commit
2e5f085b4d

+ 1 - 1
Forms/FindUserFrm.pas

@@ -152,7 +152,7 @@ begin
     btnAdd.Enabled := False;
     btnAdd.Caption := 'Ìí¼Ó³É¹¦';
     vOwner := TCheckerFrame(TOrderCheckerFrame(Owner).Owner);
-    vOwner.AddNewChecker(cftChecker, StrToInt(UserArr[4]), UserArr[1], UserArr[2], UserArr[3], PicPath, '', csNotBegin, '', -1);
+    vOwner.AddNewChecker(cftChecker, StrToInt(UserArr[4]), UserArr[1], UserArr[2], UserArr[3], PicPath, '', csNotBegin);
     vOwner.RepairOrder;
     vOwner.RepairDelete(True);
   end;

+ 6 - 8
Frames/CheckerFme.pas

@@ -47,8 +47,7 @@ type
     procedure Init;
     // 审核人的名字、职位、公司、图像
     procedure AddNewChecker(AType: TCheckerFrameType; AID: Integer; AName,
-      ARole, ACompany, AImagePath, ACheckerMemo: string; ACheckStatus: TCheckStatus;
-      ACheckeTime: string; ACheckeOnLine: Integer);
+      ARole, ACompany, AImagePath, ACheckerMemo: string; ACheckStatus: TCheckStatus);
     function InCheckerList(ACheckerID: Integer): Boolean;
     function HasNormalChecker: Boolean;        // 有普通审核人就返回True(光有业主不算)
     function HasChecker: Boolean;              // 列表不为空即返回True(光Add也算)
@@ -71,13 +70,12 @@ uses FindUserFrm, PHPWebDm, ProjectData, CslJson, ConstUnit, ProjectFme;
 {$R *.dfm}
 
 procedure TCheckerFrame.AddNewChecker(AType: TCheckerFrameType; AID: Integer;
-  AName, ARole, ACompany, AImagePath, ACheckerMemo: string; ACheckStatus: TCheckStatus;
-  ACheckeTime: string; ACheckeOnLine: Integer);
+  AName, ARole, ACompany, AImagePath, ACheckerMemo: string; ACheckStatus: TCheckStatus);
 var vChecker: TOrderCheckerFrame;
 begin
   vChecker := TOrderCheckerFrame.Create(Self);
   vChecker.Owner := Self;
-  vChecker.Init(AType, AID, AName, ARole, ACompany, AImagePath, ACheckerMemo, ACheckStatus, ACheckeTime, ACheckeOnLine);
+  vChecker.Init(AType, AID, AName, ARole, ACompany, AImagePath, ACheckerMemo, ACheckStatus);
 
   sbChecker.Height := sbChecker.Height + vChecker.Height;
   vChecker.Parent := sbChecker;
@@ -174,15 +172,15 @@ begin
          因为无法得知当前项目是数据库中已存在的最新一期还是仅存于本地尚末入库
          的最新一期。改由添加的位置给出提示}
          if (TProjectData(ProjectData).PhaseIndex > 0) and (not TProjectFrame(Owner).IsUped) then
-           AddNewChecker(cftAdd, -1, '', '', '', '', '', csNotBegin, '', -1);
+           AddNewChecker(cftAdd, -1, '', '', '', '', '', csNotBegin);
         end;
 
         AddNewChecker(cftOwner, StrToInt(sID),
-          vA[i, 0], vA[i, 2], vA[i, 1], sPicPath, vA[i, 6], vStatus, vA[i, 8], StrToInt(vA[i, 7]));
+          vA[i, 0], vA[i, 2], vA[i, 1], sPicPath, vA[i, 6], vStatus);
       end
       else
         AddNewChecker(cftChecker, StrToInt(vA[i, 4]),
-          vA[i, 0], vA[i, 2], vA[i, 1], sPicPath, vA[i, 6], vStatus, vA[i, 8], StrToInt(vA[i, 7]));
+          vA[i, 0], vA[i, 2], vA[i, 1], sPicPath, vA[i, 6], vStatus);
 
       vCM := TChecker.Create;
       vProj.Checkers.Add(StrToInt(vA[i, 4]), vA[i, 0], vA[i, 2], vA[i, 6]);

+ 1 - 8
Frames/OrderCheckerFme.dfm

@@ -327,7 +327,7 @@ object OrderCheckerFrame: TOrderCheckerFrame
       Pen.Style = psDot
     end
     object lblOrderStatus: TLabel
-      Left = 269
+      Left = 266
       Top = 23
       Width = 76
       Height = 26
@@ -384,13 +384,6 @@ object OrderCheckerFrame: TOrderCheckerFrame
       ParentShowHint = False
       ShowHint = True
     end
-    object lblOrderCheckerTime: TLabel
-      Left = 253
-      Top = 8
-      Width = 94
-      Height = 19
-      Caption = '['#26102#38388']['#32447#19979#23457#26680']'
-    end
     object btnDelete: TCslButton
       Left = 336
       Top = 30

+ 2 - 28
Frames/OrderCheckerFme.pas

@@ -43,7 +43,6 @@ type
     imgNotPass: TImage;
     btnDelete: TCslButton;
     lblOrderCheckerMemo: TLabel;
-    lblOrderCheckerTime: TLabel;
     procedure shpAddMouseDown(Sender: TObject; Button: TMouseButton;
       Shift: TShiftState; X, Y: Integer);
     procedure btnDeleteClick(Sender: TObject);
@@ -56,8 +55,6 @@ type
     FCheckStatus: TCheckStatus;
     FUserRole: string;
     FCheckerMemo: string;
-    FCheckeOnLine: Integer;
-    FCheckeTime: string;
     procedure SetOrder(const Value: Integer);
     procedure SetCheckStatus(const Value: TCheckStatus);
     procedure SetCheckerMemo(const Value: string);
@@ -65,8 +62,7 @@ type
   public
     { Public declarations }
     procedure Init(AType: TCheckerFrameType; AID: Integer; AName, ARole,
-    ACompany, AImagePath, ACheckerMemo: string; ACheckStatus: TCheckStatus;
-    ACheckeTime: string; ACheckeOnLine: Integer);
+    ACompany, AImagePath, ACheckerMemo: string; ACheckStatus: TCheckStatus);
     function IsMe(AID: Integer; AName: string): string;
     function IsChecking: Boolean;
     function IsFinished: Boolean;
@@ -80,8 +76,6 @@ 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 CheckeOnLine: Integer read FCheckeOnLine write FCheckeOnLine;  // 0 线下审批(默认);1 线上审批。
   end;
 
 implementation
@@ -94,10 +88,8 @@ uses FindUserFrm, CheckerFme, PHPWebDm, ProjectData, ProjectFme,
 { TOrderCheckerFrame }
 
 procedure TOrderCheckerFrame.Init(AType: TCheckerFrameType; AID: Integer;
-  AName, ARole, ACompany, AImagePath, ACheckerMemo: string;
-  ACheckStatus: TCheckStatus; ACheckeTime: string; ACheckeOnLine: Integer);
+  AName, ARole, ACompany, AImagePath, ACheckerMemo: string; ACheckStatus: TCheckStatus);
 var bAdd, bOwner: Boolean;
-  sOnLine: string;
 begin
   bAdd := AType = cftAdd;
   shpAdd.Visible := bAdd;
@@ -118,10 +110,6 @@ begin
   CheckerFrameType := AType;
   CheckStatus := ACheckStatus;
 
-  if lblOrderStatus.Visible then
-    lblOrderStatus.Left := btnDelete.Left + btnDelete.Width - lblOrderStatus.Width;
-  lblOrderCheckerTime.Visible := (not bAdd) and (CheckStatus in [csFinished, csNotPass]);
-
   case AType of
     cftChecker, cftOwner:
     begin
@@ -133,19 +121,6 @@ begin
       lblOrderCheckerRole.Caption := ARole;
       lblOrderCheckerCompany.Caption := ACompany;
 
-      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;
-      end;
-
       CheckerMemo := RecoverCharsFromJson(ACheckerMemo);
       if FileExists(AImagePath) then
         imgOrderCheckerPic.Picture.LoadFromFile(AImagePath)
@@ -191,7 +166,6 @@ begin
   lblOrderStatus.Font.Color := vColor;
   lblLast.Font.Color := vColor;
   lblOrderCheckerMemo.Font.Color := vColor;
-  lblOrderCheckerTime.Font.Color := vColor;
 //  cxHintStyleController1.HintStyle.Color := clWindow;        气泡Hint,很帅,但是有Bug,频繁操作时会出错,废弃不用,可惜!
 //  cxHintStyleController1.HintStyle.Font.Color := vColor;
 

+ 4 - 6
Frames/ProjectManagerFme.pas

@@ -1063,7 +1063,7 @@ var
     sPicPath := PHPWeb.UserPath + '1_' + AArr[0] + '.jpg';
     PHPWeb.DownFile(AArr[4], sPicPath);
     vChecker.Init(AType, StrToInt(AArr[0]), AArr[1], AArr[3],
-      AArr[2], sPicPath, AArr[6], TCheckStatus(StrToInt(AArr[5])-1), AArr[8], StrToInt(AArr[7]));
+      AArr[2], sPicPath, AArr[6], TCheckStatus(StrToInt(AArr[5])-1));
     vChecker.Name := 'ProjectOrderFrame' + AArr[0];
   end;
 
@@ -1075,15 +1075,13 @@ var
   end;
 
   procedure RefreshProjectCheckers;
-  var i, j, n: Integer;
-    vOwner: array of string;  // ÒµÖ÷ÐÅÏ¢
+  var i, j: Integer;
+    vOwner: array[0..6] of string;    // ÒµÖ÷ÐÅÏ¢
   begin
     FCheckerList.Clear;
     sbChecker.Height := 0;
     FCurPos := 0;
 
-    n := Length(vCArr[Low(vCArr)]);
-    SetLength(vOwner, n);
     sbChecker.VertScrollBar.Range := 0;
     for i := Low(vCArr) to High(vCArr) do
     begin
@@ -1092,7 +1090,7 @@ var
 
       if StrToInt(vCArr[i, 0]) = FWebOwnerID then
       begin
-        for j := 0 to n - 1 do
+        for j := 0 to 6 do
           vOwner[j] := vCArr[i, j];
 
         Continue;