|
@@ -9,12 +9,12 @@ uses
|
|
|
ToolWin, ActnList, ZjGridDBA, ZJGrid, dxBar, sdGridDBA, sdDB;
|
|
|
|
|
|
type
|
|
|
- TRowIndex = (riBGLCode, riPegName, riBeginPeg, riEndPeg, riFBFXName, riUnitName, riDrawingCode,
|
|
|
+ TRowIndex = (riCurGatherMeasure, riBGLCode, riPegName, riBeginPeg, riEndPeg, riFBFXName, riUnitName, riDrawingCode,
|
|
|
riFormulaMemoTitle, riFormulaMemoValue, riRelaFileTitle, riRelaFileValue);
|
|
|
const
|
|
|
- RowFields: array [TRowIndex] of string = ('BGLCode', 'PegName', 'BeginPeg', 'EndPeg', 'FBFXName', 'UnitName', 'DrawingCode',
|
|
|
+ RowFields: array [TRowIndex] of string = ('', 'BGLCode', 'PegName', 'BeginPeg', 'EndPeg', 'FBFXName', 'UnitName', 'DrawingCode',
|
|
|
'', 'FormulaMemo', '', 'RelaFile');
|
|
|
- RowFormats: array [TRowIndex] of string = ('变更令号:', '部位:', '起始桩号:', '终止桩号:', '分部分项工程:', '计量单元:', '图号:',
|
|
|
+ RowFormats: array [TRowIndex] of string = ('本期计量%s:%s', '变更令号:', '部位:', '起始桩号:', '终止桩号:', '分部分项工程:', '计量单元:', '图号:',
|
|
|
'计算式说明:', '', '计算草图几何尺寸:', '');
|
|
|
type
|
|
|
TZJJLFrame = class(TFrame)
|
|
@@ -93,6 +93,7 @@ uses
|
|
|
constructor TZJJLFrame.Create(AParent: TFrame; AZJJLData: TZJJLData);
|
|
|
begin
|
|
|
inherited Create(AParent);
|
|
|
+ zgDetailInfo.RowCount := Integer(riRelaFileValue) + 1;
|
|
|
ResetFrameLink(AZJJLData);
|
|
|
if TPhaseData(FZJJLData.PhaseData).Active then
|
|
|
begin
|
|
@@ -266,8 +267,29 @@ procedure TZJJLFrame.zgDetailInfoGetCellText(Sender: TObject;
|
|
|
Result := GetDefaultValue(Rec, RowFields[ARow]);
|
|
|
end;
|
|
|
|
|
|
+ function GetFloatStr(ANum: Double): string;
|
|
|
+ begin
|
|
|
+ if ANum = 0 then
|
|
|
+ Result := ''
|
|
|
+ else
|
|
|
+ Result := FloatToStr(ANum);
|
|
|
+ end;
|
|
|
+
|
|
|
+ function GetCurGatherMeasure: string;
|
|
|
+ var
|
|
|
+ Rec: TsdDataRecord;
|
|
|
+ begin
|
|
|
+ Rec := saZJJL.DataView.Current;
|
|
|
+ if Rec.ValueByName('Type').AsInteger = Integer(ztFx) then
|
|
|
+ Result := Format(RowFormats[riCurGatherMeasure], ['金额', GetFloatStr(FZJJLData.GetZJJLCalcData(Rec, 'GatherTotalPrice'))])
|
|
|
+ else
|
|
|
+ Result := Format(RowFormats[riCurGatherMeasure], ['数量', GetFloatStr(FZJJLData.GetZJJLCalcData(Rec, 'GatherQuantity'))]);
|
|
|
+ end;
|
|
|
+
|
|
|
begin
|
|
|
- if (ACoord.Y >= 0) and (ACoord.Y <= 10) then
|
|
|
+ if (ACoord.Y = Integer(riCurGatherMeasure)) then
|
|
|
+ Value := GetCurGatherMeasure
|
|
|
+ else if (ACoord.Y > Integer(riCurGatherMeasure)) and (ACoord.Y <= Integer(riRelaFileValue)) then
|
|
|
Value := GetText(TRowIndex(ACoord.Y));
|
|
|
end;
|
|
|
|
|
@@ -280,7 +302,7 @@ begin
|
|
|
zgDetailInfo[0, iRowIndex].Align := gaTopLeft;
|
|
|
zgDetailInfo.RowHeights[Integer(riFormulaMemoValue)] := 57;
|
|
|
zgDetailInfo.Cells[0, Integer(riFormulaMemoValue)].Align := gaTopLeft;
|
|
|
- zgDetailInfo.RowHeights[Integer(riRelaFileValue)] := 57;
|
|
|
+ zgDetailInfo.RowHeights[Integer(riRelaFileValue)] := 57;
|
|
|
zgDetailInfo.Cells[0, Integer(riRelaFileValue)].Align := gaTopLeft;
|
|
|
end;
|
|
|
|