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

Dprs/Pro/Measure.dof

@@ -115,7 +115,7 @@ AutoIncBuild=1
 MajorVer=1
 MinorVer=0
 Release=1
-Build=2
+Build=3
 Debug=0
 PreRelease=0
 Special=0
@@ -126,7 +126,7 @@ CodePage=936
 [Version Info Keys]
 CompanyName=珠海纵横创新软件有限公司
 FileDescription=纵横结算决算计量一体化专业版
-FileVersion=1.0.1.2
+FileVersion=1.0.1.3
 InternalName=
 LegalCopyright=
 LegalTrademarks=

Dprs/Pro/Measure.dpr

@@ -205,7 +205,10 @@ uses
   ProjGatherSelectFme in '..\..\ProjGather\ProjGatherSelectFme.pas' {ProjGatherSelectFrame: TFrame},
   rpgZoneGatherControl in '..\..\Report\ProjGather\Zone\rpgZoneGatherControl.pas',
   rpgZoneProjGatherSelectFrm in '..\..\Report\ProjGather\Zone\rpgZoneProjGatherSelectFrm.pas' {rpgZoneProjGatherSelectForm},
-  ScjtBGLFme in '..\..\SiChuanJiaoTou\ScjtBGLFme.pas' {ScjtBGLFrame: TFrame};
+  ScjtBGLFme in '..\..\SiChuanJiaoTou\ScjtBGLFme.pas' {ScjtBGLFrame: TFrame},
+  LeafXmjGlDm in '..\..\DataModules\LeafXmjGlDm.pas' {LeafXmjGlData: TDataModule},
+  StageLeafXmjGlDm in '..\..\DataModules\StageLeafXmjGlDm.pas' {StageLeafXmjGlData: TDataModule},
+  LeafXmjGlFme in '..\..\Frames\LeafXmjGlFme.pas' {LeafXmjGlFrame: TFrame};
 
 {$R *.res}
 

Dprs/Pro/Measure_Cloud.dof

@@ -115,7 +115,7 @@ AutoIncBuild=1
 MajorVer=1
 MinorVer=0
 Release=1
-Build=2
+Build=3
 Debug=0
 PreRelease=0
 Special=0
@@ -126,7 +126,7 @@ CodePage=936
 [Version Info Keys]
 CompanyName=珠海纵横创新软件有限公司
 FileDescription=纵横结算决算计量一体化云版
-FileVersion=1.0.1.2
+FileVersion=1.0.1.3
 InternalName=
 LegalCopyright=版权所有（C）珠海纵横创新软件有限公司2003-2016
 LegalTrademarks=Measure

Dprs/Pro/Measure_Cloud.dpr

@@ -211,7 +211,10 @@ uses
   ProjGatherSelectFme in '..\..\ProjGather\ProjGatherSelectFme.pas' {ProjGatherSelectFrame: TFrame},
   rpgZoneGatherControl in '..\..\Report\ProjGather\Zone\rpgZoneGatherControl.pas',
   rpgZoneProjGatherSelectFrm in '..\..\Report\ProjGather\Zone\rpgZoneProjGatherSelectFrm.pas' {rpgZoneProjGatherSelectForm},
-  ScjtBGLFme in '..\..\SiChuanJiaoTou\ScjtBGLFme.pas' {ScjtBGLFrame: TFrame};
+  ScjtBGLFme in '..\..\SiChuanJiaoTou\ScjtBGLFme.pas' {ScjtBGLFrame: TFrame},
+  LeafXmjGlDm in '..\..\DataModules\LeafXmjGlDm.pas' {LeafXmjGlData: TDataModule},
+  StageLeafXmjGlDm in '..\..\DataModules\StageLeafXmjGlDm.pas' {StageLeafXmjGlData: TDataModule},
+  LeafXmjGlFme in '..\..\Frames\LeafXmjGlFme.pas' {LeafXmjGlFrame: TFrame};
 
 {$R *.res}
 

Dprs/Pro/Measure_GuangDong.dof

@@ -115,7 +115,7 @@ AutoIncBuild=1
 MajorVer=3
 MinorVer=1
 Release=6
-Build=1036
+Build=1037
 Debug=0
 PreRelease=0
 Special=0
@@ -126,7 +126,7 @@ CodePage=936
 [Version Info Keys]
 CompanyName=珠海纵横创新软件有限公司
 FileDescription=纵横结算决算计量一体化广东专业版
-FileVersion=3.1.6.1036
+FileVersion=3.1.6.1037
 InternalName=
 LegalCopyright=版权所有（C）珠海纵横创新软件有限公司2003-2016
 LegalTrademarks=Measure

Dprs/Pro/Measure_GuangDong.dpr

@@ -204,7 +204,11 @@ uses
   OtherMeasureFme in '..\..\Frames\OtherMeasureFme.pas' {OtherMeasureFrame: TFrame},
   ProjGatherSelectFme in '..\..\ProjGather\ProjGatherSelectFme.pas' {ProjGatherSelectFrame: TFrame},
   rpgZoneGatherControl in '..\..\Report\ProjGather\Zone\rpgZoneGatherControl.pas',
-  rpgZoneProjGatherSelectFrm in '..\..\Report\ProjGather\Zone\rpgZoneProjGatherSelectFrm.pas' {rpgZoneProjGatherSelectForm};
+  rpgZoneProjGatherSelectFrm in '..\..\Report\ProjGather\Zone\rpgZoneProjGatherSelectFrm.pas' {rpgZoneProjGatherSelectForm},
+  LeafXmjGlDm in '..\..\DataModules\LeafXmjGlDm.pas' {LeafXmjGlData: TDataModule},
+  StageLeafXmjGlDm in '..\..\DataModules\StageLeafXmjGlDm.pas' {StageLeafXmjGlData: TDataModule},
+  LeafXmjGlFme in '..\..\Frames\LeafXmjGlFme.pas' {LeafXmjGlFrame: TFrame},
+  ScjtBGLFme in '..\..\SiChuanJiaoTou\ScjtBGLFme.pas' {ScjtBGLFrame: TFrame};
 
 {$R *.res}
 

Dprs/Pro/Measure_GuangDong_Cloud.dof

@@ -115,7 +115,7 @@ AutoIncBuild=1
 MajorVer=3
 MinorVer=1
 Release=6
-Build=1036
+Build=1037
 Debug=0
 PreRelease=0
 Special=0
@@ -126,7 +126,7 @@ CodePage=936
 [Version Info Keys]
 CompanyName=珠海纵横创新软件有限公司
 FileDescription=纵横结算决算计量一体化广东云版
-FileVersion=3.1.6.1036
+FileVersion=3.1.6.1037
 InternalName=
 LegalCopyright=版权所有（C）珠海纵横创新软件有限公司2003-2016
 LegalTrademarks=Measure

Dprs/Pro/Measure_GuangDong_Cloud.dpr

@@ -210,7 +210,11 @@ uses
   OtherMeasureFme in '..\..\Frames\OtherMeasureFme.pas' {OtherMeasureFrame: TFrame},
   ProjGatherSelectFme in '..\..\ProjGather\ProjGatherSelectFme.pas' {ProjGatherSelectFrame: TFrame},
   rpgZoneGatherControl in '..\..\Report\ProjGather\Zone\rpgZoneGatherControl.pas',
-  rpgZoneProjGatherSelectFrm in '..\..\Report\ProjGather\Zone\rpgZoneProjGatherSelectFrm.pas' {rpgZoneProjGatherSelectForm};
+  rpgZoneProjGatherSelectFrm in '..\..\Report\ProjGather\Zone\rpgZoneProjGatherSelectFrm.pas' {rpgZoneProjGatherSelectForm},
+  ScjtBGLFme in '..\..\SiChuanJiaoTou\ScjtBGLFme.pas' {ScjtBGLFrame: TFrame},
+  LeafXmjGlDm in '..\..\DataModules\LeafXmjGlDm.pas' {LeafXmjGlData: TDataModule},
+  StageLeafXmjGlDm in '..\..\DataModules\StageLeafXmjGlDm.pas' {StageLeafXmjGlData: TDataModule},
+  LeafXmjGlFme in '..\..\Frames\LeafXmjGlFme.pas' {LeafXmjGlFrame: TFrame};
 
 {$R *.res}
 

Dprs/Pro/Measure_GuangDong_TZ.dpr

@@ -204,7 +204,11 @@ uses
   OtherMeasureFme in '..\..\Frames\OtherMeasureFme.pas' {OtherMeasureFrame: TFrame},
   ProjGatherSelectFme in '..\..\ProjGather\ProjGatherSelectFme.pas' {ProjGatherSelectFrame: TFrame},
   rpgZoneGatherControl in '..\..\Report\ProjGather\Zone\rpgZoneGatherControl.pas',
-  rpgZoneProjGatherSelectFrm in '..\..\Report\ProjGather\Zone\rpgZoneProjGatherSelectFrm.pas' {rpgZoneProjGatherSelectForm};
+  rpgZoneProjGatherSelectFrm in '..\..\Report\ProjGather\Zone\rpgZoneProjGatherSelectFrm.pas' {rpgZoneProjGatherSelectForm},
+  ScjtBGLFme in '..\..\SiChuanJiaoTou\ScjtBGLFme.pas' {ScjtBGLFrame: TFrame},
+  LeafXmjGlDm in '..\..\DataModules\LeafXmjGlDm.pas' {LeafXmjGlData: TDataModule},
+  StageLeafXmjGlDm in '..\..\DataModules\StageLeafXmjGlDm.pas' {StageLeafXmjGlData: TDataModule},
+  LeafXmjGlFme in '..\..\Frames\LeafXmjGlFme.pas' {LeafXmjGlFrame: TFrame};
 {$R *.res}
 
 var Mutex: THandle;

Dprs/Pro/Measure_TZ.dof

@@ -115,7 +115,7 @@ AutoIncBuild=1
 MajorVer=3
 MinorVer=1
 Release=6
-Build=1036
+Build=1037
 Debug=0
 PreRelease=0
 Special=0
@@ -126,7 +126,7 @@ CodePage=936
 [Version Info Keys]
 CompanyName=珠海纵横创新软件有限公司
 FileDescription=纵横0号台账专业版
-FileVersion=3.1.6.1036
+FileVersion=3.1.6.1037
 InternalName=
 LegalCopyright=版权所有（C）珠海纵横创新软件有限公司2003-2016
 LegalTrademarks=Measure

Dprs/Pro/Measure_TZ.dpr

@@ -204,7 +204,11 @@ uses
   OtherMeasureFme in '..\..\Frames\OtherMeasureFme.pas' {OtherMeasureFrame: TFrame},
   ProjGatherSelectFme in '..\..\ProjGather\ProjGatherSelectFme.pas' {ProjGatherSelectFrame: TFrame},
   rpgZoneGatherControl in '..\..\Report\ProjGather\Zone\rpgZoneGatherControl.pas',
-  rpgZoneProjGatherSelectFrm in '..\..\Report\ProjGather\Zone\rpgZoneProjGatherSelectFrm.pas' {rpgZoneProjGatherSelectForm};
+  rpgZoneProjGatherSelectFrm in '..\..\Report\ProjGather\Zone\rpgZoneProjGatherSelectFrm.pas' {rpgZoneProjGatherSelectForm},
+  ScjtBGLFme in '..\..\SiChuanJiaoTou\ScjtBGLFme.pas' {ScjtBGLFrame: TFrame},
+  LeafXmjGlDm in '..\..\DataModules\LeafXmjGlDm.pas' {LeafXmjGlData: TDataModule},
+  StageLeafXmjGlDm in '..\..\DataModules\StageLeafXmjGlDm.pas' {StageLeafXmjGlData: TDataModule},
+  LeafXmjGlFme in '..\..\Frames\LeafXmjGlFme.pas' {LeafXmjGlFrame: TFrame};
 
 {$R *.res}