|
@@ -65,7 +65,6 @@ type
|
|
|
FDatas: TUpFiles;
|
|
|
FWaitForDelete: TUpFileView;
|
|
|
FDeleteAttachmentOnLine: Boolean;
|
|
|
- //FOwner: TObject;
|
|
|
FProjectData: TObject;
|
|
|
FRec: TsdDataRecord;
|
|
|
procedure SetSelected(const Value: TUpFileView);
|
|
@@ -81,7 +80,6 @@ type
|
|
|
procedure DetailIntoEditStatus;
|
|
|
procedure AddUpFileView(AUpFile: TUpFile);
|
|
|
procedure SetWaitForDelete(const Value: TUpFileView);
|
|
|
- //procedure SetOwner(const Value: TObject);
|
|
|
procedure SetProjectData(const Value: TObject);
|
|
|
procedure SetRec(const Value: TsdDataRecord);
|
|
|
procedure SelectUpFile;
|
|
@@ -93,7 +91,6 @@ type
|
|
|
procedure RefreshViews;
|
|
|
|
|
|
property ProjectData: TObject read FProjectData write SetProjectData;
|
|
|
- //property Owner: TObject read FOwner write SetOwner;
|
|
|
property Selected: TUpFileView read FSelected write SetSelected;
|
|
|
property DetailIsEdit: Boolean read FDetailIsEdit write SetDetailIsEdit; // 明细部分处理编辑状态
|
|
|
property Datas: TUpFiles read FDatas write SetDatas;
|
|
@@ -155,22 +152,19 @@ var
|
|
|
begin
|
|
|
for i := sbFile.ControlCount - 1 downto 0 do
|
|
|
begin
|
|
|
- //if Assigned(sbFile.Controls[i]) then
|
|
|
obj := sbFile.Controls[i];
|
|
|
if Assigned(obj) then
|
|
|
begin
|
|
|
sbFile.RemoveControl(obj);
|
|
|
- FreeAndNil(obj);
|
|
|
+ obj.Free;
|
|
|
end;
|
|
|
- //TUpFileView(sbFile.Controls[i]).Free;
|
|
|
end;
|
|
|
end;
|
|
|
|
|
|
procedure TUpFileManageView.RefreshViews;
|
|
|
var i: Integer;
|
|
|
begin
|
|
|
- //LockWindowUpdate(Self.Handle);
|
|
|
- //BeginUpdateWindow(Handle);
|
|
|
+ LockWindowUpdate(Self.Handle);
|
|
|
try
|
|
|
btnSelectUpFile.Visible := (not TProjectData(FProjectData).IsHistoryPhase) and (not TProjectData(FProjectData).IsGuest);
|
|
|
ClearViews;
|
|
@@ -183,13 +177,13 @@ begin
|
|
|
if (FRec <> nil) {and (FRec.ValueByName('HasAttachment').AsBoolean = True)} then
|
|
|
for i := 0 to Datas.Count - 1 do
|
|
|
begin
|
|
|
- if (Datas[i].BillID = FRec.ValueByName('ID').AsInteger) and (Datas[i].Phase = TProjectData(FProjectData).PhaseIndex) then
|
|
|
- AddUpFileView(Datas[i]);
|
|
|
+ if Assigned(Datas[i]) then
|
|
|
+ if (Datas[i].BillID = FRec.ValueByName('ID').AsInteger) and (Datas[i].Phase = TProjectData(FProjectData).PhaseIndex) then
|
|
|
+ AddUpFileView(Datas[i]);
|
|
|
end;
|
|
|
finally
|
|
|
pnlHead.Repaint;
|
|
|
- //LockWindowUpdate(0);
|
|
|
- // EndUpdateWindow(Handle);
|
|
|
+ LockWindowUpdate(0);
|
|
|
end;
|
|
|
end;
|
|
|
|
|
@@ -319,9 +313,7 @@ begin
|
|
|
// 先删再增会重复。
|
|
|
// vVew.Name := Format('UpFileView%d', [AUpFile.No]); // 此时ID尚末获取,不能用ID
|
|
|
vVew.Name := Format('UpFileView_%s', [PHPWeb.TempName]);
|
|
|
- //vVew.Owner := Self;
|
|
|
vVew.ProjectData := FProjectData;
|
|
|
- //vVew.parent := sbFile;
|
|
|
sbFile.InsertControl(vVew);
|
|
|
vVew.Align := alTop;
|
|
|
vVew.Data := AUpFile;
|
|
@@ -348,6 +340,7 @@ begin
|
|
|
sbFile.RemoveControl(WaitForDelete);
|
|
|
WaitForDelete.Free;
|
|
|
Datas.Delete(vUpFile);
|
|
|
+ vUpFile.Free;
|
|
|
end;
|
|
|
|
|
|
procedure TUpFileManageView.SetWaitForDelete(const Value: TUpFileView);
|
|
@@ -355,13 +348,6 @@ begin
|
|
|
FWaitForDelete := Value;
|
|
|
end;
|
|
|
|
|
|
-{procedure TUpFileManageView.SetOwner(const Value: TObject);
|
|
|
-begin
|
|
|
- FOwner := Value;
|
|
|
- TProjectFrame(FOwner).BillsMeasureFrame.BillsMeasureData.OnRecChange := DoOnBillChange;
|
|
|
- TProjectFrame(FOwner).BillsCompileFrame.BillsCompileData.OnRecChange := DoOnBillChange;
|
|
|
-end;}
|
|
|
-
|
|
|
procedure TUpFileManageView.SetProjectData(const Value: TObject);
|
|
|
begin
|
|
|
FProjectData := Value;
|