builder 6 anni fa
parent
commit
ff9a8d0b95

+ 16 - 2
Dprs/Pro/Measure.dof

@@ -115,7 +115,7 @@ AutoIncBuild=1
 MajorVer=3
 MinorVer=1
 Release=7
-Build=2247
+Build=2291
 Debug=0
 PreRelease=0
 Special=0
@@ -126,7 +126,7 @@ CodePage=936
 [Version Info Keys]
 CompanyName=珠海纵横创新软件有限公司
 FileDescription=纵横结算决算计量一体化专业版
-FileVersion=3.1.7.2247
+FileVersion=3.1.7.2291
 InternalName=
 LegalCopyright=版权所有(C)珠海纵横创新软件有限公司2003-2016
 LegalTrademarks=Measure
@@ -136,3 +136,17 @@ ProductVersion=3.1.7
 [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;
+[HistoryLists\hlUnitAliases]
+Count=1
+Item0=WinTypes=Windows;WinProcs=Windows;DbiTypes=BDE;DbiProcs=BDE;DbiErrs=BDE;
+[HistoryLists\hlUnitOutputDirectory]
+Count=1
+Item0=..\..\Dcus
+[HistoryLists\hlOutputDirectorry]
+Count=3
+Item0=D:\SmartCostExe\Measure
+Item1=D:\Program Files (x86)\纵横软件\纵横结算决算计量一体化软件(专业版)
+Item2=D:\Program Files (x86)\纵横软件\纵横结算决算计量一体化软件(云版)

+ 2 - 1
Dprs/Pro/Measure.dpr

@@ -235,7 +235,8 @@ uses
   stgSubGatherFile in '..\..\SubTenderGather\stgSubGatherFile.pas',
   stgSubGatherFileDm in '..\..\SubTenderGather\stgSubGatherFileDm.pas' {stgSubGatherData: TDataModule},
   stgTables in '..\..\SubTenderGather\stgTables.pas',
-  rmZhongKaiDm in '..\..\DataModules\ReportMemoryDm\rmZhongKaiDm.pas' {rmZhongKaiData: TDataModule};
+  rmZhongKaiDm in '..\..\DataModules\ReportMemoryDm\rmZhongKaiDm.pas' {rmZhongKaiData: TDataModule},
+  BillsPosTree in '..\..\Units\BillsPosTree.pas';
 
 {$R *.res}
 

BIN
Dprs/Pro/Measure.res


+ 4 - 3
Dprs/Pro/Measure_Cloud.dof

@@ -115,7 +115,7 @@ AutoIncBuild=1
 MajorVer=3
 MinorVer=1
 Release=7
-Build=2247
+Build=2291
 Debug=0
 PreRelease=0
 Special=0
@@ -126,7 +126,7 @@ CodePage=936
 [Version Info Keys]
 CompanyName=珠海纵横创新软件有限公司
 FileDescription=纵横结算决算计量一体化云版
-FileVersion=3.1.7.2247
+FileVersion=3.1.7.2291
 InternalName=
 LegalCopyright=版权所有(C)珠海纵横创新软件有限公司2003-2016
 LegalTrademarks=Measure
@@ -149,5 +149,6 @@ Item0=WinTypes=Windows;WinProcs=Windows;DbiTypes=BDE;DbiProcs=BDE;DbiErrs=BDE;
 Count=1
 Item0=..\..\Dcus
 [HistoryLists\hlOutputDirectorry]
-Count=1
+Count=2
 Item0=D:\SmartCostExe\Measure
+Item1=D:\Program Files (x86)\纵横软件\纵横结算决算计量一体化软件(云版)1

+ 2 - 1
Dprs/Pro/Measure_Cloud.dpr

@@ -242,7 +242,8 @@ uses
   stgSubGatherFile in '..\..\SubTenderGather\stgSubGatherFile.pas',
   stgSubGatherFileDm in '..\..\SubTenderGather\stgSubGatherFileDm.pas' {stgSubGatherData: TDataModule},
   stgTables in '..\..\SubTenderGather\stgTables.pas',
-  rmZhongKaiDm in '..\..\DataModules\ReportMemoryDm\rmZhongKaiDm.pas' {rmZhongKaiData: TDataModule};
+  rmZhongKaiDm in '..\..\DataModules\ReportMemoryDm\rmZhongKaiDm.pas' {rmZhongKaiData: TDataModule},
+  BillsPosTree in '..\..\Units\BillsPosTree.pas';
 
 {$R *.res}
 

BIN
Dprs/Pro/Measure_Cloud.res


+ 2 - 2
Dprs/Pro/Measure_GuangDong.dof

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

+ 2 - 1
Dprs/Pro/Measure_GuangDong.dpr

@@ -235,7 +235,8 @@ uses
   stgSubGatherFile in '..\..\SubTenderGather\stgSubGatherFile.pas',
   stgSubGatherFileDm in '..\..\SubTenderGather\stgSubGatherFileDm.pas' {stgSubGatherData: TDataModule},
   stgTables in '..\..\SubTenderGather\stgTables.pas',
-  rmZhongKaiDm in '..\..\DataModules\ReportMemoryDm\rmZhongKaiDm.pas' {rmZhongKaiData: TDataModule};
+  rmZhongKaiDm in '..\..\DataModules\ReportMemoryDm\rmZhongKaiDm.pas' {rmZhongKaiData: TDataModule},
+  BillsPosTree in '..\..\Units\BillsPosTree.pas';
 
 {$R *.res}
 

BIN
Dprs/Pro/Measure_GuangDong.res


+ 2 - 2
Dprs/Pro/Measure_GuangDong_Cloud.cfg

@@ -31,8 +31,8 @@
 -M
 -$M16384,1048576
 -K$00400000
--E"C:\Program Files (x86)\纵横软件\纵横结算决算计量一体化软件(广东云版)"
--N"C:\DelphiTemp"
+-E"D:\SmartCostExe\Measure"
+-N"..\..\Dcus"
 -LE"c:\program files (x86)\borland\delphi7\Projects\Bpl"
 -LN"c:\program files (x86)\borland\delphi7\Projects\Bpl"
 -D_mCloud;_mGuangDong

+ 8 - 8
Dprs/Pro/Measure_GuangDong_Cloud.dof

@@ -90,8 +90,8 @@ MaxStackSize=1048576
 ImageBase=4194304
 ExeDescription=
 [Directories]
-OutputDir=C:\Program Files (x86)\纵横软件\纵横结算决算计量一体化软件(广东云版)
-UnitOutputDir=C:\DelphiTemp
+OutputDir=D:\SmartCostExe\Measure
+UnitOutputDir=..\..\Dcus
 PackageDLLOutputDir=
 PackageDCPOutputDir=
 SearchPath=
@@ -115,7 +115,7 @@ AutoIncBuild=0
 MajorVer=3
 MinorVer=1
 Release=7
-Build=2246
+Build=2290
 Debug=0
 PreRelease=0
 Special=0
@@ -126,7 +126,7 @@ CodePage=936
 [Version Info Keys]
 CompanyName=珠海纵横创新软件有限公司
 FileDescription=纵横结算决算计量一体化广东云版
-FileVersion=3.1.7.2246
+FileVersion=3.1.7.2290
 InternalName=
 LegalCopyright=版权所有(C)珠海纵横创新软件有限公司2003-2016
 LegalTrademarks=Measure
@@ -143,9 +143,9 @@ Count=1
 Item0=WinTypes=Windows;WinProcs=Windows;DbiTypes=BDE;DbiProcs=BDE;DbiErrs=BDE;
 [HistoryLists\hlUnitOutputDirectory]
 Count=2
-Item0=C:\DelphiTemp
-Item1=..\..\Dcus
+Item0=..\..\Dcus
+Item1=C:\DelphiTemp
 [HistoryLists\hlOutputDirectorry]
 Count=2
-Item0=C:\Program Files (x86)\纵横软件\纵横结算决算计量一体化软件(广东云版)
-Item1=D:\SmartCostExe\Measure
+Item0=D:\SmartCostExe\Measure
+Item1=C:\Program Files (x86)\纵横软件\纵横结算决算计量一体化软件(广东云版)

+ 2 - 1
Dprs/Pro/Measure_GuangDong_Cloud.dpr

@@ -242,7 +242,8 @@ uses
   stgSubGatherFileDm in '..\..\SubTenderGather\stgSubGatherFileDm.pas' {stgSubGatherData: TDataModule},
   stgTables in '..\..\SubTenderGather\stgTables.pas',
   rmZhongKaiDm in '..\..\DataModules\ReportMemoryDm\rmZhongKaiDm.pas' {rmZhongKaiData: TDataModule},
-  MScrollBox in '..\..\..\SmartCost\Components\MBaseControl\Source\MScrollBox.pas';
+  MScrollBox in '..\..\..\SmartCost\Components\MBaseControl\Source\MScrollBox.pas',
+  BillsPosTree in '..\..\Units\BillsPosTree.pas';
 
 {$R *.res}
 

BIN
Dprs/Pro/Measure_GuangDong_Cloud.res


+ 12 - 12
Forms/MainFrm.dfm

@@ -21,7 +21,7 @@ object MainForm: TMainForm
   object jtsProjects: TJimTabSet
     Left = 0
     Top = 49
-    Width = 742
+    Width = 734
     Height = 21
     Align = alTop
     BackgroundColor = clGradientInactiveCaption
@@ -45,8 +45,8 @@ object MainForm: TMainForm
   end
   object dxStatusBar: TdxStatusBar
     Left = 0
-    Top = 487
-    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
@@ -94,8 +94,8 @@ object MainForm: TMainForm
   object jpsMain: TJimPages
     Left = 0
     Top = 70
-    Width = 742
-    Height = 417
+    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 = 417
+      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 = 417
+      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 = 'Microsoft YaHei UI'
+    Font.Name = #24494#36719#38597#40657
     Font.Style = []
     Bars = <
       item