Merge branch 'master' of http://192.168.1.12:3000/MaiXinRong/Measure

DataModules/DealPaymentDm.dfm

@@ -110,6 +110,7 @@ object DealPaymentData: TDealPaymentData
       item
         FieldName = 'RangePrice'
       end>
+    BeforeAddRecord = sdvDealPaymentBeforeAddRecord
     OnGetText = sdvDealPaymentGetText
     OnSetText = sdvDealPaymentSetText
     OnNeedLookupRecord = sdvDealPaymentNeedLookupRecord

DataModules/DealPaymentDm.pas

@@ -24,6 +24,8 @@ type
     procedure sddDealPaymentAfterValueChanged(AValue: TsdValue);
     procedure sddDealPaymentBeforeDeleteRecord(ARecord: TsdDataRecord;
       var Allow: Boolean);
+    procedure sdvDealPaymentBeforeAddRecord(ARecord: TsdDataRecord;
+      var Allow: Boolean);
   private
     FProjectData: TObject;
     FPayFormula: TPayFormula;
@@ -476,8 +478,18 @@ procedure TDealPaymentData.sdvDealPaymentSetText(var Text: string;
 
 begin
   if not Assigned(AValue) then Exit;
+
+  Text := Trim(Text);
+  if SameText('Name', AValue.FieldName) and (Text = '') then
+  begin
+    ErrorMessage('合同支付项名称不允许为空，如需删除，请点击右键进行删除');
+    Allow := False;
+    Exit;
+  end;
+
   CheckLockedData;
   if not Allow then Exit;
+
   if SameText('StartedPrice', AValue.FieldName) then
     DoStartedPriceChanged;
   if SameText('RangePrice', AValue.FieldName) then
@@ -735,4 +747,10 @@ begin
   end;
 end;
 
+procedure TDealPaymentData.sdvDealPaymentBeforeAddRecord(
+  ARecord: TsdDataRecord; var Allow: Boolean);
+begin
+  Allow := ARecord.ValueByName('Name').AsString <> '';
+end;
+
 end.

Dprs/Pro/Measure.dof

@@ -114,8 +114,8 @@ IncludeVerInfo=1
 AutoIncBuild=1
 MajorVer=3
 MinorVer=1
-Release=5
-Build=3002
+Release=6
+Build=101
 Debug=0
 PreRelease=0
 Special=0
@@ -126,13 +126,13 @@ CodePage=936
 [Version Info Keys]
 CompanyName=珠海纵横创新软件有限公司
 FileDescription=纵横结算决算计量一体化专业版
-FileVersion=3.1.5.3002
+FileVersion=3.1.6.101
 InternalName=
 LegalCopyright=版权所有（C）珠海纵横创新软件有限公司2003-2016
 LegalTrademarks=Measure
 OriginalFilename=
 ProductName=纵横公路工程结算决算一体化软件
-ProductVersion=3.1.5.3
+ProductVersion=3.1.6.1
 [Excluded Packages]
 C:\Program Files (x86)\Borland\Delphi7\Lib\3F\Developer Express Inc\ExpressEditors Library 5\Delphi 7\Bin\dclcxEditorsVCLD7.bpl=ExpressEditors Library 5 (VCL Edition) by Developer Express Inc.
 C:\Program Files (x86)\Borland\Delphi7\Lib\3F\Developer Express Inc\ExpressEditors Library 5\Delphi 7\Bin\dclcxExtEditorsVCLD7.bpl=ExpressExtendedEditors Library 5 (VCL Edition) by Developer Express Inc.

Dprs/Pro/Measure_Cloud.dof

@@ -114,8 +114,8 @@ IncludeVerInfo=1
 AutoIncBuild=1
 MajorVer=3
 MinorVer=1
-Release=5
-Build=3002
+Release=6
+Build=101
 Debug=0
 PreRelease=0
 Special=0
@@ -126,13 +126,13 @@ CodePage=936
 [Version Info Keys]
 CompanyName=珠海纵横创新软件有限公司
 FileDescription=纵横结算决算计量一体化云版
-FileVersion=3.1.5.3002
+FileVersion=3.1.6.101
 InternalName=
 LegalCopyright=版权所有（C）珠海纵横创新软件有限公司2003-2016
 LegalTrademarks=Measure
 OriginalFilename=
 ProductName=纵横公路工程结算决算一体化软件
-ProductVersion=3.1.5.3
+ProductVersion=3.1.6.1
 [Excluded Packages]
 C:\Program Files (x86)\Borland\Delphi7\Lib\3F\Developer Express Inc\ExpressEditors Library 5\Delphi 7\Bin\dclcxEditorsVCLD7.bpl=ExpressEditors Library 5 (VCL Edition) by Developer Express Inc.
 C:\Program Files (x86)\Borland\Delphi7\Lib\3F\Developer Express Inc\ExpressEditors Library 5\Delphi 7\Bin\dclcxExtEditorsVCLD7.bpl=ExpressExtendedEditors Library 5 (VCL Edition) by Developer Express Inc.

Dprs/Pro/Measure_GuangDong.dof

@@ -114,8 +114,8 @@ IncludeVerInfo=1
 AutoIncBuild=1
 MajorVer=3
 MinorVer=1
-Release=5
-Build=3002
+Release=6
+Build=101
 Debug=0
 PreRelease=0
 Special=0
@@ -126,13 +126,13 @@ CodePage=936
 [Version Info Keys]
 CompanyName=珠海纵横创新软件有限公司
 FileDescription=纵横结算决算计量一体化广东专业版
-FileVersion=3.1.5.3002
+FileVersion=3.1.6.101
 InternalName=
 LegalCopyright=版权所有（C）珠海纵横创新软件有限公司2003-2016
 LegalTrademarks=Measure
 OriginalFilename=
 ProductName=纵横公路工程结算决算一体化软件
-ProductVersion=3.1.5.3
+ProductVersion=3.1.6.1
 [Excluded Packages]
 C:\Program Files (x86)\Borland\Delphi7\Lib\3F\Developer Express Inc\ExpressEditors Library 5\Delphi 7\Bin\dclcxEditorsVCLD7.bpl=ExpressEditors Library 5 (VCL Edition) by Developer Express Inc.
 C:\Program Files (x86)\Borland\Delphi7\Lib\3F\Developer Express Inc\ExpressEditors Library 5\Delphi 7\Bin\dclcxExtEditorsVCLD7.bpl=ExpressExtendedEditors Library 5 (VCL Edition) by Developer Express Inc.

Dprs/Pro/Measure_GuangDong_Cloud.dof

@@ -114,8 +114,8 @@ IncludeVerInfo=1
 AutoIncBuild=1
 MajorVer=3
 MinorVer=1
-Release=5
-Build=3002
+Release=6
+Build=101
 Debug=0
 PreRelease=0
 Special=0
@@ -126,13 +126,13 @@ CodePage=936
 [Version Info Keys]
 CompanyName=珠海纵横创新软件有限公司
 FileDescription=纵横结算决算计量一体化广东云版
-FileVersion=3.1.5.3002
+FileVersion=3.1.6.101
 InternalName=
 LegalCopyright=版权所有（C）珠海纵横创新软件有限公司2003-2016
 LegalTrademarks=Measure
 OriginalFilename=
 ProductName=纵横公路工程结算决算一体化软件
-ProductVersion=3.1.5.3
+ProductVersion=3.1.6.1
 [Excluded Packages]
 C:\Program Files (x86)\Borland\Delphi7\Lib\3F\Developer Express Inc\ExpressEditors Library 5\Delphi 7\Bin\dclcxEditorsVCLD7.bpl=ExpressEditors Library 5 (VCL Edition) by Developer Express Inc.
 C:\Program Files (x86)\Borland\Delphi7\Lib\3F\Developer Express Inc\ExpressEditors Library 5\Delphi 7\Bin\dclcxExtEditorsVCLD7.bpl=ExpressExtendedEditors Library 5 (VCL Edition) by Developer Express Inc.

Dprs/Pro/Measure_GuangDong_TZ.dof

@@ -114,8 +114,8 @@ IncludeVerInfo=1
 AutoIncBuild=0
 MajorVer=3
 MinorVer=1
-Release=5
-Build=3002
+Release=6
+Build=100
 Debug=0
 PreRelease=0
 Special=0
@@ -126,13 +126,13 @@ CodePage=936
 [Version Info Keys]
 CompanyName=珠海纵横创新软件有限公司
 FileDescription=纵横0号台账广东专业版
-FileVersion=3.1.5.3002
+FileVersion=3.1.6.100
 InternalName=
 LegalCopyright=版权所有（C）珠海纵横创新软件有限公司2003-2016
 LegalTrademarks=Measure
 OriginalFilename=
 ProductName=纵横公路工程结算决算一体化软件
-ProductVersion=3.1.5.3
+ProductVersion=3.1.6.1
 Comments=
 [Excluded Packages]
 C:\Program Files (x86)\Borland\Delphi7\Lib\3F\Developer Express Inc\ExpressEditors Library 5\Delphi 7\Bin\dclcxEditorsVCLD7.bpl=ExpressEditors Library 5 (VCL Edition) by Developer Express Inc.

Dprs/Pro/Measure_TZ.dof

@@ -114,8 +114,8 @@ IncludeVerInfo=1
 AutoIncBuild=1
 MajorVer=3
 MinorVer=1
-Release=5
-Build=3002
+Release=6
+Build=101
 Debug=0
 PreRelease=0
 Special=0
@@ -126,13 +126,13 @@ CodePage=936
 [Version Info Keys]
 CompanyName=珠海纵横创新软件有限公司
 FileDescription=纵横0号台账专业版
-FileVersion=3.1.5.3002
+FileVersion=3.1.6.101
 InternalName=
 LegalCopyright=版权所有（C）珠海纵横创新软件有限公司2003-2016
 LegalTrademarks=Measure
 OriginalFilename=
 ProductName=纵横公路工程结算决算一体化软件
-ProductVersion=3.1.5.3
+ProductVersion=3.1.6.1
 [Excluded Packages]
 C:\Program Files (x86)\Borland\Delphi7\Lib\3F\Developer Express Inc\ExpressEditors Library 5\Delphi 7\Bin\dclcxEditorsVCLD7.bpl=ExpressEditors Library 5 (VCL Edition) by Developer Express Inc.
 C:\Program Files (x86)\Borland\Delphi7\Lib\3F\Developer Express Inc\ExpressEditors Library 5\Delphi 7\Bin\dclcxExtEditorsVCLD7.bpl=ExpressExtendedEditors Library 5 (VCL Edition) by Developer Express Inc.

Dprs/Trail/Measure.dof

@@ -114,8 +114,8 @@ IncludeVerInfo=1
 AutoIncBuild=1
 MajorVer=3
 MinorVer=1
-Release=5
-Build=3002
+Release=6
+Build=101
 Debug=0
 PreRelease=0
 Special=0
@@ -126,13 +126,13 @@ CodePage=936
 [Version Info Keys]
 CompanyName=珠海纵横创新软件有限公司
 FileDescription=纵横结算决算计量一体化学习版
-FileVersion=3.1.5.3002
+FileVersion=3.1.6.101
 InternalName=
 LegalCopyright=版权所有（C）珠海纵横创新软件有限公司2003-2016
 LegalTrademarks=Measure
 OriginalFilename=
 ProductName=纵横公路工程结算决算一体化软件
-ProductVersion=3.1.5.3
+ProductVersion=3.1.6.1
 [Excluded Packages]
 C:\Program Files (x86)\Borland\Delphi7\Lib\3F\Developer Express Inc\ExpressEditors Library 5\Delphi 7\Bin\dclcxEditorsVCLD7.bpl=ExpressEditors Library 5 (VCL Edition) by Developer Express Inc.
 C:\Program Files (x86)\Borland\Delphi7\Lib\3F\Developer Express Inc\ExpressEditors Library 5\Delphi 7\Bin\dclcxExtEditorsVCLD7.bpl=ExpressExtendedEditors Library 5 (VCL Edition) by Developer Express Inc.

Dprs/Trail/Measure_GuangDong.dof

@@ -114,8 +114,8 @@ IncludeVerInfo=1
 AutoIncBuild=1
 MajorVer=3
 MinorVer=1
-Release=5
-Build=3002
+Release=6
+Build=101
 Debug=0
 PreRelease=0
 Special=0
@@ -126,13 +126,13 @@ CodePage=936
 [Version Info Keys]
 CompanyName=珠海纵横创新软件有限公司
 FileDescription=纵横结算决算计量一体化广东学习版
-FileVersion=3.1.5.3002
+FileVersion=3.1.6.101
 InternalName=
 LegalCopyright=版权所有（C）珠海纵横创新软件有限公司2003-2016
 LegalTrademarks=Measure
 OriginalFilename=
 ProductName=纵横结算决算计量一体化软件
-ProductVersion=3.1.5.3
+ProductVersion=3.1.6.1
 [Excluded Packages]
 C:\Program Files (x86)\Borland\Delphi7\Lib\3F\Developer Express Inc\ExpressEditors Library 5\Delphi 7\Bin\dclcxEditorsVCLD7.bpl=ExpressEditors Library 5 (VCL Edition) by Developer Express Inc.
 C:\Program Files (x86)\Borland\Delphi7\Lib\3F\Developer Express Inc\ExpressEditors Library 5\Delphi 7\Bin\dclcxExtEditorsVCLD7.bpl=ExpressExtendedEditors Library 5 (VCL Edition) by Developer Express Inc.

Forms/ReportsFrm.dfm

@@ -82,23 +82,23 @@ object ReportsForm: TReportsForm
   end
   object pnlReports: TPanel
     Left = 0
-    Top = 81
+    Top = 76
     Width = 1107
-    Height = 425
+    Height = 430
     Align = alClient
     BevelOuter = bvNone
     TabOrder = 6
     object sprReportPreview: TSplitter
       Left = 211
       Top = 0
-      Height = 425
+      Height = 430
       AutoSnap = False
     end
     object pnlReportsList: TPanel
       Left = 0
       Top = 0
       Width = 211
-      Height = 425
+      Height = 430
       Align = alLeft
       BevelOuter = bvNone
       TabOrder = 0
@@ -106,7 +106,7 @@ object ReportsForm: TReportsForm
         Left = 0
         Top = 35
         Width = 211
-        Height = 390
+        Height = 395
         Align = alClient
         Font.Charset = DEFAULT_CHARSET
         Font.Color = clWindowText
@@ -193,7 +193,7 @@ object ReportsForm: TReportsForm
       Left = 214
       Top = 0
       Width = 893
-      Height = 425
+      Height = 430
       HorzScrollBar.Increment = 48
       HorzScrollBar.Tracking = True
       VertScrollBar.Increment = 32
@@ -216,7 +216,7 @@ object ReportsForm: TReportsForm
     Font.Charset = DEFAULT_CHARSET
     Font.Color = clWindowText
     Font.Height = -12
-    Font.Name = #24494#36719#38597#40657
+    Font.Name = #23435#20307
     Font.Style = []
     Bars = <
       item
@@ -313,7 +313,7 @@ object ReportsForm: TReportsForm
         Caption = #33539#22260#36755#20986
         DockedDockingStyle = dsTop
         DockedLeft = 0
-        DockedTop = 52
+        DockedTop = 47
         DockingStyle = dsTop
         FloatLeft = 602
         FloatTop = 414
@@ -343,7 +343,7 @@ object ReportsForm: TReportsForm
         Caption = #25253#34920#36873#39033
         DockedDockingStyle = dsTop
         DockedLeft = 308
-        DockedTop = 52
+        DockedTop = 47
         DockingStyle = dsTop
         FloatLeft = 484
         FloatTop = 279
@@ -388,7 +388,7 @@ object ReportsForm: TReportsForm
     DockControlHeights = (
       0
       0
-      81
+      76
       0)
     object xlbPrint: TdxBarLargeButton
       Caption = #25171#21360

Forms/ReportsFrm.pas

@@ -651,25 +651,40 @@ begin
 end;
 
 procedure TReportsForm.tbImportSrtClick(Sender: TObject);
-var
-  sFileName, sNewFileName: string;
-  vTemplateNode: TTemplateNode;
-begin
-  if SelectFile(sFileName, '.srt') then
+
+  procedure ImportReportTemplate(const AFileName: string);
+  var
+    sNewFileName: string;
+    vTemplateNode: TTemplateNode;
   begin
-    sNewFileName := GetReportTemplatePath + ExtractFileName(sFileName);
+    sNewFileName := GetReportTemplatePath + ExtractFileName(AFileName);
     if not FileExists(sNewFileName) then
     begin
-      CopyFile(PChar(sFileName), PChar(sNewFileName), True);
+      CopyFile(PChar(AFileName), PChar(sNewFileName), True);
       vTemplateNode := ReportTemplateManager.AddReportTemplate(sNewFileName);
       AddReportTemplate(vTemplateNode);
     end
     else
-      if QuestMessage('已存在报表模板' + ExtractFileName(sFileName) + ',是否覆盖原模板?', Handle) then
-        CopyFile(PChar(sFileName), PChar(sNewFileName), False)
+      if QuestMessage('已存在报表模板' + ExtractFileName(AFileName) + ',是否覆盖原模板?', Handle) then
+        CopyFile(PChar(AFileName), PChar(sNewFileName), False)
       else
         Exit;
   end;
+
+var
+  sgsFiles: TStrings;
+  iFile: Integer;
+begin
+  sgsFiles := TStringList.Create;
+  try
+    if SelectFiles(sgsFiles, '.srt') then
+    begin
+      for iFile := 0 to sgsFiles.Count - 1 do
+        ImportReportTemplate(sgsFiles.Strings[iFile]);
+    end;
+  finally
+    sgsFiles.Free;
+  end;
 end;
 
 procedure TReportsForm.tbDeleteSrtClick(Sender: TObject);

Forms/WebNewTenderFrm.dfm

@@ -65,6 +65,7 @@ object WebNewTenderForm: TWebNewTenderForm
     Width = 285
     Height = 20
     TabOrder = 2
+    OnKeyDown = edtKeyKeyDown
   end
   object edtTenderName: TEdit
     Left = 16
@@ -72,5 +73,6 @@ object WebNewTenderForm: TWebNewTenderForm
     Width = 285
     Height = 20
     TabOrder = 3
+    OnKeyDown = edtKeyKeyDown
   end
 end

Forms/WebNewTenderFrm.pas

@@ -15,6 +15,8 @@ type
     lbl2: TLabel;
     edtTenderName: TEdit;
     procedure FormCreate(Sender: TObject);
+    procedure edtKeyKeyDown(Sender: TObject; var Key: Word;
+      Shift: TShiftState);
   private
     { Private declarations }
   public
@@ -36,4 +38,14 @@ begin
   end;
 end;
 
+procedure TWebNewTenderForm.edtKeyKeyDown(Sender: TObject; var Key: Word;
+  Shift: TShiftState);
+begin
+  if Key = 13 then
+  begin
+    if (edtKey.Text <> '') and (edtTenderName.Text <> '') then
+      ModalResult := mrOk;
+  end;
+end;
+
 end.

Frames/BGLFme.dfm

@@ -168,6 +168,7 @@ object BGLFrame: TBGLFrame
         Ctl3D = False
         DataField = 'Pos_Reason'
         ParentCtl3D = False
+        ScrollBars = ssVertical
         TabOrder = 0
         OnExit = dbmPos_ReasonExit
       end
@@ -180,6 +181,7 @@ object BGLFrame: TBGLFrame
         Ctl3D = False
         DataField = 'Direction'
         ParentCtl3D = False
+        ScrollBars = ssVertical
         TabOrder = 1
         OnExit = dbmPos_ReasonExit
       end

Units/UtilMethods.pas

@@ -42,6 +42,7 @@ type
   {Select & Save File Choose}
   function GetFilter(AExt: string): string;
   function SelectFile(var AFileName: string; const AExt: string): Boolean;
+  function SelectFiles(AFiles: TStrings; const AExt: string): Boolean;
   function SaveFile(var FileName: string; const AExt: string): Boolean;
   function SelectOutputDirectory(const ATitle: string; var ADirectory: string;
     AParentHandle: THandle = 0; AHasNewFolderBtn: Boolean = True): Boolean;
@@ -296,6 +297,27 @@ begin
   end;
 end;
 
+function SelectFiles(AFiles: TStrings; const AExt: string): Boolean;
+var
+  odFile: TOpenDialog;
+begin
+  odFile := TOpenDialog.Create(nil);
+  try
+    odFile.Options := odFile.Options + [ofAllowMultiSelect];
+    odFile.Filter := GetFilter(AExt);
+    if odFile.Execute then
+    begin
+      Application.ProcessMessages;
+      AFiles.Assign(odFile.Files);
+      Result := True;
+    end
+    else
+      Result := False;
+  finally
+    odFile.Free;
+  end;
+end;
+
 function SaveFile(var FileName: string; const AExt: string): Boolean;
 var
   sdFile: TSaveDialog;