Merge branch '3.1.3.3' of http://192.168.1.12:3000/maixinrong/measure into 3.1.3.3

Dprs/Pro/Measure.dof

@@ -115,11 +115,7 @@ AutoIncBuild=1
 MajorVer=3
 MinorVer=1
 Release=3
-<<<<<<< HEAD
-Build=2041
-=======
-Build=3011
->>>>>>> 3.1.3.3PriceMargin(Temp)
+Build=3027
 Debug=0
 PreRelease=0
 Special=0
@@ -130,11 +126,7 @@ CodePage=936
 [Version Info Keys]
 CompanyName=珠海纵横创新软件有限公司
 FileDescription=纵横结算决算计量一体化专业版
-<<<<<<< HEAD
-FileVersion=3.1.3.2041
-=======
-FileVersion=3.1.3.3011
->>>>>>> 3.1.3.3PriceMargin(Temp)
+FileVersion=3.1.3.3027
 InternalName=Measure
 LegalCopyright=版权所有(C) 珠海纵横创新软件有限公司 2003-2014。保留所有权利。
 LegalTrademarks=Measure
@@ -145,33 +137,3 @@ 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.
 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=10
-Item0=_mEncrypt;
-Item1=_mEncrypt;cplPrint;cplOutputToExcelRange
-Item2=cplPrint;_mEncrypt;cplPrint;cplOutputToExcelRange
-Item3=cplPrint;_mEncrypt;cplPrint
-Item4=cplPrint;_mEncrypt
-Item5=cplPrint;
-Item6=cplPrint;_mEncrypt;
-Item7=cplPrint;mEncrypt;
-Item8=cplPrint
-Item9=cplPrint;cplOutputToExcelRange;
-[HistoryLists\hlUnitAliases]
-Count=1
-Item0=WinTypes=Windows;WinProcs=Windows;DbiTypes=BDE;DbiProcs=BDE;DbiErrs=BDE;
-[HistoryLists\hlUnitOutputDirectory]
-Count=2
-Item0=..\..\Dcus
-Item1=..\Dcus
-[HistoryLists\hlOutputDirectorry]
-Count=9
-Item0=D:\SmartCostExe\Measure
-Item1=E:\SmartCostExe\Measure
-Item2=D:\Program Files (x86)\纵横软件\纵横计量决算一体化软件(专业版4)
-Item3=D:\Program Files (x86)\纵横软件\纵横计量决算一体化软件(专业版)
-Item4=D:\Program Files (x86)\纵横软件\纵横计量决算一体化软件(专业版2)
-Item5=D:\Program Files (x86)\纵横软件\纵横公路工程计量支付(专业版)
-Item6=D:\Program Files\纵横软件\Environment
-Item7=..\..\Environment
-Item8=..\Dcus

Dprs/Pro/Measure.dpr

@@ -136,11 +136,6 @@ uses
   rmGcl_XmjBillsDm in '..\..\DataModules\ReportMemoryDm\rmGcl_XmjBillsDm.pas' {rmGcl_XmjBillsData: TDataModule},
   rmCustomized2Dm in '..\..\DataModules\ReportMemoryDm\rmCustomized2Dm.pas' {rmCustomized2Data: TDataModule},
   CalcDecimal in '..\..\Units\CalcDecimal.pas',
-<<<<<<< HEAD
-  rmHaBaiCustomizedDm in '..\..\DataModules\ReportMemoryDm\rmHaBaiCustomizedDm.pas' {rmHaBaiCustomizedData: TDataModule},
-  BillsPasteSelectFrm in '..\..\Forms\BillsPasteSelectFrm.pas' {BillsPasteSelectForm},
-  DealPayPlanFrm in '..\..\Forms\DealPayPlanFrm.pas' {DealPayPlanForm};
-=======
   ProjectGLDm in '..\..\DataModules\ProjectGLDm.pas' {ProjectGLData: TDataModule},
   PriceMarginBillsDm in '..\..\DataModules\PriceMarginBillsDm.pas' {PriceMarginBillsData: TDataModule},
   GclBillsGatherModel in '..\..\Units\GclBillsGatherModel.pas',
@@ -153,7 +148,7 @@ uses
   BillsPasteSelectFrm in '..\..\Forms\BillsPasteSelectFrm.pas' {BillsPasteSelectForm},
   DealPayPlanFrm in '..\..\Forms\DealPayPlanFrm.pas' {DealPayPlanForm},
   BaseClipboard in '..\..\Units\BaseClipboard.pas';
->>>>>>> 3.1.3.3PriceMargin(Temp)
+
 
 {$R *.res}
 

Dprs/Pro/Measure_Cloud.dof

@@ -115,11 +115,7 @@ AutoIncBuild=1
 MajorVer=3
 MinorVer=1
 Release=3
-<<<<<<< HEAD
-Build=2041
-=======
-Build=3011
->>>>>>> 3.1.3.3PriceMargin(Temp)
+Build=3027
 Debug=0
 PreRelease=0
 Special=0
@@ -130,11 +126,7 @@ CodePage=936
 [Version Info Keys]
 CompanyName=珠海纵横创新软件有限公司
 FileDescription=纵横结算决算计量一体化云版
-<<<<<<< HEAD
-FileVersion=3.1.3.2041
-=======
-FileVersion=3.1.3.3011
->>>>>>> 3.1.3.3PriceMargin(Temp)
+FileVersion=3.1.3.3027
 InternalName=Measure
 LegalCopyright=版权所有(C) 珠海纵横创新软件有限公司 2003-2014。保留所有权利。
 LegalTrademarks=Measure

Dprs/Pro/Measure_Cloud.dpr

@@ -140,24 +140,18 @@ uses
   rmGcl_XmjBillsDm in '..\..\DataModules\ReportMemoryDm\rmGcl_XmjBillsDm.pas' {rmGcl_XmjBillsData: TDataModule},
   rmCustomized2Dm in '..\..\DataModules\ReportMemoryDm\rmCustomized2Dm.pas' {rmCustomized2Data: TDataModule},
   CalcDecimal in '..\..\Units\CalcDecimal.pas',
-<<<<<<< HEAD
   rmHaBaiCustomizedDm in '..\..\DataModules\ReportMemoryDm\rmHaBaiCustomizedDm.pas' {rmHaBaiCustomizedData: TDataModule},
   BillsPasteSelectFrm in '..\..\Forms\BillsPasteSelectFrm.pas' {BillsPasteSelectForm},
-  DealPayPlanFrm in '..\..\Forms\DealPayPlanFrm.pas' {DealPayPlanForm};
-=======
+  DealPayPlanFrm in '..\..\Forms\DealPayPlanFrm.pas' {DealPayPlanForm},
+  GclBillsGatherModel in '..\..\Units\GclBillsGatherModel.pas',
   ProjectGLDm in '..\..\DataModules\ProjectGLDm.pas' {ProjectGLData: TDataModule},
   PriceMarginBillsDm in '..\..\DataModules\PriceMarginBillsDm.pas' {PriceMarginBillsData: TDataModule},
-  GclBillsGatherModel in '..\..\Units\GclBillsGatherModel.pas',
   DetailGLDm in '..\..\DataModules\DetailGLDm.pas' {DetailGLData: TDataModule},
-  PriceMarginBillsFme in '..\..\Frames\PriceMarginBillsFme.pas' {PriceMarginBillsFrame: TFrame},
+  BaseClipboard in '..\..\Units\BaseClipboard.pas',
   PriceMarginFme in '..\..\Frames\PriceMarginFme.pas' {PriceMarginFrame: TFrame},
   ProjectGLFme in '..\..\Frames\ProjectGLFme.pas' {ProjectGLFrame: TFrame},
-  SelectDetailGLsFrm in '..\..\Forms\SelectDetailGLsFrm.pas' {SelectDetailGLsForm},
-  rmHaBaiCustomizedDm in '..\..\DataModules\ReportMemoryDm\rmHaBaiCustomizedDm.pas' {rmHaBaiCustomizedData: TDataModule},
-  BillsPasteSelectFrm in '..\..\Forms\BillsPasteSelectFrm.pas' {BillsPasteSelectForm},
-  DealPayPlanFrm in '..\..\Forms\DealPayPlanFrm.pas' {DealPayPlanForm},
-  BaseClipboard in '..\..\Units\BaseClipboard.pas';
->>>>>>> 3.1.3.3PriceMargin(Temp)
+  PriceMarginBillsFme in '..\..\Frames\PriceMarginBillsFme.pas' {PriceMarginBillsFrame: TFrame},
+  SelectDetailGLsFrm in '..\..\Forms\SelectDetailGLsFrm.pas' {SelectDetailGLsForm};
 
 {$R *.res}
 

Dprs/Pro/Measure_GuangDong.dof

@@ -115,11 +115,7 @@ AutoIncBuild=1
 MajorVer=3
 MinorVer=1
 Release=3
-<<<<<<< HEAD
-Build=2041
-=======
-Build=3011
->>>>>>> 3.1.3.3PriceMargin(Temp)
+Build=3027
 Debug=0
 PreRelease=0
 Special=0
@@ -130,11 +126,7 @@ CodePage=936
 [Version Info Keys]
 CompanyName=珠海纵横创新软件有限公司
 FileDescription=纵横结算决算计量一体化广东专业版
-<<<<<<< HEAD
-FileVersion=3.1.3.2041
-=======
-FileVersion=3.1.3.3011
->>>>>>> 3.1.3.3PriceMargin(Temp)
+FileVersion=3.1.3.3027
 InternalName=Measure
 LegalCopyright=版权所有(C) 珠海纵横创新软件有限公司 2003-2014。保留所有权利。
 LegalTrademarks=Measure

Dprs/Pro/Measure_GuangDong.dpr

@@ -136,10 +136,7 @@ uses
   rmGcl_XmjBillsDm in '..\..\DataModules\ReportMemoryDm\rmGcl_XmjBillsDm.pas' {rmGcl_XmjBillsData: TDataModule},
   rmCustomized2Dm in '..\..\DataModules\ReportMemoryDm\rmCustomized2Dm.pas' {rmCustomized2Data: TDataModule},
   CalcDecimal in '..\..\Units\CalcDecimal.pas',
-<<<<<<< HEAD
-  rmHaBaiCustomizedDm in '..\..\DataModules\ReportMemoryDm\rmHaBaiCustomizedDm.pas' {rmHaBaiCustomizedData: TDataModule},
-  BillsPasteSelectFrm in '..\..\Forms\BillsPasteSelectFrm.pas' {BillsPasteSelectForm},
-=======
+
   BaseClipboard in '..\..\Units\BaseClipboard.pas',
   PriceMarginBillsDm in '..\..\DataModules\PriceMarginBillsDm.pas' {PriceMarginBillsData: TDataModule},
   ProjectGLDm in '..\..\DataModules\ProjectGLDm.pas' {ProjectGLData: TDataModule},
@@ -151,7 +148,6 @@ uses
   PriceMarginFme in '..\..\Frames\PriceMarginFme.pas' {PriceMarginFrame: TFrame},
   ProjectGLFme in '..\..\Frames\ProjectGLFme.pas' {ProjectGLFrame: TFrame},
   SelectDetailGLsFrm in '..\..\Forms\SelectDetailGLsFrm.pas' {SelectDetailGLsForm},
->>>>>>> 3.1.3.3PriceMargin(Temp)
   DealPayPlanFrm in '..\..\Forms\DealPayPlanFrm.pas' {DealPayPlanForm};
 
 {$R *.res}

Dprs/Pro/Measure_GuangDong_Cloud.dof

@@ -115,11 +115,7 @@ AutoIncBuild=1
 MajorVer=3
 MinorVer=1
 Release=3
-<<<<<<< HEAD
-Build=2041
-=======
-Build=3011
->>>>>>> 3.1.3.3PriceMargin(Temp)
+Build=3027
 Debug=0
 PreRelease=0
 Special=0
@@ -130,11 +126,7 @@ CodePage=936
 [Version Info Keys]
 CompanyName=珠海纵横创新软件有限公司
 FileDescription=纵横结算决算计量一体化广东云版
-<<<<<<< HEAD
-FileVersion=3.1.3.2041
-=======
-FileVersion=3.1.3.3011
->>>>>>> 3.1.3.3PriceMargin(Temp)
+FileVersion=3.1.3.3027
 InternalName=Measure
 LegalCopyright=版权所有(C) 珠海纵横创新软件有限公司 2003-2014。保留所有权利。
 LegalTrademarks=Measure
@@ -145,33 +137,3 @@ 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.
 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=8
-Item0=_mCloud;_mEncrypt;_mGuangDong
-Item1=_mCloud;_mEncrypt;_mGuangDong;_Test
-Item2=_mCloud;_mEncrypt;_mGuangDong;_mTest
-Item3=_mCloud;_mEncrypt;_mGuangDong;
-Item4=_OnLine;_mEncrypt;_mGuangDong;cplPrint;cplOutputToExcelRange
-Item5=_OnLine;_mEncrypt;cplPrint;cplOutputToExcelRange
-Item6=_OnLine;cplPrint;cplOutputToExcelRange
-Item7=_OnLine;cplPrint;_mEncrypt;cplPrint;cplOutputToExcelRange
-[HistoryLists\hlUnitAliases]
-Count=1
-Item0=WinTypes=Windows;WinProcs=Windows;DbiTypes=BDE;DbiProcs=BDE;DbiErrs=BDE;
-[HistoryLists\hlUnitOutputDirectory]
-Count=3
-Item0=..\..\Dcus
-Item1=E:\DelphiTemp
-Item2=D:\Dcu
-[HistoryLists\hlOutputDirectorry]
-Count=4
-Item0=D:\SmartCostExe\Measure
-Item1=E:\SmartCostExe\Measure
-Item2=D:\Program Files (x86)\纵横软件\纵横计量决算一体化软件(广东云版)15审核人
-Item3=D:\Program Files (x86)\纵横软件\纵横计量决算一体化软件(专业版)
-[HistoryLists\hlBPLOutput]
-Count=1
-Item0=..\Bin
-[HistoryLists\hlDCPOutput]
-Count=1
-Item0=D:\Dcu

Dprs/Pro/Measure_GuangDong_Cloud.dpr

@@ -140,10 +140,6 @@ uses
   rmGcl_XmjBillsDm in '..\..\DataModules\ReportMemoryDm\rmGcl_XmjBillsDm.pas' {rmGcl_XmjBillsData: TDataModule},
   rmCustomized2Dm in '..\..\DataModules\ReportMemoryDm\rmCustomized2Dm.pas' {rmCustomized2Data: TDataModule},
   CalcDecimal in '..\..\Units\CalcDecimal.pas',
-<<<<<<< HEAD
-  rmHaBaiCustomizedDm in '..\..\DataModules\ReportMemoryDm\rmHaBaiCustomizedDm.pas' {rmHaBaiCustomizedData: TDataModule},
-  BillsPasteSelectFrm in '..\..\Forms\BillsPasteSelectFrm.pas' {BillsPasteSelectForm},
-=======
   BaseClipboard in '..\..\Units\BaseClipboard.pas',
   PriceMarginBillsDm in '..\..\DataModules\PriceMarginBillsDm.pas' {PriceMarginBillsData: TDataModule},
   ProjectGLDm in '..\..\DataModules\ProjectGLDm.pas' {ProjectGLData: TDataModule},
@@ -155,7 +151,6 @@ uses
   PriceMarginFme in '..\..\Frames\PriceMarginFme.pas' {PriceMarginFrame: TFrame},
   ProjectGLFme in '..\..\Frames\ProjectGLFme.pas' {ProjectGLFrame: TFrame},
   SelectDetailGLsFrm in '..\..\Forms\SelectDetailGLsFrm.pas' {SelectDetailGLsForm},
->>>>>>> 3.1.3.3PriceMargin(Temp)
   DealPayPlanFrm in '..\..\Forms\DealPayPlanFrm.pas' {DealPayPlanForm};
 
 {$R *.res}

Dprs/Pro/Measure_GuangDong_TZ.dof

@@ -111,15 +111,11 @@ ProjectLang=
 RootDir=D:\Program Files\Borland\Delphi7\Bin\
 [Version Info]
 IncludeVerInfo=1
-AutoIncBuild=0
+AutoIncBuild=1
 MajorVer=3
 MinorVer=1
 Release=3
-<<<<<<< HEAD
-Build=2040
-=======
-Build=3010
->>>>>>> 3.1.3.3PriceMargin(Temp)
+Build=3027
 Debug=0
 PreRelease=0
 Special=0
@@ -129,19 +125,11 @@ Locale=2052
 CodePage=936
 [Version Info Keys]
 CompanyName=珠海纵横创新软件有限公司
-<<<<<<< HEAD
-FileDescription=
-FileVersion=3.1.3.2040
-InternalName=
-LegalCopyright=
-LegalTrademarks=
-=======
-FileDescription=纵横0号台账广东专业版
-FileVersion=3.1.3.3010
+FileDescription=纵横0号台账软件广东专业版
+FileVersion=3.1.3.3027
 InternalName=Measure
 LegalCopyright=版权所有(C) 珠海纵横创新软件有限公司 2003-2014。保留所有权利。
 LegalTrademarks=Measure
->>>>>>> 3.1.3.3PriceMargin(Temp)
 OriginalFilename=
 ProductName=纵横公路工程0号台账软件
 ProductVersion=1

Dprs/Pro/Measure_GuangDong_TZ.dpr

@@ -136,10 +136,6 @@ uses
   rmGcl_XmjBillsDm in '..\..\DataModules\ReportMemoryDm\rmGcl_XmjBillsDm.pas' {rmGcl_XmjBillsData: TDataModule},
   rmCustomized2Dm in '..\..\DataModules\ReportMemoryDm\rmCustomized2Dm.pas' {rmCustomized2Data: TDataModule},
   CalcDecimal in '..\..\Units\CalcDecimal.pas',
-<<<<<<< HEAD
-  rmHaBaiCustomizedDm in '..\..\DataModules\ReportMemoryDm\rmHaBaiCustomizedDm.pas' {rmHaBaiCustomizedData: TDataModule},
-  BillsPasteSelectFrm in '..\..\Forms\BillsPasteSelectFrm.pas' {BillsPasteSelectForm},
-=======
   BaseClipboard in '..\..\Units\BaseClipboard.pas',
   PriceMarginBillsDm in '..\..\DataModules\PriceMarginBillsDm.pas' {PriceMarginBillsData: TDataModule},
   ProjectGLDm in '..\..\DataModules\ProjectGLDm.pas' {ProjectGLData: TDataModule},
@@ -151,7 +147,7 @@ uses
   PriceMarginFme in '..\..\Frames\PriceMarginFme.pas' {PriceMarginFrame: TFrame},
   ProjectGLFme in '..\..\Frames\ProjectGLFme.pas' {ProjectGLFrame: TFrame},
   SelectDetailGLsFrm in '..\..\Forms\SelectDetailGLsFrm.pas' {SelectDetailGLsForm},
->>>>>>> 3.1.3.3PriceMargin(Temp)
+
   DealPayPlanFrm in '..\..\Forms\DealPayPlanFrm.pas' {DealPayPlanForm};
 
 {$R *.res}

Dprs/Pro/Measure_TZ.dof

@@ -115,11 +115,7 @@ AutoIncBuild=1
 MajorVer=3
 MinorVer=1
 Release=3
-<<<<<<< HEAD
-Build=2041
-=======
-Build=3011
->>>>>>> 3.1.3.3PriceMargin(Temp)
+Build=3027
 Debug=0
 PreRelease=0
 Special=0
@@ -130,11 +126,7 @@ CodePage=936
 [Version Info Keys]
 CompanyName=珠海纵横创新软件有限公司
 FileDescription=纵横0号台账专业版
-<<<<<<< HEAD
-FileVersion=3.1.3.2041
-=======
-FileVersion=3.1.3.3011
->>>>>>> 3.1.3.3PriceMargin(Temp)
+FileVersion=3.1.3.3027
 InternalName=Measure
 LegalCopyright=版权所有(C) 珠海纵横创新软件有限公司 2003-2014。保留所有权利。
 LegalTrademarks=Measure

Dprs/Pro/Measure_TZ.dpr

@@ -136,10 +136,7 @@ uses
   rmGcl_XmjBillsDm in '..\..\DataModules\ReportMemoryDm\rmGcl_XmjBillsDm.pas' {rmGcl_XmjBillsData: TDataModule},
   rmCustomized2Dm in '..\..\DataModules\ReportMemoryDm\rmCustomized2Dm.pas' {rmCustomized2Data: TDataModule},
   CalcDecimal in '..\..\Units\CalcDecimal.pas',
-<<<<<<< HEAD
-  rmHaBaiCustomizedDm in '..\..\DataModules\ReportMemoryDm\rmHaBaiCustomizedDm.pas' {rmHaBaiCustomizedData: TDataModule},
-  BillsPasteSelectFrm in '..\..\Forms\BillsPasteSelectFrm.pas' {BillsPasteSelectForm},
-=======
+
   BaseClipboard in '..\..\Units\BaseClipboard.pas',
   PriceMarginBillsDm in '..\..\DataModules\PriceMarginBillsDm.pas' {PriceMarginBillsData: TDataModule},
   ProjectGLDm in '..\..\DataModules\ProjectGLDm.pas' {ProjectGLData: TDataModule},
@@ -151,7 +148,7 @@ uses
   PriceMarginFme in '..\..\Frames\PriceMarginFme.pas' {PriceMarginFrame: TFrame},
   ProjectGLFme in '..\..\Frames\ProjectGLFme.pas' {ProjectGLFrame: TFrame},
   SelectDetailGLsFrm in '..\..\Forms\SelectDetailGLsFrm.pas' {SelectDetailGLsForm},
->>>>>>> 3.1.3.3PriceMargin(Temp)
+
   DealPayPlanFrm in '..\..\Forms\DealPayPlanFrm.pas' {DealPayPlanForm};
 
 {$R *.res}

Dprs/Trail/Measure.dof

@@ -115,11 +115,7 @@ AutoIncBuild=1
 MajorVer=3
 MinorVer=1
 Release=3
-<<<<<<< HEAD
-Build=2041
-=======
-Build=3011
->>>>>>> 3.1.3.3PriceMargin(Temp)
+Build=3027
 Debug=0
 PreRelease=0
 Special=0
@@ -129,12 +125,8 @@ Locale=2052
 CodePage=936
 [Version Info Keys]
 CompanyName=珠海纵横创新软件有限公司
-FileDescription=纵横结算决算计量一体化专业版
-<<<<<<< HEAD
-FileVersion=3.1.3.2041
-=======
-FileVersion=3.1.3.3011
->>>>>>> 3.1.3.3PriceMargin(Temp)
+FileDescription=纵横结算决算计量一体化学习版
+FileVersion=3.1.3.3027
 InternalName=Measure
 LegalCopyright=版权所有(C) 珠海纵横创新软件有限公司 2003-2014。保留所有权利。
 LegalTrademarks=Measure
@@ -164,14 +156,15 @@ Count=2
 Item0=..\..\Dcus
 Item1=..\Dcus
 [HistoryLists\hlOutputDirectorry]
-Count=10
+Count=11
 Item0=D:\SmartCostExe\MeasureTrail
-Item1=E:\SmartCostExe\MeasureTrail
-Item2=E:\SmartCostExe\Measure
-Item3=D:\Program Files (x86)\纵横软件\纵横计量决算一体化软件(广东专业版)
-Item4=D:\Program Files (x86)\纵横软件\纵横计量决算一体化软件(专业版)
-Item5=D:\Program Files (x86)\纵横软件\纵横计量决算一体化软件(专业版2)
-Item6=D:\Program Files (x86)\纵横软件\纵横公路工程计量支付(专业版)
-Item7=D:\Program Files\纵横软件\Environment
-Item8=..\..\Environment
-Item9=..\Dcus
+Item1=E:\资料\软件安装文件\纵横结算决算计量一体化软件(专业版)
+Item2=E:\SmartCostExe\MeasureTrail
+Item3=E:\SmartCostExe\Measure
+Item4=D:\Program Files (x86)\纵横软件\纵横计量决算一体化软件(广东专业版)
+Item5=D:\Program Files (x86)\纵横软件\纵横计量决算一体化软件(专业版)
+Item6=D:\Program Files (x86)\纵横软件\纵横计量决算一体化软件(专业版2)
+Item7=D:\Program Files (x86)\纵横软件\纵横公路工程计量支付(专业版)
+Item8=D:\Program Files\纵横软件\Environment
+Item9=..\..\Environment
+Item10=..\Dcus

Dprs/Trail/Measure.dpr

@@ -136,10 +136,7 @@ uses
   rmGcl_XmjBillsDm in '..\..\DataModules\ReportMemoryDm\rmGcl_XmjBillsDm.pas' {rmGcl_XmjBillsData: TDataModule},
   rmCustomized2Dm in '..\..\DataModules\ReportMemoryDm\rmCustomized2Dm.pas' {rmCustomized2Data: TDataModule},
   CalcDecimal in '..\..\Units\CalcDecimal.pas',
-<<<<<<< HEAD
-  rmHaBaiCustomizedDm in '..\..\DataModules\ReportMemoryDm\rmHaBaiCustomizedDm.pas' {rmHaBaiCustomizedData: TDataModule},
-  BillsPasteSelectFrm in '..\..\Forms\BillsPasteSelectFrm.pas' {BillsPasteSelectForm},
-=======
+
   BaseClipboard in '..\..\Units\BaseClipboard.pas',
   PriceMarginBillsDm in '..\..\DataModules\PriceMarginBillsDm.pas' {PriceMarginBillsData: TDataModule},
   ProjectGLDm in '..\..\DataModules\ProjectGLDm.pas' {ProjectGLData: TDataModule},
@@ -151,7 +148,7 @@ uses
   PriceMarginFme in '..\..\Frames\PriceMarginFme.pas' {PriceMarginFrame: TFrame},
   ProjectGLFme in '..\..\Frames\ProjectGLFme.pas' {ProjectGLFrame: TFrame},
   SelectDetailGLsFrm in '..\..\Forms\SelectDetailGLsFrm.pas' {SelectDetailGLsForm},
->>>>>>> 3.1.3.3PriceMargin(Temp)
+
   DealPayPlanFrm in '..\..\Forms\DealPayPlanFrm.pas' {DealPayPlanForm};
 
 {$R *.res}

Dprs/Trail/Measure_GuangDong.dof

@@ -115,11 +115,7 @@ AutoIncBuild=1
 MajorVer=3
 MinorVer=1
 Release=3
-<<<<<<< HEAD
-Build=2041
-=======
-Build=3011
->>>>>>> 3.1.3.3PriceMargin(Temp)
+Build=3027
 Debug=0
 PreRelease=0
 Special=0
@@ -130,11 +126,7 @@ CodePage=936
 [Version Info Keys]
 CompanyName=珠海纵横创新软件有限公司
 FileDescription=纵横结算决算计量一体化广东学习版
-<<<<<<< HEAD
-FileVersion=3.1.3.2041
-=======
-FileVersion=3.1.3.3011
->>>>>>> 3.1.3.3PriceMargin(Temp)
+FileVersion=3.1.3.3027
 InternalName=Measure
 LegalCopyright=版权所有(C) 珠海纵横创新软件有限公司 2003-2014。保留所有权利。
 LegalTrademarks=Measure

Dprs/Trail/Measure_GuangDong.dpr

@@ -136,10 +136,7 @@ uses
   rmGcl_XmjBillsDm in '..\..\DataModules\ReportMemoryDm\rmGcl_XmjBillsDm.pas' {rmGcl_XmjBillsData: TDataModule},
   rmCustomized2Dm in '..\..\DataModules\ReportMemoryDm\rmCustomized2Dm.pas' {rmCustomized2Data: TDataModule},
   CalcDecimal in '..\..\Units\CalcDecimal.pas',
-<<<<<<< HEAD
-  rmHaBaiCustomizedDm in '..\..\DataModules\ReportMemoryDm\rmHaBaiCustomizedDm.pas' {rmHaBaiCustomizedData: TDataModule},
-  BillsPasteSelectFrm in '..\..\Forms\BillsPasteSelectFrm.pas' {BillsPasteSelectForm},
-=======
+
   BaseClipboard in '..\..\Units\BaseClipboard.pas',
   PriceMarginBillsDm in '..\..\DataModules\PriceMarginBillsDm.pas' {PriceMarginBillsData: TDataModule},
   ProjectGLDm in '..\..\DataModules\ProjectGLDm.pas' {ProjectGLData: TDataModule},
@@ -151,7 +148,7 @@ uses
   PriceMarginFme in '..\..\Frames\PriceMarginFme.pas' {PriceMarginFrame: TFrame},
   ProjectGLFme in '..\..\Frames\ProjectGLFme.pas' {ProjectGLFrame: TFrame},
   SelectDetailGLsFrm in '..\..\Forms\SelectDetailGLsFrm.pas' {SelectDetailGLsForm},
->>>>>>> 3.1.3.3PriceMargin(Temp)
+
   DealPayPlanFrm in '..\..\Forms\DealPayPlanFrm.pas' {DealPayPlanForm};
 
 {$R *.res}

Forms/MainFrm.dfm

@@ -1,6 +1,6 @@
 object MainForm: TMainForm
-  Left = 542
-  Top = 223
+  Left = 544
+  Top = 226
   Width = 750
   Height = 538
   ActiveControl = jpsMainProjectsManager
@@ -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
@@ -266,7 +266,7 @@ object MainForm: TMainForm
         Caption = #24037#20855#26639
         DockedDockingStyle = dsTop
         DockedLeft = 0
-        DockedTop = 26
+        DockedTop = 27
         DockingStyle = dsTop
         FloatLeft = 484
         FloatTop = 279
@@ -375,7 +375,7 @@ object MainForm: TMainForm
     DockControlHeights = (
       0
       0
-      48
+      49
       0)
     object dxsiFile: TdxBarSubItem
       Caption = #25991#20214'(&F)'