更新带锁版本的dpr产品信息，版本号为315.208

Dprs/Pro/Measure.dof

@@ -114,13 +114,8 @@ IncludeVerInfo=1
 AutoIncBuild=1
 MajorVer=3
 MinorVer=1
-<<<<<<< HEAD
 Release=5
-Build=204
-=======
-Release=3
-Build=3027
->>>>>>> remotes/origin/3.1.3.3
+Build=209
 Debug=0
 PreRelease=0
 Special=0
@@ -131,24 +126,16 @@ CodePage=936
 [Version Info Keys]
 CompanyName=珠海纵横创新软件有限公司
 FileDescription=纵横结算决算计量一体化专业版
-<<<<<<< HEAD
-FileVersion=3.1.5.204
+FileVersion=3.1.5.209
 InternalName=
-LegalCopyright=
-LegalTrademarks=
-=======
-FileVersion=3.1.3.3027
-InternalName=Measure
-LegalCopyright=版权所有(C) 珠海纵横创新软件有限公司 2003-2014。保留所有权利。
+LegalCopyright=版权所有（C）珠海纵横创新软件有限公司 2003-2016
 LegalTrademarks=Measure
->>>>>>> remotes/origin/3.1.3.3
 OriginalFilename=
-ProductName=
-ProductVersion=1.0.0.0
+ProductName=纵横公路工程结算决算计量一体化软件
+ProductVersion=3.1.5.2
 [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.
-<<<<<<< HEAD
 [HistoryLists\hlConditionals]
 Count=1
 Item0=_mEncrypt;
@@ -161,5 +148,3 @@ Item0=..\..\Dcus
 [HistoryLists\hlOutputDirectorry]
 Count=1
 Item0=D:\SmartCostExe\Measure
-=======
->>>>>>> remotes/origin/3.1.3.3

Dprs/Pro/Measure_Cloud.dof

@@ -114,13 +114,8 @@ IncludeVerInfo=1
 AutoIncBuild=1
 MajorVer=3
 MinorVer=1
-<<<<<<< HEAD
 Release=5
-Build=204
-=======
-Release=3
-Build=3027
->>>>>>> remotes/origin/3.1.3.3
+Build=209
 Debug=0
 PreRelease=0
 Special=0
@@ -131,20 +126,13 @@ CodePage=936
 [Version Info Keys]
 CompanyName=珠海纵横创新软件有限公司
 FileDescription=纵横结算决算计量一体化云版
-<<<<<<< HEAD
-FileVersion=3.1.5.204
+FileVersion=3.1.5.209
 InternalName=
-LegalCopyright=
-LegalTrademarks=
-=======
-FileVersion=3.1.3.3027
-InternalName=Measure
-LegalCopyright=版权所有(C) 珠海纵横创新软件有限公司 2003-2014。保留所有权利。
+LegalCopyright=版权所有（C）珠海纵横创新软件有限公司 2003-2016
 LegalTrademarks=Measure
->>>>>>> remotes/origin/3.1.3.3
 OriginalFilename=
-ProductName=
-ProductVersion=1.0.0.0
+ProductName=纵横公路工程结算决算计量一体化软件
+ProductVersion=3.1.5.2
 [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.dpr

@@ -153,8 +153,6 @@ uses
   PriceMarginFme in '..\..\Frames\PriceMarginFme.pas' {PriceMarginFrame: TFrame},
   ProjectGLFme in '..\..\Frames\ProjectGLFme.pas' {ProjectGLFrame: TFrame},
   SelectDetailGLsFrm in '..\..\Forms\SelectDetailGLsFrm.pas' {SelectDetailGLsForm},
-  DealPayPlanFrm in '..\..\Forms\DealPayPlanFrm.pas' {DealPayPlanForm},
-  BaseClipboard in '..\..\Units\BaseClipboard.pas',
   mPegFilter in '..\..\Units\mPegFilter.pas',
   tpBaseGatherData in '..\..\TenderPartition\tpBaseGatherData.pas',
   tpGatherGcl in '..\..\TenderPartition\tpGatherGcl.pas',
@@ -177,8 +175,8 @@ uses
   tpSelectTenderDm in '..\..\TenderPartition\tpSelectTenderDm.pas' {tpSelectTenderData: TDataModule},
   tpSelectTenderNode in '..\..\TenderPartition\tpSelectTenderNode.pas',
   tpSelectTendersFrm in '..\..\TenderPartition\tpSelectTendersFrm.pas' {SelectTendersForm},
-  tpTrialPegInputFrm in '..\..\TenderPartition\tpTrialPegInputFrm.pas' {TrialPegInputForm};
-  PriceMarginBillsFme in '..\..\Frames\PriceMarginBillsFme.pas' {PriceMarginBillsFrame: TFrame},
+  tpTrialPegInputFrm in '..\..\TenderPartition\tpTrialPegInputFrm.pas' {TrialPegInputForm},
+  PriceMarginBillsFme in '..\..\Frames\PriceMarginBillsFme.pas' {PriceMarginBillsFrame: TFrame};
 
 {$R *.res}
 

Dprs/Pro/Measure_GuangDong.dof

@@ -114,13 +114,8 @@ IncludeVerInfo=1
 AutoIncBuild=1
 MajorVer=3
 MinorVer=1
-<<<<<<< HEAD
 Release=5
-Build=204
-=======
-Release=3
-Build=3027
->>>>>>> remotes/origin/3.1.3.3
+Build=209
 Debug=0
 PreRelease=0
 Special=0
@@ -131,20 +126,13 @@ CodePage=936
 [Version Info Keys]
 CompanyName=珠海纵横创新软件有限公司
 FileDescription=纵横结算决算计量一体化广东专业版
-<<<<<<< HEAD
-FileVersion=3.1.5.204
+FileVersion=3.1.5.209
 InternalName=
-LegalCopyright=
-LegalTrademarks=
-=======
-FileVersion=3.1.3.3027
-InternalName=Measure
-LegalCopyright=版权所有(C) 珠海纵横创新软件有限公司 2003-2014。保留所有权利。
+LegalCopyright=版权所有（C）珠海纵横创新软件有限公司 2003-2016
 LegalTrademarks=Measure
->>>>>>> remotes/origin/3.1.3.3
 OriginalFilename=
-ProductName=
-ProductVersion=1.0.0.0
+ProductName=纵横公路工程结算决算计量一体化软件
+ProductVersion=3.1.5.2
 [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,13 +114,8 @@ IncludeVerInfo=1
 AutoIncBuild=1
 MajorVer=3
 MinorVer=1
-<<<<<<< HEAD
 Release=5
-Build=204
-=======
-Release=3
-Build=3027
->>>>>>> remotes/origin/3.1.3.3
+Build=209
 Debug=0
 PreRelease=0
 Special=0
@@ -131,20 +126,13 @@ CodePage=936
 [Version Info Keys]
 CompanyName=珠海纵横创新软件有限公司
 FileDescription=纵横结算决算计量一体化广东云版
-<<<<<<< HEAD
-FileVersion=3.1.5.204
+FileVersion=3.1.5.209
 InternalName=
-LegalCopyright=
-LegalTrademarks=
-=======
-FileVersion=3.1.3.3027
-InternalName=Measure
-LegalCopyright=版权所有(C) 珠海纵横创新软件有限公司 2003-2014。保留所有权利。
+LegalCopyright=版权所有（C）珠海纵横创新软件有限公司 2003-2016
 LegalTrademarks=Measure
->>>>>>> remotes/origin/3.1.3.3
 OriginalFilename=
-ProductName=
-ProductVersion=1.0.0.0
+ProductName=纵横公路工程结算决算计量一体化软件
+ProductVersion=3.1.5.2
 [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,13 +114,8 @@ IncludeVerInfo=1
 AutoIncBuild=1
 MajorVer=3
 MinorVer=1
-<<<<<<< HEAD
 Release=5
-Build=202
-=======
-Release=3
-Build=3027
->>>>>>> remotes/origin/3.1.3.3
+Build=209
 Debug=0
 PreRelease=0
 Special=0
@@ -129,24 +124,15 @@ DLL=0
 Locale=2052
 CodePage=936
 [Version Info Keys]
-<<<<<<< HEAD
-CompanyName=
-FileDescription=
-FileVersion=3.1.5.202
-InternalName=
-LegalCopyright=
-LegalTrademarks=
-=======
 CompanyName=珠海纵横创新软件有限公司
-FileDescription=纵横0号台账软件广东专业版
-FileVersion=3.1.3.3027
-InternalName=Measure
-LegalCopyright=版权所有(C) 珠海纵横创新软件有限公司 2003-2014。保留所有权利。
+FileDescription=纵横0号台账广东专业版
+FileVersion=3.1.5.209
+InternalName=
+LegalCopyright=版权所有（C）珠海纵横创新软件有限公司 2003-2016
 LegalTrademarks=Measure
->>>>>>> remotes/origin/3.1.3.3
 OriginalFilename=
-ProductName=
-ProductVersion=1.0.0.0
+ProductName=纵横公路工程结算决算计量一体化软件
+ProductVersion=3.1.5.2
 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,13 +114,8 @@ IncludeVerInfo=1
 AutoIncBuild=1
 MajorVer=3
 MinorVer=1
-<<<<<<< HEAD
 Release=5
-Build=204
-=======
-Release=3
-Build=3027
->>>>>>> remotes/origin/3.1.3.3
+Build=203
 Debug=0
 PreRelease=0
 Special=0
@@ -131,20 +126,25 @@ CodePage=936
 [Version Info Keys]
 CompanyName=珠海纵横创新软件有限公司
 FileDescription=纵横0号台账专业版
-<<<<<<< HEAD
-FileVersion=3.1.5.204
+FileVersion=3.1.5.203
 InternalName=
-LegalCopyright=
-LegalTrademarks=
-=======
-FileVersion=3.1.3.3027
-InternalName=Measure
-LegalCopyright=版权所有(C) 珠海纵横创新软件有限公司 2003-2014。保留所有权利。
+LegalCopyright=版权所有（C）珠海纵横创新软件有限公司 2003-2016
 LegalTrademarks=Measure
->>>>>>> remotes/origin/3.1.3.3
 OriginalFilename=
-ProductName=
-ProductVersion=1.0.0.0
+ProductName=纵横公路工程结算决算计量一体化软件
+ProductVersion=3.1.5.2
 [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.
+[HistoryLists\hlConditionals]
+Count=1
+Item0=_mEncrypt;_mcompile;
+[HistoryLists\hlUnitAliases]
+Count=1
+Item0=WinTypes=Windows;WinProcs=Windows;DbiTypes=BDE;DbiProcs=BDE;DbiErrs=BDE;
+[HistoryLists\hlUnitOutputDirectory]
+Count=1
+Item0=..\..\Dcus
+[HistoryLists\hlOutputDirectorry]
+Count=1
+Item0=D:\SmartCostExe\Measure

Forms/MainFrm.dfm

@@ -20,8 +20,8 @@ object MainForm: TMainForm
   TextHeight = 12
   object jtsProjects: TJimTabSet
     Left = 0
-    Top = 48
-    Width = 742
+    Top = 49
+    Width = 734
     Height = 21
     Align = alTop
     BackgroundColor = clGradientInactiveCaption
@@ -45,8 +45,8 @@ object MainForm: TMainForm
   end
   object dxStatusBar: TdxStatusBar
     Left = 0
-    Top = 484
-    Width = 742
+    Top = 480
+    Width = 734
     Height = 20
     Panels = <
       item
@@ -78,12 +78,12 @@ object MainForm: TMainForm
     object dxStatusBarContainer2: TdxStatusBarContainerControl
       Left = 604
       Top = 2
-      Width = 136
+      Width = 128
       Height = 16
       object ProgressBar: TProgressBar
         Left = 0
         Top = 0
-        Width = 136
+        Width = 128
         Height = 16
         Align = alClient
         Max = 200
@@ -93,9 +93,9 @@ object MainForm: TMainForm
   end
   object jpsMain: TJimPages
     Left = 0
-    Top = 69
-    Width = 742
-    Height = 415
+    Top = 70
+    Width = 734
+    Height = 410
     ActivePage = jpsMainProjectsManager
     ActivePageIndex = 0
     Align = alClient
@@ -103,8 +103,8 @@ object MainForm: TMainForm
     object jpsMainProjectsManager: TJimPage
       Left = 0
       Top = 0
-      Width = 742
-      Height = 415
+      Width = 734
+      Height = 410
       TabName = 'ProjectsManager'
       Caption = 'ProjsMgr'
       object pnlUser: TPanel
@@ -201,8 +201,8 @@ object MainForm: TMainForm
     object jpsMainProjects: TJimPage
       Left = 0
       Top = 0
-      Width = 742
-      Height = 415
+      Width = 734
+      Height = 410
       TabName = 'Projects'
       Caption = 'Projects'
       object jpsProjects: TJimPages
@@ -220,7 +220,7 @@ object MainForm: TMainForm
     Font.Charset = DEFAULT_CHARSET
     Font.Color = clWindowText
     Font.Height = -12
-    Font.Name = #23435#20307
+    Font.Name = #24494#36719#38597#40657
     Font.Style = []
     Bars = <
       item
@@ -270,7 +270,7 @@ object MainForm: TMainForm
         Caption = #24037#20855#26639
         DockedDockingStyle = dsTop
         DockedLeft = 0
-        DockedTop = 26
+        DockedTop = 27
         DockingStyle = dsTop
         FloatLeft = 484
         FloatTop = 279
@@ -379,7 +379,7 @@ object MainForm: TMainForm
     DockControlHeights = (
       0
       0
-      48
+      49
       0)
     object dxsiFile: TdxBarSubItem
       Caption = #25991#20214'(&F)'
@@ -1031,6 +1031,7 @@ object MainForm: TMainForm
       Caption = #24635#37327#25511#21046#26684#24335
       Category = 0
       Hint = #24635#37327#25511#21046#26684#24335
+      Visible = ivAlways
     end
     object dxbtnInsertCol: TdxBarButton
       Caption = #26032#22686#19968#21015