فهرست منبع

Task #1301 变更台账相关

MaiXinRong 10 سال پیش
والد
کامیت
b78e6b2a2b
8فایلهای تغییر یافته به همراه516 افزوده شده و 16 حذف شده
  1. 131 1
      DataModules/BGLDm.dfm
  2. 38 3
      DataModules/BGLDm.pas
  3. 32 5
      Frames/ProjectFme.dfm
  4. 10 4
      Frames/ProjectFme.pas
  5. 244 0
      SiChuanJiaoTou/ScjtBGLFme.dfm
  6. 40 0
      SiChuanJiaoTou/ScjtBGLFme.pas
  7. 1 1
      Units/Connections.pas
  8. 20 2
      Units/DataBaseTables.pas

+ 131 - 1
DataModules/BGLDm.dfm

@@ -2,7 +2,7 @@ object BGLData: TBGLData
   OldCreateOrder = False
   OldCreateOrder = False
   Left = 456
   Left = 456
   Top = 291
   Top = 291
-  Height = 220
+  Height = 274
   Width = 397
   Width = 397
   object atBGL: TADOTable
   object atBGL: TADOTable
     TableName = 'BGL'
     TableName = 'BGL'
@@ -61,6 +61,33 @@ object BGLData: TBGLData
       FieldName = 'BGLType'
       FieldName = 'BGLType'
       Size = 10
       Size = 10
     end
     end
+    object cdsBGLPeg: TWideStringField
+      DisplayWidth = 50
+      FieldName = 'Peg'
+      Size = 50
+    end
+    object cdsBGLStartDateTime: TWideStringField
+      FieldName = 'StartDateTime'
+      Size = 50
+    end
+    object cdsBGLLxCode: TWideStringField
+      FieldName = 'LxCode'
+      Size = 50
+    end
+    object cdsBGLLxTotalPrice: TFloatField
+      FieldName = 'LxTotalPrice'
+    end
+    object cdsBGLPfCode: TWideStringField
+      FieldName = 'PfCode'
+      Size = 50
+    end
+    object cdsBGLPfTotalPrice: TFloatField
+      FieldName = 'PfTotalPrice'
+    end
+    object cdsBGLMemoStr: TWideStringField
+      FieldName = 'MemoStr'
+      Size = 255
+    end
   end
   end
   object cdsBGLView: TClientDataSet
   object cdsBGLView: TClientDataSet
     Aggregates = <>
     Aggregates = <>
@@ -111,6 +138,33 @@ object BGLData: TBGLData
       FieldName = 'BGLType'
       FieldName = 'BGLType'
       Size = 10
       Size = 10
     end
     end
+    object cdsBGLViewPeg: TWideStringField
+      DisplayWidth = 50
+      FieldName = 'Peg'
+      Size = 50
+    end
+    object cdsBGLViewStartDateTime: TWideStringField
+      FieldName = 'StartDateTime'
+      Size = 50
+    end
+    object cdsBGLViewLxCode: TWideStringField
+      FieldName = 'LxCode'
+      Size = 50
+    end
+    object cdsBGLViewLxTotalPrice: TFloatField
+      FieldName = 'LxTotalPrice'
+    end
+    object cdsBGLViewPfCode: TWideStringField
+      FieldName = 'PfCode'
+      Size = 50
+    end
+    object cdsBGLViewPfTotalPrice: TFloatField
+      FieldName = 'PfTotalPrice'
+    end
+    object cdsBGLViewMemoStr: TWideStringField
+      FieldName = 'MemoStr'
+      Size = 255
+    end
   end
   end
   object dsBGL: TDataSource
   object dsBGL: TDataSource
     DataSet = cdsBGLView
     DataSet = cdsBGLView
@@ -211,4 +265,80 @@ object BGLData: TBGLData
       FieldName = 'UsedQuantity'
       FieldName = 'UsedQuantity'
     end
     end
   end
   end
+  object cdsScjtBGlView: TClientDataSet
+    Aggregates = <>
+    Params = <>
+    BeforePost = cdsBGLViewBeforePost
+    BeforeDelete = cdsBGLViewBeforeDelete
+    OnNewRecord = cdsBGLViewNewRecord
+    Left = 95
+    Top = 188
+    object cdsScjtBGLViewID: TIntegerField
+      FieldName = 'ID'
+    end
+    object cdsScjtBGLViewCode: TWideStringField
+      FieldName = 'Code'
+      OnChange = cdsBGLViewCodeChange
+      Size = 50
+    end
+    object cdsScjtBGLViewName: TWideStringField
+      FieldName = 'Name'
+      Size = 100
+    end
+    object cdsScjtBGLViewTotalPrice: TFloatField
+      FieldName = 'TotalPrice'
+    end
+    object cdsScjtBGLViewPos_Reason: TMemoField
+      FieldName = 'Pos_Reason'
+      BlobType = ftMemo
+    end
+    object cdsScjtBGLViewDirection: TMemoField
+      FieldName = 'Direction'
+      BlobType = ftMemo
+    end
+    object cdsScjtBGLViewDrawingCode: TWideStringField
+      FieldName = 'DrawingCode'
+      Size = 50
+    end
+    object cdsScjtBGLViewApprovalCode: TWideStringField
+      FieldName = 'ApprovalCode'
+      Size = 50
+    end
+    object cdsScjtBGLViewCreatePhaseID: TIntegerField
+      FieldName = 'CreatePhaseID'
+    end
+    object cdsScjtBGLViewExecutionRate: TFloatField
+      FieldName = 'ExecutionRate'
+    end
+    object cdsScjtBGLViewBGLType: TWideStringField
+      FieldName = 'BGLType'
+      Size = 10
+    end
+    object cdsScjtBGlViewPeg: TWideStringField
+      FieldName = 'Peg'
+      Size = 50
+    end
+    object cdsScjtBGlViewStartDateTime: TWideStringField
+      FieldName = 'StartDateTime'
+      Size = 50
+    end
+    object cdsScjtBGlViewLxCode: TWideStringField
+      FieldName = 'LxCode'
+      Size = 50
+    end
+    object cdsScjtBGlViewLxTotalPrice: TFloatField
+      FieldName = 'LxTotalPrice'
+    end
+    object cdsScjtBGlViewPfCode: TWideStringField
+      FieldName = 'PfCode'
+      Size = 50
+    end
+    object cdsScjtBGlViewPfTotalPrice: TFloatField
+      FieldName = 'PfTotalPrice'
+    end
+    object cdsScjtBGlViewMemoStr: TWideStringField
+      FieldName = 'MemoStr'
+      Size = 255
+    end
+  end
 end
 end

+ 38 - 3
DataModules/BGLDm.pas

@@ -56,6 +56,14 @@ type
     cdsBGLApprovalCode: TWideStringField;
     cdsBGLApprovalCode: TWideStringField;
     cdsBGLCreatePhaseID: TIntegerField;
     cdsBGLCreatePhaseID: TIntegerField;
     cdsBGLExecutionRate: TFloatField;
     cdsBGLExecutionRate: TFloatField;
+    cdsBGLBGLType: TWideStringField;
+    cdsBGLPeg: TWideStringField;  
+    cdsBGLStartDateTime: TWideStringField;
+    cdsBGLLxCode: TWideStringField;
+    cdsBGLLxTotalPrice: TFloatField;
+    cdsBGLPfCode: TWideStringField;
+    cdsBGLPfTotalPrice: TFloatField;
+    cdsBGLMemoStr: TWideStringField;
 
 
     cdsBGLView: TClientDataSet;
     cdsBGLView: TClientDataSet;
     cdsBGLViewID: TIntegerField;
     cdsBGLViewID: TIntegerField;
@@ -67,7 +75,35 @@ type
     cdsBGLViewDrawingCode: TWideStringField;
     cdsBGLViewDrawingCode: TWideStringField;
     cdsBGLViewApprovalCode: TWideStringField;
     cdsBGLViewApprovalCode: TWideStringField;
     cdsBGLViewCreatePhaseID: TIntegerField;
     cdsBGLViewCreatePhaseID: TIntegerField;
-    cdsBGLViewExecutionRate: TFloatField;
+    cdsBGLViewExecutionRate: TFloatField; 
+    cdsBGLViewBGLType: TWideStringField;
+    cdsBGLViewPeg: TWideStringField;
+    cdsBGLViewStartDateTime: TWideStringField;
+    cdsBGLViewLxCode: TWideStringField;
+    cdsBGLViewLxTotalPrice: TFloatField;
+    cdsBGLViewPfCode: TWideStringField;
+    cdsBGLViewPfTotalPrice: TFloatField;
+    cdsBGLViewMemoStr: TWideStringField;
+
+    cdsScjtBGlView: TClientDataSet;
+    cdsScjtBGLViewID: TIntegerField;
+    cdsScjtBGLViewCode: TWideStringField;
+    cdsScjtBGLViewName: TWideStringField;
+    cdsScjtBGLViewTotalPrice: TFloatField;
+    cdsScjtBGLViewPos_Reason: TMemoField;
+    cdsScjtBGLViewDirection: TMemoField;
+    cdsScjtBGLViewDrawingCode: TWideStringField;
+    cdsScjtBGLViewApprovalCode: TWideStringField;
+    cdsScjtBGLViewCreatePhaseID: TIntegerField;
+    cdsScjtBGLViewExecutionRate: TFloatField;
+    cdsScjtBGLViewBGLType: TWideStringField;
+    cdsScjtBGlViewPeg: TWideStringField;
+    cdsScjtBGlViewStartDateTime: TWideStringField;
+    cdsScjtBGlViewLxCode: TWideStringField;
+    cdsScjtBGlViewLxTotalPrice: TFloatField;
+    cdsScjtBGlViewPfCode: TWideStringField;
+    cdsScjtBGlViewPfTotalPrice: TFloatField;
+    cdsScjtBGlViewMemoStr: TWideStringField;
 
 
     dsBGL: TDataSource;
     dsBGL: TDataSource;
 
 
@@ -94,8 +130,6 @@ type
     cdsBGBillsViewQuantity: TFloatField;
     cdsBGBillsViewQuantity: TFloatField;
     cdsBGBillsViewTotalPrice: TFloatField;
     cdsBGBillsViewTotalPrice: TFloatField;
     cdsBGBillsViewUsedQuantity: TFloatField;
     cdsBGBillsViewUsedQuantity: TFloatField;
-    cdsBGLBGLType: TWideStringField;
-    cdsBGLViewBGLType: TWideStringField;
     procedure cdsBGBillsViewAfterInsert(DataSet: TDataSet);
     procedure cdsBGBillsViewAfterInsert(DataSet: TDataSet);
     procedure cdsBGBillsViewAfterPost(DataSet: TDataSet);
     procedure cdsBGBillsViewAfterPost(DataSet: TDataSet);
     procedure cdsBGBillsViewQuantityChange(Sender: TField);
     procedure cdsBGBillsViewQuantityChange(Sender: TField);
@@ -235,6 +269,7 @@ begin
   cdsBGL.AddIndex('idxCode', 'Code', []);
   cdsBGL.AddIndex('idxCode', 'Code', []);
   cdsBGL.IndexName := 'idxID';
   cdsBGL.IndexName := 'idxID';
   cdsBGLView.CloneCursor(cdsBGL, True);
   cdsBGLView.CloneCursor(cdsBGL, True);
+  cdsBGLView.CloneCursor(cdsBGL, True);
 
 
   atBGBills.Connection := AConnection;
   atBGBills.Connection := AConnection;
   cdsBGBills.Open;
   cdsBGBills.Open;

+ 32 - 5
Frames/ProjectFme.dfm

@@ -95,14 +95,22 @@ object ProjectFrame: TProjectFrame
               Tag = 5
               Tag = 5
             end
             end
             item
             item
-              Caption = #25253#34920
-              Hint = #25253#34920
+              Caption = #21464#26356#21488#36134
               Index = 6
               Index = 6
               IsDefault = False
               IsDefault = False
+              LargeImage = 5
+              SmallImage = 5
+              StoredItem = dxsbsViewControlItem9
+              Tag = 6
+            end
+            item
+              Caption = #25253#34920
+              Index = 7
+              IsDefault = False
               LargeImage = 6
               LargeImage = 6
               SmallImage = 6
               SmallImage = 6
               StoredItem = xbiReport
               StoredItem = xbiReport
-              Tag = 6
+              Tag = 10
             end>
             end>
         end>
         end>
       ActiveGroupIndex = 0
       ActiveGroupIndex = 0
@@ -2876,6 +2884,15 @@ object ProjectFrame: TProjectFrame
         TabName = 'OtherMeasure'
         TabName = 'OtherMeasure'
         Caption = 'OtherMeasure'
         Caption = 'OtherMeasure'
       end
       end
+      object jpsMainScjtBGL: TJimPage
+        Tag = -1
+        Left = 0
+        Top = 0
+        Width = 903
+        Height = 505
+        TabName = 'ScjtBGL'
+        Caption = 'ScjtBGL'
+      end
     end
     end
   end
   end
   object xpm: TXPMenu
   object xpm: TXPMenu
@@ -3149,6 +3166,7 @@ object ProjectFrame: TProjectFrame
       #23457#26680#27604#36739
       #23457#26680#27604#36739
       #24418#35937#36827#24230
       #24418#35937#36827#24230
       #20854#20182#21488#36134
       #20854#20182#21488#36134
+      #21464#26356#21488#36134
       #25253#34920)
       #25253#34920)
     DefaultLargeImage = -1
     DefaultLargeImage = -1
     DefaultSmallImage = -1
     DefaultSmallImage = -1
@@ -3192,9 +3210,9 @@ object ProjectFrame: TProjectFrame
       SmallImage = 5
       SmallImage = 5
     end
     end
     object xbiReport: TdxStoredSideItem
     object xbiReport: TdxStoredSideItem
-      Tag = 6
+      Tag = 10
       Caption = #25253#34920
       Caption = #25253#34920
-      Category = 7
+      Category = 8
       Enabled = True
       Enabled = True
       Hint = #25253#34920
       Hint = #25253#34920
       LargeImage = 6
       LargeImage = 6
@@ -3225,6 +3243,15 @@ object ProjectFrame: TProjectFrame
       LargeImage = 7
       LargeImage = 7
       SmallImage = 7
       SmallImage = 7
     end
     end
+    object dxsbsViewControlItem9: TdxStoredSideItem
+      Tag = 6
+      Caption = #21464#26356#21488#36134
+      Category = 7
+      Enabled = True
+      Hint = #21464#26356#21488#36134
+      LargeImage = 5
+      SmallImage = 5
+    end
   end
   end
   object ilstLarge: TImageList
   object ilstLarge: TImageList
     Height = 32
     Height = 32

+ 10 - 4
Frames/ProjectFme.pas

@@ -6,7 +6,7 @@ uses
   BillsCompileFme, BillsMeasureFme, PhaseCompareFme, DealPaymentFme,
   BillsCompileFme, BillsMeasureFme, PhaseCompareFme, DealPaymentFme,
   BillsGatherFme, ZJJLFme, BGLFme, ReportsFrm, SearchFme, BookmarkFme,
   BillsGatherFme, ZJJLFme, BGLFme, ReportsFrm, SearchFme, BookmarkFme,
   ProjectData, UtilMethods, Globals, mEncryptEditions, DealBillsFme,
   ProjectData, UtilMethods, Globals, mEncryptEditions, DealBillsFme,
-  PriceMarginFme, OtherMeasureFme,
+  PriceMarginFme, OtherMeasureFme, ScjtBGLFme,
   Windows, Messages, SysUtils, Variants, Classes, Graphics, Controls, Forms,
   Windows, Messages, SysUtils, Variants, Classes, Graphics, Controls, Forms,
   Dialogs, ImgList, XPMenu, Buttons, ComCtrls, ToolWin, ExtCtrls, JimPages,
   Dialogs, ImgList, XPMenu, Buttons, ComCtrls, ToolWin, ExtCtrls, JimPages,
   StdCtrls, JimCombos, dxsbar, ActnList, dxBar, OrderCheckerFme, CheckerFme,
   StdCtrls, JimCombos, dxsbar, ActnList, dxBar, OrderCheckerFme, CheckerFme,
@@ -83,6 +83,8 @@ type
     xbiPriceMargin: TdxStoredSideItem;
     xbiPriceMargin: TdxStoredSideItem;
     dxsbsViewControlItem8: TdxStoredSideItem;
     dxsbsViewControlItem8: TdxStoredSideItem;
     jpsMainOtherMeasure: TJimPage;
     jpsMainOtherMeasure: TJimPage;
+    dxsbsViewControlItem9: TdxStoredSideItem;
+    jpsMainScjtBGL: TJimPage;
     procedure tobtnStandardBillsClick(Sender: TObject);
     procedure tobtnStandardBillsClick(Sender: TObject);
     procedure jcbPhaseChanged(Sender: TObject);
     procedure jcbPhaseChanged(Sender: TObject);
     procedure sbtnExpendClick(Sender: TObject);
     procedure sbtnExpendClick(Sender: TObject);
@@ -110,6 +112,7 @@ type
     FPriceMarginFrame: TPriceMarginFrame;
     FPriceMarginFrame: TPriceMarginFrame;
     FPhaseCompareFrame: TPhaseCompareFrame;
     FPhaseCompareFrame: TPhaseCompareFrame;
     FOtherMeasureFrame: TOtherMeasureFrame;
     FOtherMeasureFrame: TOtherMeasureFrame;
+    FScjtBGLFrame: TScjtBGLFrame;
 
 
     FCheckerFrame: TCheckerFrame;
     FCheckerFrame: TCheckerFrame;
 
 
@@ -538,7 +541,7 @@ procedure TProjectFrame.dxsbViewControlItemClick(Sender: TObject;
     BeforeChangeView;
     BeforeChangeView;
     case Item.Tag of
     case Item.Tag of
       0, 2: jpsMain.ActivePageIndex := Item.Tag;
       0, 2: jpsMain.ActivePageIndex := Item.Tag;
-      1, 3, 5: if CheckMeasureEdition then jpsMain.ActivePageIndex := Item.Tag;
+      1, 3, 5, 6: if CheckMeasureEdition then jpsMain.ActivePageIndex := Item.Tag;
     end;
     end;
     AfterChangeView;
     AfterChangeView;
   end;
   end;
@@ -606,10 +609,10 @@ begin
   bCloseCompare := (Item.Tag in [0..3]) and (jpsMain.ActivePageIndex = 4);
   bCloseCompare := (Item.Tag in [0..3]) and (jpsMain.ActivePageIndex = 4);
 
 
   case Item.Tag of
   case Item.Tag of
-    0..2, 5: ChangeView;
+    0..2, 5, 6: ChangeView;
     3: DisplayPriceMargin;
     3: DisplayPriceMargin;
     4: DisplayCompare;
     4: DisplayCompare;
-    6: DisplayReports;
+    10: DisplayReports;
   end;
   end;
 
 
   if bCloseCompare then
   if bCloseCompare then
@@ -1168,6 +1171,9 @@ begin
   AlignControl(FOtherMeasureFrame, jpsMainOtherMeasure, alClient);
   AlignControl(FOtherMeasureFrame, jpsMainOtherMeasure, alClient);
   UpdateSysProgress(150, '正在解析数据');
   UpdateSysProgress(150, '正在解析数据');
 
 
+  FScjtBGLFrame := TScjtBGLFrame.Create(FProjectData);
+  AlignControl(FScjtBGLFrame, jpsMainScjtBGL, alClient);
+  UpdateSysProgress(155, '正在解析数据');
 
 
   FZJJLFrame := TZJJLFrame.Create(Self, FProjectData.PhaseData.ZJJLData);
   FZJJLFrame := TZJJLFrame.Create(Self, FProjectData.PhaseData.ZJJLData);
   FZJJLFrame.DataReadOnly := FProjectData.PhaseData.StageDataReadOnly;
   FZJJLFrame.DataReadOnly := FProjectData.PhaseData.StageDataReadOnly;

+ 244 - 0
SiChuanJiaoTou/ScjtBGLFme.dfm

@@ -0,0 +1,244 @@
+object ScjtBGLFrame: TScjtBGLFrame
+  Left = 0
+  Top = 0
+  Width = 1182
+  Height = 434
+  TabOrder = 0
+  object zgBGL: TZJGrid
+    Left = 0
+    Top = 0
+    Width = 1182
+    Height = 434
+    Options = [goRangeSelect, goRowSizing, goColSizing, goCellNotMaintainData, goFixedRowShowNo, goFixedColShowNo, goAlwaysShowSelection]
+    OptionsEx = []
+    ColCount = 13
+    FixedRowCount = 2
+    ShowGridLine = False
+    DefaultColWidth = 73
+    DefaultFixedColWidth = 25
+    Selection.AlphaBlend = False
+    Selection.TransparentColor = False
+    FrozenCol = 0
+    FrozenRow = 0
+    Align = alClient
+  end
+  object zaBGL: TZjGridDBA
+    Columns = <
+      item
+        Title.Caption = #26729#21495#25110#37096#20301
+        Title.CaptionAcrossCols = '1'
+        Title.CaptionAcrossRows = 2
+        Title.Font.Charset = GB2312_CHARSET
+        Title.Font.Color = clWindowText
+        Title.Font.Height = -12
+        Title.Font.Name = #23435#20307
+        Title.Font.Style = []
+        Alignment = taLeftJustify
+        Font.Charset = GB2312_CHARSET
+        Font.Color = clWindowText
+        Font.Height = -12
+        Font.Name = #23435#20307
+        Font.Style = []
+        FieldName = 'Peg'
+        ReadOnly = False
+      end
+      item
+        Title.Caption = #21464#26356#21407#22240
+        Title.CaptionAcrossCols = '1'
+        Title.CaptionAcrossRows = 2
+        Title.Font.Charset = GB2312_CHARSET
+        Title.Font.Color = clWindowText
+        Title.Font.Height = -12
+        Title.Font.Name = #23435#20307
+        Title.Font.Style = []
+        Alignment = taLeftJustify
+        Font.Charset = GB2312_CHARSET
+        Font.Color = clWindowText
+        Font.Height = -12
+        Font.Name = #23435#20307
+        Font.Style = []
+        FieldName = 'Pos_Reason'
+        ReadOnly = True
+      end
+      item
+        Title.Caption = #21464#26356#26041#26696
+        Title.CaptionAcrossCols = '1'
+        Title.CaptionAcrossRows = 2
+        Title.Font.Charset = GB2312_CHARSET
+        Title.Font.Color = clWindowText
+        Title.Font.Height = -12
+        Title.Font.Name = #23435#20307
+        Title.Font.Style = []
+        Alignment = taLeftJustify
+        Font.Charset = GB2312_CHARSET
+        Font.Color = clWindowText
+        Font.Height = -12
+        Font.Name = #23435#20307
+        Font.Style = []
+        FieldName = 'Direction'
+        ReadOnly = True
+      end
+      item
+        Title.Caption = #21464#26356#31867#22411
+        Title.CaptionAcrossCols = '1'
+        Title.CaptionAcrossRows = 2
+        Title.Font.Charset = GB2312_CHARSET
+        Title.Font.Color = clWindowText
+        Title.Font.Height = -12
+        Title.Font.Name = #23435#20307
+        Title.Font.Style = []
+        Alignment = taLeftJustify
+        Font.Charset = GB2312_CHARSET
+        Font.Color = clWindowText
+        Font.Height = -12
+        Font.Name = #23435#20307
+        Font.Style = []
+        FieldName = 'BGLType'
+        ReadOnly = False
+      end
+      item
+        Title.Caption = #23454#38469#23454#26045#26102#38388
+        Title.CaptionAcrossCols = '1'
+        Title.CaptionAcrossRows = 2
+        Title.Font.Charset = GB2312_CHARSET
+        Title.Font.Color = clWindowText
+        Title.Font.Height = -12
+        Title.Font.Name = #23435#20307
+        Title.Font.Style = []
+        Alignment = taLeftJustify
+        Font.Charset = GB2312_CHARSET
+        Font.Color = clWindowText
+        Font.Height = -12
+        Font.Name = #23435#20307
+        Font.Style = []
+        FieldName = 'StartDateTime'
+        ReadOnly = False
+      end
+      item
+        Title.Caption = #21464#26356#31435#39033#23457#26680'|'#31435#39033#23457#26680#32534#21495
+        Title.CaptionAcrossCols = '2'
+        Title.Font.Charset = GB2312_CHARSET
+        Title.Font.Color = clWindowText
+        Title.Font.Height = -12
+        Title.Font.Name = #23435#20307
+        Title.Font.Style = []
+        Alignment = taLeftJustify
+        Font.Charset = GB2312_CHARSET
+        Font.Color = clWindowText
+        Font.Height = -12
+        Font.Name = #23435#20307
+        Font.Style = []
+        FieldName = 'LxCode'
+        ReadOnly = False
+      end
+      item
+        Title.Caption = '|'#39044#20272#37329#39069
+        Title.CaptionAcrossCols = '1'
+        Title.Font.Charset = GB2312_CHARSET
+        Title.Font.Color = clWindowText
+        Title.Font.Height = -12
+        Title.Font.Name = #23435#20307
+        Title.Font.Style = []
+        Alignment = taLeftJustify
+        Font.Charset = GB2312_CHARSET
+        Font.Color = clWindowText
+        Font.Height = -12
+        Font.Name = #23435#20307
+        Font.Style = []
+        FieldName = 'LxTotalPrice'
+        ReadOnly = False
+      end
+      item
+        Title.Caption = #21464#26356#31435#39033#25209#22797'|'#31435#39033#36890#30693#21333#25110#25991#21495
+        Title.CaptionAcrossCols = '2'
+        Title.Font.Charset = GB2312_CHARSET
+        Title.Font.Color = clWindowText
+        Title.Font.Height = -12
+        Title.Font.Name = #23435#20307
+        Title.Font.Style = []
+        Alignment = taLeftJustify
+        Font.Charset = GB2312_CHARSET
+        Font.Color = clWindowText
+        Font.Height = -12
+        Font.Name = #23435#20307
+        Font.Style = []
+        FieldName = 'PfCode'
+        Width = 120
+        ReadOnly = False
+      end
+      item
+        Title.Caption = '|'#25209#22797#37329#39069
+        Title.CaptionAcrossCols = '1'
+        Title.Font.Charset = GB2312_CHARSET
+        Title.Font.Color = clWindowText
+        Title.Font.Height = -12
+        Title.Font.Name = #23435#20307
+        Title.Font.Style = []
+        Alignment = taLeftJustify
+        Font.Charset = GB2312_CHARSET
+        Font.Color = clWindowText
+        Font.Height = -12
+        Font.Name = #23435#20307
+        Font.Style = []
+        FieldName = 'PfTotalPrice'
+        ReadOnly = False
+      end
+      item
+        Title.Caption = #21464#26356#20196#25209#22797'|'#21464#26356#20196#21495
+        Title.CaptionAcrossCols = '2'
+        Title.Font.Charset = GB2312_CHARSET
+        Title.Font.Color = clWindowText
+        Title.Font.Height = -12
+        Title.Font.Name = #23435#20307
+        Title.Font.Style = []
+        Alignment = taLeftJustify
+        Font.Charset = GB2312_CHARSET
+        Font.Color = clWindowText
+        Font.Height = -12
+        Font.Name = #23435#20307
+        Font.Style = []
+        FieldName = 'Code'
+        ReadOnly = False
+      end
+      item
+        Title.Caption = '|'#37329#39069
+        Title.CaptionAcrossCols = '1'
+        Title.Font.Charset = GB2312_CHARSET
+        Title.Font.Color = clWindowText
+        Title.Font.Height = -12
+        Title.Font.Name = #23435#20307
+        Title.Font.Style = []
+        Alignment = taLeftJustify
+        Font.Charset = GB2312_CHARSET
+        Font.Color = clWindowText
+        Font.Height = -12
+        Font.Name = #23435#20307
+        Font.Style = []
+        FieldName = 'TotalPrice'
+        ReadOnly = True
+      end
+      item
+        Title.Caption = #22791#27880
+        Title.CaptionAcrossCols = '1'
+        Title.CaptionAcrossRows = 2
+        Title.Font.Charset = GB2312_CHARSET
+        Title.Font.Color = clWindowText
+        Title.Font.Height = -12
+        Title.Font.Name = #23435#20307
+        Title.Font.Style = []
+        Alignment = taLeftJustify
+        Font.Charset = GB2312_CHARSET
+        Font.Color = clWindowText
+        Font.Height = -12
+        Font.Name = #23435#20307
+        Font.Style = []
+        FieldName = 'MemoStr'
+        ReadOnly = False
+      end>
+    Grid = zgBGL
+    ExtendRowCount = 3
+    Options = [aoAllowEdit]
+    Left = 120
+    Top = 120
+  end
+end

+ 40 - 0
SiChuanJiaoTou/ScjtBGLFme.pas

@@ -0,0 +1,40 @@
+unit ScjtBGLFme;
+
+interface
+
+uses
+  ProjectData,
+  Windows, Messages, SysUtils, Variants, Classes, Graphics, Controls, Forms,
+  Dialogs, ZjGridDBA, ZJGrid;
+
+type
+  TScjtBGLFrame = class(TFrame)
+    zgBGL: TZJGrid;
+    zaBGL: TZjGridDBA;
+  private
+  public
+    constructor Create(AProjectData: TProjectData);
+    destructor Destroy; override;
+  end;
+
+implementation
+
+uses
+  BGLDm;
+
+{$R *.dfm}
+
+{ TScjtBGLFrame }
+
+constructor TScjtBGLFrame.Create(AProjectData: TProjectData);
+begin
+  inherited Create(nil);
+  zaBGL.DataSet := AProjectData.BGLData.cdsScjtBGlView;
+end;
+
+destructor TScjtBGLFrame.Destroy;
+begin
+  inherited;
+end;
+
+end.

+ 1 - 1
Units/Connections.pas

@@ -8,7 +8,7 @@ uses
 const
 const
   ProductName = 'Measure';
   ProductName = 'Measure';
   EmptyFileVersion = '1.0.0.0';
   EmptyFileVersion = '1.0.0.0';
-  FileVersion = '1.0.1.11';
+  FileVersion = '1.0.1.12';
   EncryptVersion = 'Auto1.0';
   EncryptVersion = 'Auto1.0';
   SAdoConnectStr = 'Provider=Microsoft.Jet.OLEDB.4.0;Data Source=%s;' +
   SAdoConnectStr = 'Provider=Microsoft.Jet.OLEDB.4.0;Data Source=%s;' +
                    'User ID=Admin;Password='''';Persist Security Info=True';
                    'User ID=Admin;Password='''';Persist Security Info=True';

+ 20 - 2
Units/DataBaseTables.pas

@@ -333,7 +333,7 @@ const
 
 
   {变更令}
   {变更令}
   SBGL = 'BGL';
   SBGL = 'BGL';
-  tdBGL: array [0..11] of TScFieldDef =(
+  tdBGL: array [0..18] of TScFieldDef =(
     (FieldName: 'ID'; FieldType: ftInteger; Size: 0; Precision: 0; NotNull: True; PrimaryKey: True; ForceUpdate: False),
     (FieldName: 'ID'; FieldType: ftInteger; Size: 0; Precision: 0; NotNull: True; PrimaryKey: True; ForceUpdate: False),
     // 变更令号
     // 变更令号
     (FieldName: 'Code'; FieldType: ftString; Size: 50; Precision: 0; NotNull: False; PrimaryKey: False; ForceUpdate: False),
     (FieldName: 'Code'; FieldType: ftString; Size: 50; Precision: 0; NotNull: False; PrimaryKey: False; ForceUpdate: False),
@@ -356,7 +356,25 @@ const
     // 已执行
     // 已执行
     (FieldName: 'ExecutionRate'; FieldType: ftDouble; Size: 0; Precision: 0; NotNull: False; PrimaryKey: False; ForceUpdate: False),
     (FieldName: 'ExecutionRate'; FieldType: ftDouble; Size: 0; Precision: 0; NotNull: False; PrimaryKey: False; ForceUpdate: False),
     // 变更令类型:一般、较大、重大
     // 变更令类型:一般、较大、重大
-    (FieldName: 'BGLType'; FieldType: ftString; Size: 10; Precision: 0; NotNull: False; PrimaryKey: False; ForceUpdate: False)
+    (FieldName: 'BGLType'; FieldType: ftString; Size: 10; Precision: 0; NotNull: False; PrimaryKey: False; ForceUpdate: False),
+    {------------------------------- 四川交投 -------------------------------}
+    // 桩号或部位
+    (FieldName: 'Peg'; FieldType: ftString; Size: 50; Precision: 0; NotNull: False; PrimaryKey: False; ForceUpdate: False),
+    // 变更实际实施时间
+    (FieldName: 'StartDateTime'; FieldType: ftString; Size: 50; Precision: 0; NotNull: False; PrimaryKey: False; ForceUpdate: False),
+    // 变更立项审核
+    // 立项审核表编号
+    (FieldName: 'LxCode'; FieldType: ftString; Size: 50; Precision: 0; NotNull: False; PrimaryKey: False; ForceUpdate: False),
+    // 预估金额
+    (FieldName: 'LxTotalPrice'; FieldType: ftDouble; Size: 0; Precision: 0; NotNull: False; PrimaryKey: False; ForceUpdate: False),
+    // 变更立项批复
+    // 变更立项批复
+    (FieldName: 'PfCode'; FieldType: ftString; Size: 50; Precision: 0; NotNull: False; PrimaryKey: False; ForceUpdate: False),
+    // 批复金额
+    (FieldName: 'PfTotalPrice'; FieldType: ftDouble; Size: 0; Precision: 0; NotNull: False; PrimaryKey: False; ForceUpdate: False),
+    // 备注
+    (FieldName: 'MemoStr'; FieldType: ftString; Size: 255; Precision: 0; NotNull: False; PrimaryKey: False; ForceUpdate: False)
+    {------------------------------------------------------------------------}
   );
   );
 
 
   SBGBills = 'BGBills';
   SBGBills = 'BGBills';