Task #1446 项目属性--技术参数，新增合同工期

Bug #1407 批量插入子、后项，用户粘贴数据非数值时，默认为空

Forms/BatchInsertBillsFrm.pas

@@ -402,12 +402,18 @@ end;
 
 procedure TBatchInsertBillsForm.zgPositionCellTextChanged(Sender: TObject;
   Col, Row: Integer);
+var
+  value: Double;
 begin
   if (Col > 1) and (Row > 0) then
   begin
-    zgPosition.Cells[Col, Row].Value := QuantityRoundTo(
-        StrToFloatDef(zgPosition.Cells[Col, Row].Text, 0));
-    zgPosition.Cells[Col, Row].Align := gaCenterRight;
+    if (TryStrToFloat(zgPosition.Cells[Col, Row].Text, value)) then
+    begin
+      zgPosition.Cells[Col, Row].Value := QuantityRoundTo(Value);
+      zgPosition.Cells[Col, Row].Align := gaCenterRight;
+    end
+    else
+      zgPosition.Cells[Col, Row].Value := '';
   end;
 end;
 

Forms/ProjectPropertiesFrm.dfm

@@ -225,7 +225,6 @@ object ProjectPropertiesForm: TProjectPropertiesForm
           Width = 438
           Height = 247
           HorzScrollBar.Range = 401
-          VertScrollBar.Position = 789
           VertScrollBar.Range = 1180
           Align = alClient
           AutoScroll = False
@@ -243,7 +242,7 @@ object ProjectPropertiesForm: TProjectPropertiesForm
           OnVScroll = msbBaseVScroll
           object lblDealInfo: TLabel
             Left = 7
-            Top = -785
+            Top = 4
             Width = 48
             Height = 12
             Caption = #21512#21516#20449#24687
@@ -256,28 +255,28 @@ object ProjectPropertiesForm: TProjectPropertiesForm
           end
           object lblBuilder: TLabel
             Left = 34
-            Top = -681
+            Top = 108
             Width = 60
             Height = 12
             Caption = #24314#35774#21333#20301#65306
           end
           object lblConstructor: TLabel
             Left = 34
-            Top = -597
+            Top = 192
             Width = 60
             Height = 12
             Caption = #25215#21253#21333#20301#65306
           end
           object lblSupervisor: TLabel
             Left = 34
-            Top = -513
+            Top = 276
             Width = 60
             Height = 12
             Caption = #30417#29702#21333#20301#65306
           end
           object lblTechParameters: TLabel
             Left = 7
-            Top = -418
+            Top = 371
             Width = 48
             Height = 12
             Caption = #25216#26415#21442#25968
@@ -290,14 +289,14 @@ object ProjectPropertiesForm: TProjectPropertiesForm
           end
           object lblLoadLevel: TLabel
             Left = 34
-            Top = -396
+            Top = 393
             Width = 60
             Height = 12
             Caption = #20844#36335#31561#32423#65306
           end
           object lblDealPayTitle: TLabel
             Left = 7
-            Top = -258
+            Top = 531
             Width = 48
             Height = 12
             Caption = #21512#21516#25903#20184
@@ -310,7 +309,7 @@ object ProjectPropertiesForm: TProjectPropertiesForm
           end
           object lblSafeTitel: TLabel
             Left = 7
-            Top = -154
+            Top = 635
             Width = 48
             Height = 12
             Caption = #25991#20214#23433#20840
@@ -323,14 +322,14 @@ object ProjectPropertiesForm: TProjectPropertiesForm
           end
           object lblUnlockPassword: TLabel
             Left = 36
-            Top = -130
+            Top = 659
             Width = 84
             Height = 12
             Caption = #35299#38145#33410#28857#23494#30721#65306
           end
           object lblPasswordHint: TLabel
             Left = 128
-            Top = -129
+            Top = 660
             Width = 90
             Height = 12
             Caption = 'lblPasswordHint'
@@ -344,7 +343,7 @@ object ProjectPropertiesForm: TProjectPropertiesForm
           end
           object lblCalcParametersTitel: TLabel
             Left = 7
-            Top = -26
+            Top = 763
             Width = 48
             Height = 12
             Caption = #35745#31639#21442#25968
@@ -357,14 +356,14 @@ object ProjectPropertiesForm: TProjectPropertiesForm
           end
           object lblDigit: TLabel
             Left = 36
-            Top = -2
+            Top = 787
             Width = 84
             Height = 12
             Caption = #20445#30041#23567#25968#20301#25968#65306
           end
           object lblDateTime: TLabel
             Left = 7
-            Top = 147
+            Top = 936
             Width = 48
             Height = 12
             Caption = #26102#38388#21442#25968
@@ -377,21 +376,21 @@ object ProjectPropertiesForm: TProjectPropertiesForm
           end
           object lblBaseline: TLabel
             Left = 36
-            Top = 170
+            Top = 959
             Width = 60
             Height = 12
             Caption = #36215#22987#26085#26399#65306
           end
           object lblDeadline: TLabel
             Left = 36
-            Top = 194
+            Top = 983
             Width = 60
             Height = 12
             Caption = #25130#27490#26085#26399#65306
           end
           object lblDateHint: TLabel
             Left = 37
-            Top = 215
+            Top = 1004
             Width = 192
             Height = 12
             Caption = #24403#21069#25130#27490#26085#26399' '#65308' '#36215#22987#26085#26399#65292#35831#26680#26597
@@ -404,7 +403,7 @@ object ProjectPropertiesForm: TProjectPropertiesForm
           end
           object pnlDealInfoBar: TPanel
             Left = 62
-            Top = -780
+            Top = 9
             Width = 339
             Height = 2
             BevelOuter = bvLowered
@@ -412,7 +411,7 @@ object ProjectPropertiesForm: TProjectPropertiesForm
           end
           object leProjectName: TLabeledEdit
             Left = 33
-            Top = -753
+            Top = 36
             Width = 330
             Height = 18
             Ctl3D = False
@@ -424,7 +423,7 @@ object ProjectPropertiesForm: TProjectPropertiesForm
           end
           object leDealName: TLabeledEdit
             Left = 33
-            Top = -713
+            Top = 76
             Width = 152
             Height = 18
             Ctl3D = False
@@ -436,7 +435,7 @@ object ProjectPropertiesForm: TProjectPropertiesForm
           end
           object leDealIndex: TLabeledEdit
             Left = 195
-            Top = -713
+            Top = 76
             Width = 80
             Height = 18
             Ctl3D = False
@@ -448,7 +447,7 @@ object ProjectPropertiesForm: TProjectPropertiesForm
           end
           object leBName: TLabeledEdit
             Left = 101
-            Top = -666
+            Top = 123
             Width = 261
             Height = 18
             Ctl3D = False
@@ -460,7 +459,7 @@ object ProjectPropertiesForm: TProjectPropertiesForm
           end
           object leBLegal: TLabeledEdit
             Left = 101
-            Top = -625
+            Top = 164
             Width = 137
             Height = 18
             Ctl3D = False
@@ -472,7 +471,7 @@ object ProjectPropertiesForm: TProjectPropertiesForm
           end
           object leBDate: TLabeledEdit
             Left = 245
-            Top = -625
+            Top = 164
             Width = 119
             Height = 18
             Ctl3D = False
@@ -484,7 +483,7 @@ object ProjectPropertiesForm: TProjectPropertiesForm
           end
           object leCName: TLabeledEdit
             Left = 101
-            Top = -582
+            Top = 207
             Width = 262
             Height = 18
             Ctl3D = False
@@ -496,7 +495,7 @@ object ProjectPropertiesForm: TProjectPropertiesForm
           end
           object leCLegal: TLabeledEdit
             Left = 101
-            Top = -541
+            Top = 248
             Width = 137
             Height = 18
             Ctl3D = False
@@ -508,7 +507,7 @@ object ProjectPropertiesForm: TProjectPropertiesForm
           end
           object leCDate: TLabeledEdit
             Left = 245
-            Top = -541
+            Top = 248
             Width = 119
             Height = 18
             Ctl3D = False
@@ -520,7 +519,7 @@ object ProjectPropertiesForm: TProjectPropertiesForm
           end
           object leSName: TLabeledEdit
             Left = 101
-            Top = -498
+            Top = 291
             Width = 262
             Height = 18
             Ctl3D = False
@@ -532,7 +531,7 @@ object ProjectPropertiesForm: TProjectPropertiesForm
           end
           object leSLegal: TLabeledEdit
             Left = 101
-            Top = -458
+            Top = 331
             Width = 137
             Height = 18
             Ctl3D = False
@@ -544,7 +543,7 @@ object ProjectPropertiesForm: TProjectPropertiesForm
           end
           object leSDate: TLabeledEdit
             Left = 245
-            Top = -458
+            Top = 331
             Width = 119
             Height = 18
             Ctl3D = False
@@ -556,7 +555,7 @@ object ProjectPropertiesForm: TProjectPropertiesForm
           end
           object pnlTechParametersBar: TPanel
             Left = 62
-            Top = -413
+            Top = 376
             Width = 339
             Height = 2
             BevelOuter = bvLowered
@@ -564,7 +563,7 @@ object ProjectPropertiesForm: TProjectPropertiesForm
           end
           object leStartPeg: TLabeledEdit
             Left = 34
-            Top = -338
+            Top = 451
             Width = 132
             Height = 18
             Ctl3D = False
@@ -576,7 +575,7 @@ object ProjectPropertiesForm: TProjectPropertiesForm
           end
           object leEndPeg: TLabeledEdit
             Left = 176
-            Top = -338
+            Top = 451
             Width = 131
             Height = 18
             Ctl3D = False
@@ -588,7 +587,7 @@ object ProjectPropertiesForm: TProjectPropertiesForm
           end
           object leLength: TLabeledEdit
             Left = 34
-            Top = -298
+            Top = 491
             Width = 132
             Height = 18
             Ctl3D = False
@@ -600,7 +599,7 @@ object ProjectPropertiesForm: TProjectPropertiesForm
           end
           object leLaneCount: TLabeledEdit
             Left = 176
-            Top = -298
+            Top = 491
             Width = 132
             Height = 18
             Ctl3D = False
@@ -612,7 +611,7 @@ object ProjectPropertiesForm: TProjectPropertiesForm
           end
           object cbLoadLevel: TComboBox
             Left = 34
-            Top = -379
+            Top = 410
             Width = 132
             Height = 20
             Ctl3D = False
@@ -629,7 +628,7 @@ object ProjectPropertiesForm: TProjectPropertiesForm
           end
           object pnlDealPayBar: TPanel
             Left = 62
-            Top = -252
+            Top = 537
             Width = 339
             Height = 2
             BevelOuter = bvLowered
@@ -637,7 +636,7 @@ object ProjectPropertiesForm: TProjectPropertiesForm
           end
           object leContractPrice: TLabeledEdit
             Left = 133
-            Top = -237
+            Top = 552
             Width = 117
             Height = 18
             BiDiMode = bdLeftToRight
@@ -655,7 +654,7 @@ object ProjectPropertiesForm: TProjectPropertiesForm
           end
           object leStartedSubsist: TLabeledEdit
             Left = 133
-            Top = -210
+            Top = 579
             Width = 118
             Height = 18
             Ctl3D = False
@@ -669,7 +668,7 @@ object ProjectPropertiesForm: TProjectPropertiesForm
           end
           object leMaterialSubsist: TLabeledEdit
             Left = 133
-            Top = -184
+            Top = 605
             Width = 119
             Height = 18
             Ctl3D = False
@@ -683,7 +682,7 @@ object ProjectPropertiesForm: TProjectPropertiesForm
           end
           object pnlSafeBar: TPanel
             Left = 62
-            Top = -148
+            Top = 641
             Width = 339
             Height = 2
             BevelOuter = bvLowered
@@ -691,7 +690,7 @@ object ProjectPropertiesForm: TProjectPropertiesForm
           end
           object pnlUnlockPassword: TPanel
             Left = 40
-            Top = -116
+            Top = 673
             Width = 361
             Height = 85
             BevelOuter = bvNone
@@ -919,7 +918,7 @@ object ProjectPropertiesForm: TProjectPropertiesForm
           end
           object leDealType: TLabeledEdit
             Left = 283
-            Top = -713
+            Top = 76
             Width = 80
             Height = 18
             Ctl3D = False
@@ -931,7 +930,7 @@ object ProjectPropertiesForm: TProjectPropertiesForm
           end
           object pnlCalcParametersBar: TPanel
             Left = 62
-            Top = -20
+            Top = 769
             Width = 339
             Height = 2
             BevelOuter = bvLowered
@@ -939,7 +938,7 @@ object ProjectPropertiesForm: TProjectPropertiesForm
           end
           object leQuantityDigit: TLabeledEdit
             Left = 100
-            Top = 15
+            Top = 804
             Width = 87
             Height = 18
             EditLabel.Width = 36
@@ -951,7 +950,7 @@ object ProjectPropertiesForm: TProjectPropertiesForm
           end
           object leTotalPriceDigit: TLabeledEdit
             Left = 264
-            Top = 15
+            Top = 804
             Width = 87
             Height = 18
             EditLabel.Width = 36
@@ -963,7 +962,7 @@ object ProjectPropertiesForm: TProjectPropertiesForm
           end
           object udQuantity: TUpDown
             Left = 187
-            Top = 15
+            Top = 804
             Width = 16
             Height = 18
             Associate = leQuantityDigit
@@ -973,7 +972,7 @@ object ProjectPropertiesForm: TProjectPropertiesForm
           end
           object udTotalPrice: TUpDown
             Left = 351
-            Top = 15
+            Top = 804
             Width = 16
             Height = 18
             Associate = leTotalPriceDigit
@@ -982,7 +981,7 @@ object ProjectPropertiesForm: TProjectPropertiesForm
           end
           object gbPM_Digit: TGroupBox
             Left = 52
-            Top = 94
+            Top = 883
             Width = 349
             Height = 44
             Caption = #20215#24046
@@ -1012,7 +1011,7 @@ object ProjectPropertiesForm: TProjectPropertiesForm
           end
           object pnlDateTime: TPanel
             Left = 62
-            Top = 153
+            Top = 942
             Width = 339
             Height = 2
             BevelOuter = bvLowered
@@ -1020,7 +1019,7 @@ object ProjectPropertiesForm: TProjectPropertiesForm
           end
           object dtpBaseline: TDateTimePicker
             Left = 104
-            Top = 166
+            Top = 955
             Width = 105
             Height = 20
             Date = 0.457352881945553200
@@ -1031,7 +1030,7 @@ object ProjectPropertiesForm: TProjectPropertiesForm
           end
           object dtpDeadline: TDateTimePicker
             Left = 104
-            Top = 190
+            Top = 979
             Width = 105
             Height = 20
             Date = 0.457352881945553200
@@ -1042,7 +1041,7 @@ object ProjectPropertiesForm: TProjectPropertiesForm
           end
           object cbDealPayAloneDigiy: TCheckBox
             Left = 62
-            Top = 42
+            Top = 831
             Width = 131
             Height = 17
             Caption = #21512#21516#25903#20184#21333#29420#35774#32622
@@ -1051,7 +1050,7 @@ object ProjectPropertiesForm: TProjectPropertiesForm
           end
           object leDealPayTotalPriceDigit: TLabeledEdit
             Left = 100
-            Top = 66
+            Top = 855
             Width = 87
             Height = 18
             EditLabel.Width = 36
@@ -1063,13 +1062,25 @@ object ProjectPropertiesForm: TProjectPropertiesForm
           end
           object udDealPayTotalPriceDigit: TUpDown
             Left = 187
-            Top = 66
+            Top = 855
             Width = 16
             Height = 18
             Associate = leDealPayTotalPriceDigit
             Max = 10
             TabOrder = 37
           end
+          object leDealPhase: TLabeledEdit
+            Left = 177
+            Top = 410
+            Width = 131
+            Height = 18
+            Ctl3D = False
+            EditLabel.Width = 60
+            EditLabel.Height = 12
+            EditLabel.Caption = #21512#21516#24037#26399#65306
+            ParentCtl3D = False
+            TabOrder = 38
+          end
         end
       end
     end

Forms/ProjectPropertiesFrm.pas

@@ -123,6 +123,7 @@ type
     cbReportShowState: TCheckBox;
     edtReportShowStateText: TEdit;
     cbReportShowStageWithoutReply: TCheckBox;
+    leDealPhase: TLabeledEdit;
     procedure btnOkClick(Sender: TObject);
     procedure leContractPriceClick(Sender: TObject);
     procedure msbBaseMouseWheel(Sender: TObject; Shift: TShiftState;
@@ -395,6 +396,7 @@ begin
   leEndPeg.Text := FProjProperties.EndPeg;
   leLength.Text := FloatToStr(FProjProperties.LoadLength);
   leLaneCount.Text := IntToStr(FProjProperties.LaneCount);
+  leDealPhase.Text := FProjProperties.DealPhase;
 end;
 
 procedure TProjectPropertiesForm.SaveDealInfo;
@@ -421,6 +423,7 @@ begin
   FProjProperties.EndPeg := leEndPeg.Text;
   FProjProperties.LoadLength := StrToFloatDef(leLength.Text, 0);
   FProjProperties.LaneCount := StrToIntDef(leLaneCount.Text, 0);
+  FProjProperties.DealPhase := leDealPhase.Text;
 end;
 
 procedure TProjectPropertiesForm.tobtnBaseClick(Sender: TObject);

Forms/ReportsFrm.pas

@@ -13,7 +13,7 @@ uses
   AuditSelectFrm,
   Windows, Messages, SysUtils, Variants, Classes, Graphics, Controls, Forms,
   Dialogs, PrintCom, PrintComXML, ExtCtrls, ExTreeView, ImgList,
-  dxBarExtItems, dxBar, ComCtrls, ToolWin, StdCtrls;
+  dxBarExtItems, dxBar, ComCtrls, ToolWin, StdCtrls, Jpeg;
 
 type
   TReportsForm = class(TForm)
@@ -467,11 +467,14 @@ begin
 end;
 
 procedure TReportsForm.xlbPrintCurPageClick(Sender: TObject);
+var
+  img: TJPEGImage;
 begin
   if _IsEncrypt or G_IsCloud then
     PreviewComXML.Print(PreviewBox.Canvas, CurPage, 1)
   else
     TipMessage(GetHintStr, Handle);
+  //PreviewBox.Picture.SaveToFile('E:\1.jpg');
 end;
 
 procedure TReportsForm.xcbStartPageChange(Sender: TObject);

Units/ProjectProperty.pas

@@ -83,6 +83,7 @@ type
     FReportShowState: Boolean;
     FReportShowStateWithoutReply: Boolean;
     FReportShowStateText: string;
+    FDealPhase: string;
 
     function GetBoolPropertyDef(const AName: string; ADef: Boolean): Boolean;
     function GetIntPropertyDef(const AName: string; ADef: Integer): Integer;
@@ -190,6 +191,8 @@ type
     property LoadLength: Double read FLoadLength write FLoadLength;
     // 났돛鑒
     property LaneCount: Integer read FLaneCount write FLaneCount;
+    // 북谿묏퍅
+    property DealPhase: string read FDealPhase write FDealPhase;
 
     {북谿連마}
     property ContractPrice: Double read FContractPrice write SetContractPrice;
@@ -509,6 +512,7 @@ begin
   FEndPeg := GetStrPropertyDef('EndPeg', '');
   FLoadLength := GetFloatPropertyDef('LoadLength', 0);
   FLaneCount := GetIntPropertyDef('LaneCount', 0);
+  FDealPhase := GetStrPropertyDef('DealPhase', '');
 end;
 
 procedure TProjProperties.LoadViewProperties;
@@ -601,6 +605,7 @@ begin
   FPropertyInqurity.Value['EndPeg'] := FEndPeg;
   FPropertyInqurity.Value['LoadLength'] := FLoadLength;
   FPropertyInqurity.Value['LaneCount'] := FLaneCount;
+  FPropertyInqurity.Value['DealPhase'] := FDealPhase;
 end;
 
 procedure TProjProperties.SetAuditCompany(const Value: string);