需切换分支，故提交所有dpr

Dprs/Pro/Measure.cfg

@@ -33,8 +33,8 @@
 -K$00400000
 -E"D:\SmartCostExe\Measure"
 -N"..\..\Dcus"
--LE"d:\program files (x86)\borland\delphi7\Projects\Bpl"
--LN"d:\program files (x86)\borland\delphi7\Projects\Bpl"
+-LE"c:\program files (x86)\borland\delphi7\Projects\Bpl"
+-LN"c:\program files (x86)\borland\delphi7\Projects\Bpl"
 -D_mEncrypt;
 -w-UNSAFE_TYPE
 -w-UNSAFE_CODE

Dprs/Pro/Measure.dof

@@ -114,8 +114,8 @@ IncludeVerInfo=1
 AutoIncBuild=1
 MajorVer=3
 MinorVer=1
-Release=3
-Build=1054
+Release=5
+Build=105
 Debug=0
 PreRelease=0
 Special=0
@@ -126,7 +126,7 @@ CodePage=936
 [Version Info Keys]
 CompanyName=珠海纵横创新软件有限公司
 FileDescription=纵横结算决算计量一体化专业版
-FileVersion=3.1.3.1054
+FileVersion=3.1.5.105
 InternalName=Measure
 LegalCopyright=版权所有(C) 珠海纵横创新软件有限公司 2003-2014。保留所有权利。
 LegalTrademarks=Measure
@@ -134,6 +134,9 @@ OriginalFilename=
 ProductName=纵横公路工程计量决算一体化软件
 ProductVersion=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;
@@ -154,13 +157,14 @@ Count=2
 Item0=..\..\Dcus
 Item1=..\Dcus
 [HistoryLists\hlOutputDirectorry]
-Count=9
+Count=10
 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
+Item1=E:\资料\软件安装文件\纵横结算决算计量一体化软件(专业版)
+Item2=E:\SmartCostExe\Measure
+Item3=D:\Program Files (x86)\纵横软件\纵横计量决算一体化软件(专业版4)
+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

Dprs/Pro/Measure.dpr

@@ -137,7 +137,8 @@ uses
   rmCustomized2Dm in '..\..\DataModules\ReportMemoryDm\rmCustomized2Dm.pas' {rmCustomized2Data: TDataModule},
   CalcDecimal in '..\..\Units\CalcDecimal.pas',
   BillsPasteSelectFrm in '..\..\Forms\BillsPasteSelectFrm.pas' {BillsPasteSelectForm},
-  DetailExcelImport in '..\..\Units\DetailExcelImport.pas';
+  DetailExcelImport in '..\..\Units\DetailExcelImport.pas',
+  mProgressProFrm in '..\..\Forms\mProgressProFrm.pas' {ProgressProForm};
 
 {$R *.res}
 
@@ -158,6 +159,7 @@ begin
     begin
       HideWelcome;
       Application.CreateForm(TMainForm, MainForm);
+  Application.CreateForm(TProgressProForm, ProgressProForm);
   end
     else  HideWelcome;
     Application.Run;

Dprs/Pro/Measure_Cloud.cfg

@@ -33,8 +33,8 @@
 -K$00400000
 -E"D:\SmartCostExe\Measure"
 -N"..\..\Dcus"
--LE"d:\program files (x86)\borland\delphi7\Projects\Bpl"
--LN"d:\program files (x86)\borland\delphi7\Projects\Bpl"
+-LE"c:\program files (x86)\borland\delphi7\Projects\Bpl"
+-LN"c:\program files (x86)\borland\delphi7\Projects\Bpl"
 -D_mCloud;_mEncrypt;
 -w-UNSAFE_TYPE
 -w-UNSAFE_CODE

Dprs/Pro/Measure_Cloud.dof

@@ -114,8 +114,8 @@ IncludeVerInfo=1
 AutoIncBuild=1
 MajorVer=3
 MinorVer=1
-Release=3
-Build=1054
+Release=5
+Build=103
 Debug=0
 PreRelease=0
 Special=0
@@ -126,7 +126,7 @@ CodePage=936
 [Version Info Keys]
 CompanyName=珠海纵横创新软件有限公司
 FileDescription=纵横结算决算计量一体化云版
-FileVersion=3.1.3.1054
+FileVersion=3.1.5.103
 InternalName=Measure
 LegalCopyright=版权所有(C) 珠海纵横创新软件有限公司 2003-2014。保留所有权利。
 LegalTrademarks=Measure
@@ -134,6 +134,9 @@ OriginalFilename=
 ProductName=纵横公路工程计量决算一体化软件
 ProductVersion=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=5
 Item0=_mCloud;_mEncrypt;

Dprs/Pro/Measure_Cloud.dpr

@@ -141,7 +141,8 @@ uses
   rmCustomized2Dm in '..\..\DataModules\ReportMemoryDm\rmCustomized2Dm.pas' {rmCustomized2Data: TDataModule},
   CalcDecimal in '..\..\Units\CalcDecimal.pas',
   BillsPasteSelectFrm in '..\..\Forms\BillsPasteSelectFrm.pas' {BillsPasteSelectForm},
-  DetailExcelImport in '..\..\Units\DetailExcelImport.pas';
+  DetailExcelImport in '..\..\Units\DetailExcelImport.pas',
+  mProgressProFrm in '..\..\Forms\mProgressProFrm.pas' {ProgressProForm};
 
 {$R *.res}
 
@@ -185,6 +186,7 @@ begin
     if CheckDogExists then
     begin
       Application.CreateForm(TMainForm, MainForm);
+  Application.CreateForm(TProgressProForm, ProgressProForm);
   end;
     Application.Run;
   end;

Dprs/Pro/Measure_GuangDong.cfg

@@ -33,8 +33,8 @@
 -K$00400000
 -E"D:\SmartCostExe\Measure"
 -N"..\..\Dcus"
--LE"d:\program files (x86)\borland\delphi7\Projects\Bpl"
--LN"d:\program files (x86)\borland\delphi7\Projects\Bpl"
+-LE"c:\program files (x86)\borland\delphi7\Projects\Bpl"
+-LN"c:\program files (x86)\borland\delphi7\Projects\Bpl"
 -D_mEncrypt;_mGuangDong
 -w-UNSAFE_TYPE
 -w-UNSAFE_CODE

Dprs/Pro/Measure_GuangDong.dof

@@ -114,8 +114,8 @@ IncludeVerInfo=1
 AutoIncBuild=1
 MajorVer=3
 MinorVer=1
-Release=3
-Build=1054
+Release=5
+Build=102
 Debug=0
 PreRelease=0
 Special=0
@@ -126,7 +126,7 @@ CodePage=936
 [Version Info Keys]
 CompanyName=珠海纵横创新软件有限公司
 FileDescription=纵横结算决算计量一体化广东专业版
-FileVersion=3.1.3.1054
+FileVersion=3.1.5.102
 InternalName=Measure
 LegalCopyright=版权所有(C) 珠海纵横创新软件有限公司 2003-2014。保留所有权利。
 LegalTrademarks=Measure
@@ -134,6 +134,9 @@ OriginalFilename=
 ProductName=纵横公路工程计量决算一体化软件
 ProductVersion=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=1
 Item0=_mEncrypt;_mGuangDong

Dprs/Pro/Measure_GuangDong.dpr

@@ -137,7 +137,8 @@ uses
   rmCustomized2Dm in '..\..\DataModules\ReportMemoryDm\rmCustomized2Dm.pas' {rmCustomized2Data: TDataModule},
   CalcDecimal in '..\..\Units\CalcDecimal.pas',
   BillsPasteSelectFrm in '..\..\Forms\BillsPasteSelectFrm.pas' {BillsPasteSelectForm},
-  DetailExcelImport in '..\..\Units\DetailExcelImport.pas';
+  DetailExcelImport in '..\..\Units\DetailExcelImport.pas',
+  mProgressProFrm in '..\..\Forms\mProgressProFrm.pas' {ProgressProForm};
 
 {$R *.res}
 
@@ -157,6 +158,7 @@ begin
     begin
       HideWelcome;
       Application.CreateForm(TMainForm, MainForm);
+  Application.CreateForm(TProgressProForm, ProgressProForm);
   end
     else  HideWelcome;
     Application.Run;

Dprs/Pro/Measure_GuangDong_Cloud.cfg

@@ -33,8 +33,8 @@
 -K$00400000
 -E"D:\SmartCostExe\Measure"
 -N"..\..\Dcus"
--LE"d:\program files (x86)\borland\delphi7\Projects\Bpl"
--LN"d:\program files (x86)\borland\delphi7\Projects\Bpl"
+-LE"c:\program files (x86)\borland\delphi7\Projects\Bpl"
+-LN"c:\program files (x86)\borland\delphi7\Projects\Bpl"
 -D_mCloud;_mEncrypt;_mGuangDong
 -w-UNSAFE_TYPE
 -w-UNSAFE_CODE

Dprs/Pro/Measure_GuangDong_Cloud.dof

@@ -114,8 +114,8 @@ IncludeVerInfo=1
 AutoIncBuild=1
 MajorVer=3
 MinorVer=1
-Release=3
-Build=1053
+Release=5
+Build=102
 Debug=0
 PreRelease=0
 Special=0
@@ -126,7 +126,7 @@ CodePage=936
 [Version Info Keys]
 CompanyName=珠海纵横创新软件有限公司
 FileDescription=纵横结算决算计量一体化广东云版
-FileVersion=3.1.3.1053
+FileVersion=3.1.5.102
 InternalName=Measure
 LegalCopyright=版权所有(C) 珠海纵横创新软件有限公司 2003-2014。保留所有权利。
 LegalTrademarks=Measure
@@ -134,6 +134,9 @@ OriginalFilename=
 ProductName=纵横公路工程计量决算一体化软件
 ProductVersion=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

Dprs/Pro/Measure_GuangDong_Cloud.dpr

@@ -141,7 +141,8 @@ uses
   rmCustomized2Dm in '..\..\DataModules\ReportMemoryDm\rmCustomized2Dm.pas' {rmCustomized2Data: TDataModule},
   CalcDecimal in '..\..\Units\CalcDecimal.pas',
   BillsPasteSelectFrm in '..\..\Forms\BillsPasteSelectFrm.pas' {BillsPasteSelectForm},
-  DetailExcelImport in '..\..\Units\DetailExcelImport.pas';
+  DetailExcelImport in '..\..\Units\DetailExcelImport.pas',
+  mProgressProFrm in '..\..\Forms\mProgressProFrm.pas' {ProgressProForm};
 
 {$R *.res}
 
@@ -187,6 +188,7 @@ begin
     if CheckDogExists then
     begin
       Application.CreateForm(TMainForm, MainForm);
+  Application.CreateForm(TProgressProForm, ProgressProForm);
   end;
     Application.Run;
   end;

Dprs/Pro/Measure_GuangDong_TZ.cfg

@@ -33,8 +33,8 @@
 -K$00400000
 -E"D:\SmartCostExe\Measure"
 -N"..\..\Dcus"
--LE"d:\program files (x86)\borland\delphi7\Projects\Bpl"
--LN"d:\program files (x86)\borland\delphi7\Projects\Bpl"
+-LE"c:\program files (x86)\borland\delphi7\Projects\Bpl"
+-LN"c:\program files (x86)\borland\delphi7\Projects\Bpl"
 -w-UNSAFE_TYPE
 -w-UNSAFE_CODE
 -w-UNSAFE_CAST

Dprs/Pro/Measure_GuangDong_TZ.dof

@@ -114,8 +114,8 @@ IncludeVerInfo=1
 AutoIncBuild=0
 MajorVer=3
 MinorVer=1
-Release=3
-Build=1050
+Release=5
+Build=100
 Debug=0
 PreRelease=0
 Special=0
@@ -126,7 +126,7 @@ CodePage=936
 [Version Info Keys]
 CompanyName=
 FileDescription=
-FileVersion=3.1.3.1050
+FileVersion=3.1.5.100
 InternalName=
 LegalCopyright=
 LegalTrademarks=
@@ -134,6 +134,9 @@ OriginalFilename=
 ProductName=
 ProductVersion=1.0.0.0
 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\hlUnitAliases]
 Count=1
 Item0=WinTypes=Windows;WinProcs=Windows;DbiTypes=BDE;DbiProcs=BDE;DbiErrs=BDE;

Dprs/Pro/Measure_GuangDong_TZ.dpr

@@ -137,7 +137,8 @@ uses
   rmCustomized2Dm in '..\..\DataModules\ReportMemoryDm\rmCustomized2Dm.pas' {rmCustomized2Data: TDataModule},
   CalcDecimal in '..\..\Units\CalcDecimal.pas',
   BillsPasteSelectFrm in '..\..\Forms\BillsPasteSelectFrm.pas' {BillsPasteSelectForm},
-  DetailExcelImport in '..\..\Units\DetailExcelImport.pas';
+  DetailExcelImport in '..\..\Units\DetailExcelImport.pas',
+  mProgressProFrm in '..\..\Forms\mProgressProFrm.pas' {ProgressProForm};
 
 {$R *.res}
 
@@ -157,6 +158,7 @@ begin
     if CheckDogExists then
     begin
       Application.CreateForm(TMainForm, MainForm);
+  Application.CreateForm(TProgressProForm, ProgressProForm);
   end;
     Application.Run;
   end;

Dprs/Pro/Measure_TZ.cfg

@@ -33,8 +33,8 @@
 -K$00400000
 -E"D:\SmartCostExe\Measure"
 -N"..\..\Dcus"
--LE"d:\program files (x86)\borland\delphi7\Projects\Bpl"
--LN"d:\program files (x86)\borland\delphi7\Projects\Bpl"
+-LE"c:\program files (x86)\borland\delphi7\Projects\Bpl"
+-LN"c:\program files (x86)\borland\delphi7\Projects\Bpl"
 -D_mEncrypt;_mcompile;
 -w-UNSAFE_TYPE
 -w-UNSAFE_CODE

Dprs/Pro/Measure_TZ.dof

@@ -114,8 +114,8 @@ IncludeVerInfo=1
 AutoIncBuild=1
 MajorVer=3
 MinorVer=1
-Release=3
-Build=1051
+Release=5
+Build=102
 Debug=0
 PreRelease=0
 Special=0
@@ -126,7 +126,7 @@ CodePage=936
 [Version Info Keys]
 CompanyName=珠海纵横创新软件有限公司
 FileDescription=纵横0号台账专业版
-FileVersion=3.1.3.1051
+FileVersion=3.1.5.102
 InternalName=Measure
 LegalCopyright=版权所有(C) 珠海纵横创新软件有限公司 2003-2014。保留所有权利。
 LegalTrademarks=Measure
@@ -134,6 +134,9 @@ OriginalFilename=
 ProductName=纵横公路工程0号台账软件
 ProductVersion=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.
+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=11
 Item0=_mEncrypt;_mcompile;

Dprs/Pro/Measure_TZ.dpr

@@ -137,7 +137,8 @@ uses
   rmCustomized2Dm in '..\..\DataModules\ReportMemoryDm\rmCustomized2Dm.pas' {rmCustomized2Data: TDataModule},
   CalcDecimal in '..\..\Units\CalcDecimal.pas',
   BillsPasteSelectFrm in '..\..\Forms\BillsPasteSelectFrm.pas' {BillsPasteSelectForm},
-  DetailExcelImport in '..\..\Units\DetailExcelImport.pas';
+  DetailExcelImport in '..\..\Units\DetailExcelImport.pas',
+  mProgressProFrm in '..\..\Forms\mProgressProFrm.pas' {ProgressProForm};
 
 {$R *.res}
 
@@ -158,6 +159,7 @@ begin
     if CheckDogExists then
     begin
       Application.CreateForm(TMainForm, MainForm);
+  Application.CreateForm(TProgressProForm, ProgressProForm);
   end;
     Application.Run;
   end;

Dprs/Trail/Measure.cfg

@@ -33,8 +33,8 @@
 -K$00400000
 -E"D:\SmartCostExe\MeasureTrail"
 -N"..\..\Dcus"
--LE"d:\program files (x86)\borland\delphi7\Projects\Bpl"
--LN"d:\program files (x86)\borland\delphi7\Projects\Bpl"
+-LE"c:\program files (x86)\borland\delphi7\Projects\Bpl"
+-LN"c:\program files (x86)\borland\delphi7\Projects\Bpl"
 -w-UNSAFE_TYPE
 -w-UNSAFE_CODE
 -w-UNSAFE_CAST

Dprs/Trail/Measure.dof

@@ -114,8 +114,8 @@ IncludeVerInfo=1
 AutoIncBuild=1
 MajorVer=3
 MinorVer=1
-Release=3
-Build=1051
+Release=5
+Build=102
 Debug=0
 PreRelease=0
 Special=0
@@ -126,7 +126,7 @@ CodePage=936
 [Version Info Keys]
 CompanyName=珠海纵横创新软件有限公司
 FileDescription=纵横结算决算计量一体化专业版
-FileVersion=3.1.3.1051
+FileVersion=3.1.5.102
 InternalName=Measure
 LegalCopyright=版权所有(C) 珠海纵横创新软件有限公司 2003-2014。保留所有权利。
 LegalTrademarks=Measure
@@ -134,6 +134,9 @@ OriginalFilename=
 ProductName=纵横公路工程计量决算一体化软件
 ProductVersion=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=9
 Item0=_mEncrypt;cplPrint;cplOutputToExcelRange

Dprs/Trail/Measure.dpr

@@ -137,7 +137,8 @@ uses
   rmCustomized2Dm in '..\..\DataModules\ReportMemoryDm\rmCustomized2Dm.pas' {rmCustomized2Data: TDataModule},
   CalcDecimal in '..\..\Units\CalcDecimal.pas',
   BillsPasteSelectFrm in '..\..\Forms\BillsPasteSelectFrm.pas' {BillsPasteSelectForm},
-  DetailExcelImport in '..\..\Units\DetailExcelImport.pas';
+  DetailExcelImport in '..\..\Units\DetailExcelImport.pas',
+  mProgressProFrm in '..\..\Forms\mProgressProFrm.pas' {ProgressProForm};
 
 {$R *.res}
 
@@ -157,6 +158,7 @@ begin
     begin
       HideWelcome;
       Application.CreateForm(TMainForm, MainForm);
+  Application.CreateForm(TProgressProForm, ProgressProForm);
   end
     else  HideWelcome;
     Application.Run;

Dprs/Trail/Measure_GuangDong.cfg

@@ -33,8 +33,8 @@
 -K$00400000
 -E"D:\SmartCostExe\MeasureTrail"
 -N"..\..\Dcus"
--LE"d:\program files (x86)\borland\delphi7\Projects\Bpl"
--LN"d:\program files (x86)\borland\delphi7\Projects\Bpl"
+-LE"c:\program files (x86)\borland\delphi7\Projects\Bpl"
+-LN"c:\program files (x86)\borland\delphi7\Projects\Bpl"
 -D_mGuangDong
 -w-UNSAFE_TYPE
 -w-UNSAFE_CODE

Dprs/Trail/Measure_GuangDong.dof

@@ -114,8 +114,8 @@ IncludeVerInfo=1
 AutoIncBuild=1
 MajorVer=3
 MinorVer=1
-Release=3
-Build=1051
+Release=5
+Build=102
 Debug=0
 PreRelease=0
 Special=0
@@ -126,7 +126,7 @@ CodePage=936
 [Version Info Keys]
 CompanyName=珠海纵横创新软件有限公司
 FileDescription=纵横结算决算计量一体化广东学习版
-FileVersion=3.1.3.1051
+FileVersion=3.1.5.102
 InternalName=Measure
 LegalCopyright=版权所有(C) 珠海纵横创新软件有限公司 2003-2014。保留所有权利。
 LegalTrademarks=Measure
@@ -134,6 +134,9 @@ OriginalFilename=
 ProductName=纵横公路工程计量决算一体化软件
 ProductVersion=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=12
 Item0=_mGuangDong

Dprs/Trail/Measure_GuangDong.dpr

@@ -137,7 +137,8 @@ uses
   rmCustomized2Dm in '..\..\DataModules\ReportMemoryDm\rmCustomized2Dm.pas' {rmCustomized2Data: TDataModule},
   CalcDecimal in '..\..\Units\CalcDecimal.pas',
   BillsPasteSelectFrm in '..\..\Forms\BillsPasteSelectFrm.pas' {BillsPasteSelectForm},
-  DetailExcelImport in '..\..\Units\DetailExcelImport.pas';
+  DetailExcelImport in '..\..\Units\DetailExcelImport.pas',
+  mProgressProFrm in '..\..\Forms\mProgressProFrm.pas' {ProgressProForm};
 
 {$R *.res}
 
@@ -157,6 +158,7 @@ begin
     begin
       HideWelcome;
       Application.CreateForm(TMainForm, MainForm);
+  Application.CreateForm(TProgressProForm, ProgressProForm);
   end
     else  HideWelcome;
     Application.Run;

Forms/ReportsFrm.dfm

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

Forms/ReportsFrm.pas

@@ -164,7 +164,7 @@ implementation
 
 uses
   UtilMethods, Math, DirectPrintUnit, Globals, ZhAPI, ReportAdjustFrm,
-  Contnrs, mEncryptUnit, Printers;
+  Contnrs, mEncryptUnit, Printers, WinSpool;
 
 {$R *.dfm}
 
@@ -1268,10 +1268,37 @@ end;
 procedure TReportsForm.PrintReport(ATemplateNode: TTemplateNode;
   isPDF, isExcel: boolean; ExcelOutputName, TemplateFileName: string);
 
+  function CheckPrinterReady: Boolean;
+  var
+    PrinterHD: THandle;
+    NoJobs: Word;
+    s: LongWord;
+    Job_Info: Array[0..10] of Job_INFO_1;
+    cbNeeded: Cardinal;
+    cReturned: Cardinal;
+    ret: LongBool;
+  begin
+    if OpenPrinter(PChar(Printer.Printers[Printer.PrinterIndex]), PrinterHD, 0) then
+    begin
+      s := SizeOf(Job_Info);
+      cbNeeded := 0;
+      cReturned := 0;
+      NoJobs := 10;
+      ret := ENumJobs(PrinterHD, 0, NoJobs, 1, @Job_Info, s, cbNeeded, cReturned);
+      Result := not((cReturned > 0) and (Job_Info[0].TotalPages > 0));
+    end
+    else
+      Result := True;
+  end;
+
   procedure PrintTemplet;
   begin
     if isPDF then
-      PreviewComXML.PrintPDFAll
+    begin
+      PreviewComXML.PrintPDFAll;
+      while not CheckPrinterReady do
+        Sleep(1000);
+    end
     else if not isExcel then
       PreviewComXML.PrintAll(1)
     else