Project Properties: Add property

Forms/ProjectPropertiesFrm.dfm

@@ -225,7 +225,7 @@ object ProjectPropertiesForm: TProjectPropertiesForm
           Width = 438
           Height = 247
           HorzScrollBar.Range = 401
-          VertScrollBar.Range = 1180
+          VertScrollBar.Range = 1348
           Align = alClient
           AutoScroll = False
           BevelInner = bvNone
@@ -263,20 +263,20 @@ object ProjectPropertiesForm: TProjectPropertiesForm
           object lblConstructor: TLabel
             Left = 34
             Top = 192
-            Width = 60
+            Width = 66
             Height = 12
-            Caption = #25215#21253#21333#20301#65306
+            Caption = #25215#21253#21333#20301'1'#65306
           end
           object lblSupervisor: TLabel
             Left = 34
-            Top = 276
-            Width = 60
+            Top = 360
+            Width = 66
             Height = 12
-            Caption = #30417#29702#21333#20301#65306
+            Caption = #30417#29702#21333#20301'1'#65306
           end
           object lblTechParameters: TLabel
             Left = 7
-            Top = 371
+            Top = 539
             Width = 48
             Height = 12
             Caption = #25216#26415#21442#25968
@@ -289,14 +289,14 @@ object ProjectPropertiesForm: TProjectPropertiesForm
           end
           object lblLoadLevel: TLabel
             Left = 34
-            Top = 393
+            Top = 561
             Width = 60
             Height = 12
             Caption = #20844#36335#31561#32423#65306
           end
           object lblDealPayTitle: TLabel
             Left = 7
-            Top = 531
+            Top = 699
             Width = 48
             Height = 12
             Caption = #21512#21516#25903#20184
@@ -309,7 +309,7 @@ object ProjectPropertiesForm: TProjectPropertiesForm
           end
           object lblSafeTitel: TLabel
             Left = 7
-            Top = 635
+            Top = 803
             Width = 48
             Height = 12
             Caption = #25991#20214#23433#20840
@@ -322,14 +322,14 @@ object ProjectPropertiesForm: TProjectPropertiesForm
           end
           object lblUnlockPassword: TLabel
             Left = 36
-            Top = 659
+            Top = 827
             Width = 84
             Height = 12
             Caption = #35299#38145#33410#28857#23494#30721#65306
           end
           object lblPasswordHint: TLabel
             Left = 128
-            Top = 660
+            Top = 828
             Width = 90
             Height = 12
             Caption = 'lblPasswordHint'
@@ -343,7 +343,7 @@ object ProjectPropertiesForm: TProjectPropertiesForm
           end
           object lblCalcParametersTitel: TLabel
             Left = 7
-            Top = 763
+            Top = 931
             Width = 48
             Height = 12
             Caption = #35745#31639#21442#25968
@@ -356,14 +356,14 @@ object ProjectPropertiesForm: TProjectPropertiesForm
           end
           object lblDigit: TLabel
             Left = 36
-            Top = 787
+            Top = 955
             Width = 84
             Height = 12
             Caption = #20445#30041#23567#25968#20301#25968#65306
           end
           object lblDateTime: TLabel
             Left = 7
-            Top = 936
+            Top = 1104
             Width = 48
             Height = 12
             Caption = #26102#38388#21442#25968
@@ -376,21 +376,21 @@ object ProjectPropertiesForm: TProjectPropertiesForm
           end
           object lblBaseline: TLabel
             Left = 36
-            Top = 959
+            Top = 1127
             Width = 60
             Height = 12
             Caption = #36215#22987#26085#26399#65306
           end
           object lblDeadline: TLabel
             Left = 36
-            Top = 983
+            Top = 1152
             Width = 60
             Height = 12
             Caption = #25130#27490#26085#26399#65306
           end
           object lblDateHint: TLabel
-            Left = 37
-            Top = 1004
+            Left = 36
+            Top = 1174
             Width = 192
             Height = 12
             Caption = #24403#21069#25130#27490#26085#26399' '#65308' '#36215#22987#26085#26399#65292#35831#26680#26597
@@ -401,6 +401,20 @@ object ProjectPropertiesForm: TProjectPropertiesForm
             Font.Style = []
             ParentFont = False
           end
+          object lblSupervisor_2: TLabel
+            Left = 34
+            Top = 444
+            Width = 66
+            Height = 12
+            Caption = #30417#29702#21333#20301'2'#65306
+          end
+          object lblConstructor_2: TLabel
+            Left = 34
+            Top = 274
+            Width = 66
+            Height = 12
+            Caption = #25215#21253#21333#20301'2'#65306
+          end
           object pnlDealInfoBar: TPanel
             Left = 62
             Top = 9
@@ -519,7 +533,7 @@ object ProjectPropertiesForm: TProjectPropertiesForm
           end
           object leSName: TLabeledEdit
             Left = 101
-            Top = 291
+            Top = 375
             Width = 262
             Height = 18
             Ctl3D = False
@@ -531,7 +545,7 @@ object ProjectPropertiesForm: TProjectPropertiesForm
           end
           object leSLegal: TLabeledEdit
             Left = 101
-            Top = 331
+            Top = 415
             Width = 137
             Height = 18
             Ctl3D = False
@@ -543,7 +557,7 @@ object ProjectPropertiesForm: TProjectPropertiesForm
           end
           object leSDate: TLabeledEdit
             Left = 245
-            Top = 331
+            Top = 415
             Width = 119
             Height = 18
             Ctl3D = False
@@ -555,7 +569,7 @@ object ProjectPropertiesForm: TProjectPropertiesForm
           end
           object pnlTechParametersBar: TPanel
             Left = 62
-            Top = 376
+            Top = 544
             Width = 339
             Height = 2
             BevelOuter = bvLowered
@@ -563,7 +577,7 @@ object ProjectPropertiesForm: TProjectPropertiesForm
           end
           object leStartPeg: TLabeledEdit
             Left = 34
-            Top = 451
+            Top = 619
             Width = 132
             Height = 18
             Ctl3D = False
@@ -575,7 +589,7 @@ object ProjectPropertiesForm: TProjectPropertiesForm
           end
           object leEndPeg: TLabeledEdit
             Left = 176
-            Top = 451
+            Top = 619
             Width = 131
             Height = 18
             Ctl3D = False
@@ -587,7 +601,7 @@ object ProjectPropertiesForm: TProjectPropertiesForm
           end
           object leLength: TLabeledEdit
             Left = 34
-            Top = 491
+            Top = 659
             Width = 132
             Height = 18
             Ctl3D = False
@@ -599,7 +613,7 @@ object ProjectPropertiesForm: TProjectPropertiesForm
           end
           object leLaneCount: TLabeledEdit
             Left = 176
-            Top = 491
+            Top = 659
             Width = 132
             Height = 18
             Ctl3D = False
@@ -611,7 +625,7 @@ object ProjectPropertiesForm: TProjectPropertiesForm
           end
           object cbLoadLevel: TComboBox
             Left = 34
-            Top = 410
+            Top = 578
             Width = 132
             Height = 20
             Ctl3D = False
@@ -628,7 +642,7 @@ object ProjectPropertiesForm: TProjectPropertiesForm
           end
           object pnlDealPayBar: TPanel
             Left = 62
-            Top = 537
+            Top = 705
             Width = 339
             Height = 2
             BevelOuter = bvLowered
@@ -636,7 +650,7 @@ object ProjectPropertiesForm: TProjectPropertiesForm
           end
           object leContractPrice: TLabeledEdit
             Left = 133
-            Top = 552
+            Top = 720
             Width = 117
             Height = 18
             BiDiMode = bdLeftToRight
@@ -654,7 +668,7 @@ object ProjectPropertiesForm: TProjectPropertiesForm
           end
           object leStartedSubsist: TLabeledEdit
             Left = 133
-            Top = 579
+            Top = 747
             Width = 118
             Height = 18
             Ctl3D = False
@@ -668,7 +682,7 @@ object ProjectPropertiesForm: TProjectPropertiesForm
           end
           object leMaterialSubsist: TLabeledEdit
             Left = 133
-            Top = 605
+            Top = 773
             Width = 119
             Height = 18
             Ctl3D = False
@@ -682,7 +696,7 @@ object ProjectPropertiesForm: TProjectPropertiesForm
           end
           object pnlSafeBar: TPanel
             Left = 62
-            Top = 641
+            Top = 809
             Width = 339
             Height = 2
             BevelOuter = bvLowered
@@ -690,7 +704,7 @@ object ProjectPropertiesForm: TProjectPropertiesForm
           end
           object pnlUnlockPassword: TPanel
             Left = 40
-            Top = 673
+            Top = 841
             Width = 361
             Height = 85
             BevelOuter = bvNone
@@ -930,7 +944,7 @@ object ProjectPropertiesForm: TProjectPropertiesForm
           end
           object pnlCalcParametersBar: TPanel
             Left = 62
-            Top = 769
+            Top = 937
             Width = 339
             Height = 2
             BevelOuter = bvLowered
@@ -938,7 +952,7 @@ object ProjectPropertiesForm: TProjectPropertiesForm
           end
           object leQuantityDigit: TLabeledEdit
             Left = 100
-            Top = 804
+            Top = 972
             Width = 87
             Height = 18
             EditLabel.Width = 36
@@ -950,7 +964,7 @@ object ProjectPropertiesForm: TProjectPropertiesForm
           end
           object leTotalPriceDigit: TLabeledEdit
             Left = 264
-            Top = 804
+            Top = 972
             Width = 87
             Height = 18
             EditLabel.Width = 36
@@ -962,7 +976,7 @@ object ProjectPropertiesForm: TProjectPropertiesForm
           end
           object udQuantity: TUpDown
             Left = 187
-            Top = 804
+            Top = 972
             Width = 16
             Height = 18
             Associate = leQuantityDigit
@@ -972,7 +986,7 @@ object ProjectPropertiesForm: TProjectPropertiesForm
           end
           object udTotalPrice: TUpDown
             Left = 351
-            Top = 804
+            Top = 972
             Width = 16
             Height = 18
             Associate = leTotalPriceDigit
@@ -981,7 +995,7 @@ object ProjectPropertiesForm: TProjectPropertiesForm
           end
           object gbPM_Digit: TGroupBox
             Left = 52
-            Top = 883
+            Top = 1051
             Width = 349
             Height = 44
             Caption = #20215#24046
@@ -1011,7 +1025,7 @@ object ProjectPropertiesForm: TProjectPropertiesForm
           end
           object pnlDateTime: TPanel
             Left = 62
-            Top = 942
+            Top = 1110
             Width = 339
             Height = 2
             BevelOuter = bvLowered
@@ -1019,7 +1033,7 @@ object ProjectPropertiesForm: TProjectPropertiesForm
           end
           object dtpBaseline: TDateTimePicker
             Left = 104
-            Top = 955
+            Top = 1123
             Width = 105
             Height = 20
             Date = 0.457352881945553200
@@ -1030,7 +1044,7 @@ object ProjectPropertiesForm: TProjectPropertiesForm
           end
           object dtpDeadline: TDateTimePicker
             Left = 104
-            Top = 979
+            Top = 1148
             Width = 105
             Height = 20
             Date = 0.457352881945553200
@@ -1041,7 +1055,7 @@ object ProjectPropertiesForm: TProjectPropertiesForm
           end
           object cbDealPayAloneDigiy: TCheckBox
             Left = 62
-            Top = 831
+            Top = 999
             Width = 131
             Height = 17
             Caption = #21512#21516#25903#20184#21333#29420#35774#32622
@@ -1050,7 +1064,7 @@ object ProjectPropertiesForm: TProjectPropertiesForm
           end
           object leDealPayTotalPriceDigit: TLabeledEdit
             Left = 100
-            Top = 855
+            Top = 1023
             Width = 87
             Height = 18
             EditLabel.Width = 36
@@ -1062,7 +1076,7 @@ object ProjectPropertiesForm: TProjectPropertiesForm
           end
           object udDealPayTotalPriceDigit: TUpDown
             Left = 187
-            Top = 855
+            Top = 1023
             Width = 16
             Height = 18
             Associate = leDealPayTotalPriceDigit
@@ -1071,7 +1085,7 @@ object ProjectPropertiesForm: TProjectPropertiesForm
           end
           object leDealPhase: TLabeledEdit
             Left = 177
-            Top = 410
+            Top = 578
             Width = 131
             Height = 18
             Ctl3D = False
@@ -1081,6 +1095,78 @@ object ProjectPropertiesForm: TProjectPropertiesForm
             ParentCtl3D = False
             TabOrder = 38
           end
+          object leSName_2: TLabeledEdit
+            Left = 101
+            Top = 459
+            Width = 262
+            Height = 18
+            Ctl3D = False
+            EditLabel.Width = 60
+            EditLabel.Height = 12
+            EditLabel.Caption = #21333#20301#21517#31216#65306
+            ParentCtl3D = False
+            TabOrder = 39
+          end
+          object leSLegal_2: TLabeledEdit
+            Left = 101
+            Top = 499
+            Width = 137
+            Height = 18
+            Ctl3D = False
+            EditLabel.Width = 60
+            EditLabel.Height = 12
+            EditLabel.Caption = #27861#20154#20195#34920#65306
+            ParentCtl3D = False
+            TabOrder = 40
+          end
+          object leSDate_2: TLabeledEdit
+            Left = 245
+            Top = 499
+            Width = 119
+            Height = 18
+            Ctl3D = False
+            EditLabel.Width = 60
+            EditLabel.Height = 12
+            EditLabel.Caption = #31614#35746#26085#26399#65306
+            ParentCtl3D = False
+            TabOrder = 41
+          end
+          object leCName_2: TLabeledEdit
+            Left = 101
+            Top = 289
+            Width = 262
+            Height = 18
+            Ctl3D = False
+            EditLabel.Width = 60
+            EditLabel.Height = 12
+            EditLabel.Caption = #21333#20301#21517#31216#65306
+            ParentCtl3D = False
+            TabOrder = 42
+          end
+          object leCLegal_2: TLabeledEdit
+            Left = 101
+            Top = 330
+            Width = 137
+            Height = 18
+            Ctl3D = False
+            EditLabel.Width = 60
+            EditLabel.Height = 12
+            EditLabel.Caption = #27861#20154#20195#34920#65306
+            ParentCtl3D = False
+            TabOrder = 43
+          end
+          object leCDate_2: TLabeledEdit
+            Left = 245
+            Top = 330
+            Width = 119
+            Height = 18
+            Ctl3D = False
+            EditLabel.Width = 60
+            EditLabel.Height = 12
+            EditLabel.Caption = #31614#35746#26085#26399#65306
+            ParentCtl3D = False
+            TabOrder = 44
+          end
         end
       end
     end

Forms/ProjectPropertiesFrm.pas

@@ -124,6 +124,14 @@ type
     edtReportShowStateText: TEdit;
     cbReportShowStageWithoutReply: TCheckBox;
     leDealPhase: TLabeledEdit;
+    leSName_2: TLabeledEdit;
+    lblSupervisor_2: TLabel;
+    leSLegal_2: TLabeledEdit;
+    leSDate_2: TLabeledEdit;
+    leCName_2: TLabeledEdit;
+    leCLegal_2: TLabeledEdit;
+    leCDate_2: TLabeledEdit;
+    lblConstructor_2: TLabel;
     procedure btnOkClick(Sender: TObject);
     procedure leContractPriceClick(Sender: TObject);
     procedure msbBaseMouseWheel(Sender: TObject; Shift: TShiftState;
@@ -338,15 +346,15 @@ end;
 
 procedure TProjectPropertiesForm.ResetContentsCheck;
 begin
-  if msbBase.VertScrollBar.Position < 355 then
+  if msbBase.VertScrollBar.Position < 523 then
     ResetContentsCheck(tobtnDealInfo.Tag)
-  else if msbBase.VertScrollBar.Position < 515 then
+  else if msbBase.VertScrollBar.Position < 683 then
     ResetContentsCheck(tobtnTechParameters.Tag)
-  else if msbBase.VertScrollBar.Position < 628 then
+  else if msbBase.VertScrollBar.Position < 796 then
     ResetContentsCheck(tobtnDealPayment.Tag)
-  else if msbBase.VertScrollBar.Position < 758 then
+  else if msbBase.VertScrollBar.Position < 926 then
     ResetContentsCheck(tobtnSafe.Tag)
-  else if msbBase.VertScrollBar.Position < 933 then
+  else if msbBase.VertScrollBar.Position < 1101 then
     ResetContentsCheck(tobtnCalcParameters.Tag)
   else
     ResetContentsCheck(tobtnDateTime.Tag);
@@ -363,15 +371,15 @@ begin
   if ATag = tobtnDealInfo.Tag then
     msbBase.VertScrollBar.Position := 0
   else if ATag = tobtnTechParameters.Tag then
-    msbBase.VertScrollBar.Position := 355
+    msbBase.VertScrollBar.Position := 523
   else if ATag = tobtnDealPayment.Tag then
-    msbBase.VertScrollBar.Position := 515
+    msbBase.VertScrollBar.Position := 683
   else if ATag = tobtnSafe.Tag then
-    msbBase.VertScrollBar.Position := 628
+    msbBase.VertScrollBar.Position := 796
   else if ATag = tobtnCalcParameters.Tag then
-    msbBase.VertScrollBar.Position := 758
+    msbBase.VertScrollBar.Position := 926
   else if ATag = tobtnDateTime.Tag then
-    msbBase.VertScrollBar.Position := 933;
+    msbBase.VertScrollBar.Position := 1101;
 end;
 
 procedure TProjectPropertiesForm.InitDealInfo;
@@ -386,9 +394,15 @@ begin
   leCName.Text := FProjProperties.CName;
   leCLegal.Text := FProjProperties.CLegal;
   leCDate.Text := FProjProperties.CDate;
+  leCName_2.Text := FProjProperties.CName_2;
+  leCLegal_2.Text := FProjProperties.CLegal_2;
+  leCDate_2.Text := FProjProperties.CDate_2;
   leSName.Text := FProjProperties.SName;
   leSLegal.Text := FProjProperties.SLegal;
   leSDate.Text := FProjProperties.SDate;
+  leSName_2.Text := FProjProperties.SName_2;
+  leSLegal_2.Text := FProjProperties.SLegal_2;
+  leSDate_2.Text := FProjProperties.SDate_2;
 end;
 
 procedure TProjectPropertiesForm.InitTechParameters;
@@ -413,9 +427,15 @@ begin
   FProjProperties.CName := leCName.Text;
   FProjProperties.CLegal := leCLegal.Text;
   FProjProperties.CDate := leCDate.Text;
+  FProjProperties.CName_2 := leCName_2.Text;
+  FProjProperties.CLegal_2 := leCLegal_2.Text;
+  FProjProperties.CDate_2 := leCDate_2.Text;
   FProjProperties.SName := leSName.Text;
   FProjProperties.SLegal := leSLegal.Text;
   FProjProperties.SDate := leSDate.Text;
+  FProjProperties.SName_2 := leSName_2.Text;
+  FProjProperties.SLegal_2 := leSLegal_2.Text;
+  FProjProperties.SDate_2 := leSDate_2.Text;
 end;
 
 procedure TProjectPropertiesForm.SaveTechParameters;

Units/ProjectProperty.pas

@@ -84,6 +84,12 @@ type
     FReportShowStateWithoutReply: Boolean;
     FReportShowStateText: string;
     FDealPhase: string;
+    FSLegal_2: string;
+    FCName_2: string;
+    FCDate_2: string;
+    FCLegal_2: string;
+    FSName_2: string;
+    FSDate_2: string;
 
     function GetDisplayFormat(ADigit: Integer): string;
 
@@ -165,20 +171,35 @@ type
     property BLegal: string read FBLegal write FBLegal;
     // 签订日期
     property BDate: string read FBDate write FBDate;
-    // 施工单位
+    // 施工单位: 后改为承包单位1
     // 名称
     property CName: string read FCName write FCName;
     // 法人代表
     property CLegal: string read FCLegal write FCLegal;
     // 签订日期
     property CDate: string read FCDate write FCDate;
-    // 监理单位
+    // 承包单位2
+    // 名称
+    property CName_2: string read FCName_2 write FCName_2;
+    // 法人代表
+    property CLegal_2: string read FCLegal_2 write FCLegal_2;
+    // 签订日期
+    property CDate_2: string read FCDate_2 write FCDate_2;
+    // 监理单位：改为监理单位1
     // 名称
     property SName: string read FSName write FSName;
     // 法人代表
     property SLegal: string read FSLegal write FSLegal;
     // 签订日期
     property SDate: string read FSDate write FSDate;
+    // 监理单位2
+    // 名称
+    property SName_2: string read FSName_2 write FSName_2;
+    // 法人代表
+    property SLegal_2: string read FSLegal_2 write FSLegal_2;
+    // 签订日期
+    property SDate_2: string read FSDate_2 write FSDate_2;
+
 
     {技术参数}
     // 公路等级
@@ -494,15 +515,26 @@ begin
   FDealName := GetStrPropertyDef('DealName', '');
   FDealIndex := GetStrPropertyDef('DealIndex', '');
   FDealType := GetStrPropertyDef('DealType', '');
+
   FBName := GetStrPropertyDef('BName', '');
   FBLegal := GetStrPropertyDef('BLegal', '');
   FBDate := GetStrPropertyDef('BDate', '');
+
   FCName := GetStrPropertyDef('CName', '');
   FCLegal := GetStrPropertyDef('CLegal', '');
   FCDate := GetStrPropertyDef('CDate', '');
+
+  FCName_2 := GetStrPropertyDef('CName_2', '');
+  FCLegal_2 := GetStrPropertyDef('CLegal_2', '');
+  FCDate_2 := GetStrPropertyDef('CDate_2', '');
+
   FSName := GetStrPropertyDef('SName', '');
   FSLegal := GetStrPropertyDef('SLegal', '');
   FSDate := GetStrPropertyDef('SDate', '');
+
+  FSName_2 := GetStrPropertyDef('SName_2', '');
+  FSLegal_2 := GetStrPropertyDef('SLegal_2', '');
+  FSDate_2 := GetStrPropertyDef('SDate_2', '');
 end;
 
 procedure TProjProperties.LoadTechParameters;
@@ -593,9 +625,15 @@ begin
   FPropertyInqurity.Value['CName'] := FCName;
   FPropertyInqurity.Value['CLegal'] := FCLegal;
   FPropertyInqurity.Value['CDate'] := FCDate;
+  FPropertyInqurity.Value['CName_2'] := FCName_2;
+  FPropertyInqurity.Value['CLegal_2'] := FCLegal_2;
+  FPropertyInqurity.Value['CDate_2'] := FCDate_2;
   FPropertyInqurity.Value['SName'] := FSName;
   FPropertyInqurity.Value['SLegal'] := FSLegal;
   FPropertyInqurity.Value['SDate'] := FSDate;
+  FPropertyInqurity.Value['SName_2'] := FSName_2;
+  FPropertyInqurity.Value['SLegal_2'] := FSLegal_2;
+  FPropertyInqurity.Value['SDate_2'] := FSDate_2;
 end;
 
 procedure TProjProperties.SaveTechParameters;