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