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=3
+Build=6
 Debug=0
 PreRelease=0
 Special=0
@@ -125,8 +125,8 @@ Locale=2052
 CodePage=936
 [Version Info Keys]
 CompanyName=珠海纵横创新软件有限公司
-FileDescription=纵横结算决算计量一体化专业版
-FileVersion=1.0.1.3
+FileDescription=四川交投成本管理系统专业版
+FileVersion=1.0.1.6
 InternalName=
 LegalCopyright=
 LegalTrademarks=
@@ -136,3 +136,15 @@ ProductVersion=1.0.0.0
 [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=1
+Item0=D:\SmartCostExe\Measure

Dprs/Pro/Measure.dpr

@@ -222,7 +222,7 @@ begin
   begin
     Application.CreateHandle;
     Application.Initialize;
-    Application.Title := '纵横公路工程结算决算计量一体化软件专业版';
+    Application.Title := '四川交投成本管理系统专业版';
 
     ShowWelcome;
     if CheckDogExists then

Dprs/Pro/Measure_Cloud.dof

@@ -115,7 +115,7 @@ AutoIncBuild=1
 MajorVer=1
 MinorVer=0
 Release=1
-Build=3
+Build=6
 Debug=0
 PreRelease=0
 Special=0
@@ -125,8 +125,8 @@ Locale=2052
 CodePage=936
 [Version Info Keys]
 CompanyName=珠海纵横创新软件有限公司
-FileDescription=纵横结算决算计量一体化云版
-FileVersion=1.0.1.3
+FileDescription=四川交投成本管理系统云版
+FileVersion=1.0.1.6
 InternalName=
 LegalCopyright=版权所有（C）珠海纵横创新软件有限公司2003-2016
 LegalTrademarks=Measure

Dprs/Pro/Measure_Cloud.dpr

@@ -231,7 +231,7 @@ begin
   begin
     Application.CreateHandle;
     Application.Initialize;
-    Application.Title := '纵横公路工程结算决算计量一体化软件云版';
+    Application.Title := '四川交投成本管理系统云版';
     {$IFDEF _mCloud}
       IPForm := TIPForm.Create(nil);
       try

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

Forms/MainFrm.pas

@@ -270,7 +270,7 @@ procedure TMainForm.FormCreate(Sender: TObject);
     if _ModuleType = mtCompile then
       Result := '纵横公路工程0号台账软件'
     else if _ModuleType = mtAll then
-      Result := '纵横公路工程结算决算计量一体化软件';
+      Result := '四川交投成本管理系统';
   end;
 
   function GetVersionName: string;

Frames/ProjectManagerFme.pas

@@ -302,10 +302,10 @@ var
 
           if FileDownAndReceive(sDownURL, 2) then
           begin
-            // 这里主要是为了线上创建新一期审批人列表、更改标段状态。不再使用同步更新等。
+            // 这里在线上创建新一期审批人列表、更改标段状态。不再使用同步更新等。
             sSearchURL := Format('%suser/create/%d/%d/new/audit', [PHPWeb.MeasureURL, FWebID, FPhaseNo]);
             case SearchFileOnline(sSearchURL, sDownURL, FWebFolder_OnLine, FWebSubFolder_OnLine, FWebBidName_OnLine, sMD5_UnLock, sError, iFolderID, iSubFolderID) of
-              1:
+              1, 10:    // 执行到这里线上审核人列表已创建完毕。无需返回记录值，所以返回值为10。1是为了兼容。
               begin
                 sHint := '【十分重要】：本期计量已重新开始，原报在本次上报完成前，请勿删除该标段或更换电脑。';
                 Application.MessageBox(PChar(sHint), '提示', MB_OK + MB_ICONINFORMATION);

Units/ConstUnit.pas

@@ -9,7 +9,7 @@ const
   纵横标后预算软件
   纵横0号台账清单编审软件  }
 
-  G_ProductName = '纵横公路工程结算决算计量支付一体化软件';
+  G_ProductName = '纵横施工企业验工计价成本分析软件';
 
   iQuantityDigit = -3;
   iPriceDigit = -2;