Merge branch 'master' of http://192.168.1.12:3000/maixinrong/measure

Dprs/CSL/Measure_Cloud.dof

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

Dprs/CSL/Measure_Cloud.dpr

@@ -185,7 +185,21 @@ uses
   ColVisibleManager in '..\..\Units\ColVisibleManager.pas',
   ReportPrepare in '..\..\Report\ReportPrepare.pas',
   rdpBillsGatherDm in '..\..\Report\DataPrepare\rdpBillsGatherDm.pas' {rdpBillsGatherData: TDataModule},
-  rdpTables in '..\..\Report\DataPrepare\rdpTables.pas';
+  rdpTables in '..\..\Report\DataPrepare\rdpTables.pas',
+  ReportConnection in '..\..\Report\ReportConnection.pas',
+  rgpGatherControl in '..\..\Report\ProjGather\rgpGatherControl.pas',
+  rpgBillsCalcDm in '..\..\Report\ProjGather\rpgBillsCalcDm.pas' {rpgBillsCalcData: TDataModule},
+  rpgBillsDm in '..\..\Report\ProjGather\rpgBillsDm.pas' {rpgBillsData: TDataModule},
+  rpgGatherControl in '..\..\Report\ProjGather\rpgGatherControl.pas',
+  rpgGatherData in '..\..\Report\ProjGather\rpgGatherData.pas',
+  rpgGatherProjDm in '..\..\Report\ProjGather\rpgGatherProjDm.pas' {rpgGatherProjData: TDataModule},
+  rProjGatherTables in '..\..\Report\ProjGather\rProjGatherTables.pas',
+  ProjGather in '..\..\ProjGather\ProjGather.pas',
+  GatherProjInfo in '..\..\ProjGather\GatherProjInfo.pas',
+  ProjGatherCalcData in '..\..\ProjGather\ProjGatherCalcData.pas',
+  ProjGatherSelectFrm in '..\..\ProjGather\ProjGatherSelectFrm.pas' {ProjGatherSelectForm},
+  ProjGatherTree in '..\..\ProjGather\ProjGatherTree.pas',
+  CalcData in '..\..\Units\CalcData.pas';
 
 {$R *.res}
 

Dprs/Pro/Measure.dof

@@ -115,7 +115,7 @@ AutoIncBuild=1
 MajorVer=3
 MinorVer=1
 Release=6
-Build=105
+Build=110
 Debug=0
 PreRelease=0
 Special=0
@@ -126,7 +126,7 @@ CodePage=936
 [Version Info Keys]
 CompanyName=珠海纵横创新软件有限公司
 FileDescription=纵横结算决算计量一体化专业版
-FileVersion=3.1.6.105
+FileVersion=3.1.6.110
 InternalName=
 LegalCopyright=版权所有（C）珠海纵横创新软件有限公司2003-2016
 LegalTrademarks=Measure
@@ -146,5 +146,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=E:\资料\软件安装文件\纵横结算决算计量一体化软件(专业版)

Dprs/Pro/Measure.dpr

@@ -178,7 +178,21 @@ uses
   ReportPrepare in '..\..\Report\ReportPrepare.pas',
   rdpBillsGatherDm in '..\..\Report\DataPrepare\rdpBillsGatherDm.pas' {rdpBillsGatherData: TDataModule},
   rdpTables in '..\..\Report\DataPrepare\rdpTables.pas',
-  ColVisibleManager in '..\..\Units\ColVisibleManager.pas';
+  ColVisibleManager in '..\..\Units\ColVisibleManager.pas',
+  ReportConnection in '..\..\Report\ReportConnection.pas',
+  rgpGatherControl in '..\..\Report\ProjGather\rgpGatherControl.pas',
+  rpgBillsCalcDm in '..\..\Report\ProjGather\rpgBillsCalcDm.pas' {rpgBillsCalcData: TDataModule},
+  rpgBillsDm in '..\..\Report\ProjGather\rpgBillsDm.pas' {rpgBillsData: TDataModule},
+  rpgGatherControl in '..\..\Report\ProjGather\rpgGatherControl.pas',
+  rpgGatherData in '..\..\Report\ProjGather\rpgGatherData.pas',
+  rpgGatherProjDm in '..\..\Report\ProjGather\rpgGatherProjDm.pas' {rpgGatherProjData: TDataModule},
+  rProjGatherTables in '..\..\Report\ProjGather\rProjGatherTables.pas',
+  ProjGatherTree in '..\..\ProjGather\ProjGatherTree.pas',
+  ProjGather in '..\..\ProjGather\ProjGather.pas',
+  CalcData in '..\..\Units\CalcData.pas',
+  GatherProjInfo in '..\..\ProjGather\GatherProjInfo.pas',
+  ProjGatherCalcData in '..\..\ProjGather\ProjGatherCalcData.pas',
+  ProjGatherSelectFrm in '..\..\ProjGather\ProjGatherSelectFrm.pas' {ProjGatherSelectForm};
 
 {$R *.res}
 

Dprs/Pro/Measure_Cloud.dof

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

Dprs/Pro/Measure_Cloud.dpr

@@ -182,7 +182,21 @@ uses
   ReportPrepare in '..\..\Report\ReportPrepare.pas',
   rdpBillsGatherDm in '..\..\Report\DataPrepare\rdpBillsGatherDm.pas' {rdpBillsGatherData: TDataModule},
   rdpTables in '..\..\Report\DataPrepare\rdpTables.pas',
-  ColVisibleManager in '..\..\Units\ColVisibleManager.pas';
+  ColVisibleManager in '..\..\Units\ColVisibleManager.pas',
+  ReportConnection in '..\..\Report\ReportConnection.pas',
+  rgpGatherControl in '..\..\Report\ProjGather\rgpGatherControl.pas',
+  rpgBillsCalcDm in '..\..\Report\ProjGather\rpgBillsCalcDm.pas' {rpgBillsCalcData: TDataModule},
+  rpgBillsDm in '..\..\Report\ProjGather\rpgBillsDm.pas' {rpgBillsData: TDataModule},
+  rpgGatherControl in '..\..\Report\ProjGather\rpgGatherControl.pas',
+  rpgGatherData in '..\..\Report\ProjGather\rpgGatherData.pas',
+  rpgGatherProjDm in '..\..\Report\ProjGather\rpgGatherProjDm.pas' {rpgGatherProjData: TDataModule},
+  rProjGatherTables in '..\..\Report\ProjGather\rProjGatherTables.pas',
+  ProjGatherTree in '..\..\ProjGather\ProjGatherTree.pas',
+  ProjGather in '..\..\ProjGather\ProjGather.pas',
+  CalcData in '..\..\Units\CalcData.pas',
+  GatherProjInfo in '..\..\ProjGather\GatherProjInfo.pas',
+  ProjGatherCalcData in '..\..\ProjGather\ProjGatherCalcData.pas',
+  ProjGatherSelectFrm in '..\..\ProjGather\ProjGatherSelectFrm.pas' {ProjGatherSelectForm};
 
 {$R *.res}
 

Dprs/Pro/Measure_GuangDong.dof

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

Dprs/Pro/Measure_GuangDong.dpr

@@ -178,7 +178,21 @@ uses
   rdpBillsGatherDm in '..\..\Report\DataPrepare\rdpBillsGatherDm.pas' {rdpBillsGatherData: TDataModule},
   rdpTables in '..\..\Report\DataPrepare\rdpTables.pas',
   ReportPrepare in '..\..\Report\ReportPrepare.pas',
-  ColVisibleManager in '..\..\Units\ColVisibleManager.pas';
+  ColVisibleManager in '..\..\Units\ColVisibleManager.pas',
+  ReportConnection in '..\..\Report\ReportConnection.pas',
+  rgpGatherControl in '..\..\Report\ProjGather\rgpGatherControl.pas',
+  rpgBillsCalcDm in '..\..\Report\ProjGather\rpgBillsCalcDm.pas' {rpgBillsCalcData: TDataModule},
+  rpgBillsDm in '..\..\Report\ProjGather\rpgBillsDm.pas' {rpgBillsData: TDataModule},
+  rpgGatherControl in '..\..\Report\ProjGather\rpgGatherControl.pas',
+  rpgGatherData in '..\..\Report\ProjGather\rpgGatherData.pas',
+  rpgGatherProjDm in '..\..\Report\ProjGather\rpgGatherProjDm.pas' {rpgGatherProjData: TDataModule},
+  rProjGatherTables in '..\..\Report\ProjGather\rProjGatherTables.pas',
+  ProjGatherTree in '..\..\ProjGather\ProjGatherTree.pas',
+  ProjGather in '..\..\ProjGather\ProjGather.pas',
+  CalcData in '..\..\Units\CalcData.pas',
+  GatherProjInfo in '..\..\ProjGather\GatherProjInfo.pas',
+  ProjGatherCalcData in '..\..\ProjGather\ProjGatherCalcData.pas',
+  ProjGatherSelectFrm in '..\..\ProjGather\ProjGatherSelectFrm.pas' {ProjGatherSelectForm};
 
 {$R *.res}
 

Dprs/Pro/Measure_GuangDong_Cloud.dof

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

Dprs/Pro/Measure_GuangDong_Cloud.dpr

@@ -182,7 +182,21 @@ uses
   ReportPrepare in '..\..\Report\ReportPrepare.pas',
   rdpBillsGatherDm in '..\..\Report\DataPrepare\rdpBillsGatherDm.pas' {rdpBillsGatherData: TDataModule},
   rdpTables in '..\..\Report\DataPrepare\rdpTables.pas',
-  ColVisibleManager in '..\..\Units\ColVisibleManager.pas';
+  ColVisibleManager in '..\..\Units\ColVisibleManager.pas',
+  ReportConnection in '..\..\Report\ReportConnection.pas',
+  rgpGatherControl in '..\..\Report\ProjGather\rgpGatherControl.pas',
+  rpgBillsCalcDm in '..\..\Report\ProjGather\rpgBillsCalcDm.pas' {rpgBillsCalcData: TDataModule},
+  rpgBillsDm in '..\..\Report\ProjGather\rpgBillsDm.pas' {rpgBillsData: TDataModule},
+  rpgGatherControl in '..\..\Report\ProjGather\rpgGatherControl.pas',
+  rpgGatherData in '..\..\Report\ProjGather\rpgGatherData.pas',
+  rpgGatherProjDm in '..\..\Report\ProjGather\rpgGatherProjDm.pas' {rpgGatherProjData: TDataModule},
+  rProjGatherTables in '..\..\Report\ProjGather\rProjGatherTables.pas',
+  ProjGatherTree in '..\..\ProjGather\ProjGatherTree.pas',
+  ProjGather in '..\..\ProjGather\ProjGather.pas',
+  CalcData in '..\..\Units\CalcData.pas',
+  GatherProjInfo in '..\..\ProjGather\GatherProjInfo.pas',
+  ProjGatherCalcData in '..\..\ProjGather\ProjGatherCalcData.pas',
+  ProjGatherSelectFrm in '..\..\ProjGather\ProjGatherSelectFrm.pas' {ProjGatherSelectForm};
 
 {$R *.res}
 

Dprs/Pro/Measure_GuangDong_TZ.dof

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

Dprs/Pro/Measure_GuangDong_TZ.dpr

@@ -178,7 +178,21 @@ uses
   ReportPrepare in '..\..\Report\ReportPrepare.pas',
   rdpBillsGatherDm in '..\..\Report\DataPrepare\rdpBillsGatherDm.pas' {rdpBillsGatherData: TDataModule},
   rdpTables in '..\..\Report\DataPrepare\rdpTables.pas',
-  ColVisibleManager in '..\..\Units\ColVisibleManager.pas';
+  ColVisibleManager in '..\..\Units\ColVisibleManager.pas',
+  ReportConnection in '..\..\Report\ReportConnection.pas',
+  rgpGatherControl in '..\..\Report\ProjGather\rgpGatherControl.pas',
+  rpgBillsCalcDm in '..\..\Report\ProjGather\rpgBillsCalcDm.pas' {rpgBillsCalcData: TDataModule},
+  rpgBillsDm in '..\..\Report\ProjGather\rpgBillsDm.pas' {rpgBillsData: TDataModule},
+  rpgGatherControl in '..\..\Report\ProjGather\rpgGatherControl.pas',
+  rpgGatherData in '..\..\Report\ProjGather\rpgGatherData.pas',
+  rpgGatherProjDm in '..\..\Report\ProjGather\rpgGatherProjDm.pas' {rpgGatherProjData: TDataModule},
+  rProjGatherTables in '..\..\Report\ProjGather\rProjGatherTables.pas',
+  ProjGatherTree in '..\..\ProjGather\ProjGatherTree.pas',
+  ProjGather in '..\..\ProjGather\ProjGather.pas',
+  CalcData in '..\..\Units\CalcData.pas',
+  GatherProjInfo in '..\..\ProjGather\GatherProjInfo.pas',
+  ProjGatherCalcData in '..\..\ProjGather\ProjGatherCalcData.pas',
+  ProjGatherSelectFrm in '..\..\ProjGather\ProjGatherSelectFrm.pas' {ProjGatherSelectForm};
 
 {$R *.res}
 

Dprs/Pro/Measure_TZ.dof

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

Dprs/Pro/Measure_TZ.dpr

@@ -178,7 +178,21 @@ uses
   ReportPrepare in '..\..\Report\ReportPrepare.pas',
   rdpBillsGatherDm in '..\..\Report\DataPrepare\rdpBillsGatherDm.pas' {rdpBillsGatherData: TDataModule},
   rdpTables in '..\..\Report\DataPrepare\rdpTables.pas',
-  ColVisibleManager in '..\..\Units\ColVisibleManager.pas';
+  ColVisibleManager in '..\..\Units\ColVisibleManager.pas',
+  ReportConnection in '..\..\Report\ReportConnection.pas',
+  rgpGatherControl in '..\..\Report\ProjGather\rgpGatherControl.pas',
+  rpgBillsCalcDm in '..\..\Report\ProjGather\rpgBillsCalcDm.pas' {rpgBillsCalcData: TDataModule},
+  rpgBillsDm in '..\..\Report\ProjGather\rpgBillsDm.pas' {rpgBillsData: TDataModule},
+  rpgGatherControl in '..\..\Report\ProjGather\rpgGatherControl.pas',
+  rpgGatherData in '..\..\Report\ProjGather\rpgGatherData.pas',
+  rpgGatherProjDm in '..\..\Report\ProjGather\rpgGatherProjDm.pas' {rpgGatherProjData: TDataModule},
+  rProjGatherTables in '..\..\Report\ProjGather\rProjGatherTables.pas',
+  ProjGatherTree in '..\..\ProjGather\ProjGatherTree.pas',
+  ProjGather in '..\..\ProjGather\ProjGather.pas',
+  CalcData in '..\..\Units\CalcData.pas',
+  GatherProjInfo in '..\..\ProjGather\GatherProjInfo.pas',
+  ProjGatherCalcData in '..\..\ProjGather\ProjGatherCalcData.pas',
+  ProjGatherSelectFrm in '..\..\ProjGather\ProjGatherSelectFrm.pas' {ProjGatherSelectForm};
 
 {$R *.res}
 

Frames/CheckerFme.dfm

@@ -53,7 +53,7 @@ object CheckerFrame: TCheckerFrame
       AutoSize = False
       ColorBegin = clGradientInactiveCaption
       ColorEnd = clGradientInactiveCaption
-      Caption = ' '#23457#26680#20154
+      Caption = ' '#23457#25209#20154
       Font.Charset = GB2312_CHARSET
       Font.Color = clWindowText
       Font.Height = -12

Frames/CheckerFme.pas

@@ -191,7 +191,7 @@ begin
   end
   else
   begin
-    sErrors := Format('无法读取审核人列表，这将会导致桌面程序崩溃！%s地址：%s%s标段ID：%s，期号：%s',
+    sErrors := Format('无法读取审批人列表，这将会导致桌面程序崩溃！%s地址：%s%s标段ID：%s，期号：%s',
       [#13#10#13#10, sURL, #13#10#13#10, IntToStr(vProj.WebID), IntToStr(vProj.PhaseIndex)]);
     Application.MessageBox(PChar(sErrors), '错误', MB_OK + MB_ICONERROR);
     Application.Terminate;

Frames/OrderCheckerFme.pas

@@ -19,7 +19,7 @@ type
   TCheckStatus = (csNotBegin, csChecking, csFinished, csNotPass);  // 末审核，审核中，审核完成，审核不通过
 
 const
-  CheckStatusNames: array[TCheckStatus] of string = ('未审核', '审核中', '审核通过', '审核不通过');
+  CheckStatusNames: array[TCheckStatus] of string = ('未审批', '审批中', '审批通过', '审批不通过');
   CheckStatusColors: array[TCheckStatus] of TColor = ($00B7B7B7, $000099FF, $000E9D00, clRed);
 
 type
@@ -142,9 +142,9 @@ begin
       begin
         CheckedOnLine := ACheckedOnLine;
         if ACheckedOnLine = 0 then
-          sOnLine := '线下审核'
+          sOnLine := '线下审批'
         else if ACheckedOnLine = 1 then
-          sOnLine := '线上审核';
+          sOnLine := '线上审批';
 
         CheckedTime := Format('[%s][%s]', [ACheckedTime, sOnLine]);
       end;
@@ -248,7 +248,7 @@ var sURL: string;
   vProj: TProjectData;
   vArr: array of string;
 begin
-  if Application.MessageBox('确定要删除该审核人吗？', '询问', MB_YESNO + MB_ICONQUESTION) = ID_No then
+  if Application.MessageBox('确定要删除该审批人吗？', '询问', MB_YESNO + MB_ICONQUESTION) = ID_No then
     Exit;
 
   vProj := TProjectData(TCheckerFrame(Owner).ProjectData);
@@ -267,13 +267,13 @@ begin
     end;
     0:
     begin
-      Application.MessageBox(PChar(PHPWeb.PageError('无法删除审核人' + '[' + vArr[0] + ']')),
+      Application.MessageBox(PChar(PHPWeb.PageError('无法删除审批人' + '[' + vArr[0] + ']')),
         '警告', MB_OK + MB_ICONWARNING);
       Exit;
     end;
     -1:
     begin
-      Application.MessageBox(PChar(PHPWeb.NetError('无法删除审核人')),
+      Application.MessageBox(PChar(PHPWeb.NetError('无法删除审批人')),
         '警告', MB_OK + MB_ICONWARNING);
     end;
   end;

Frames/ProjectFme.dfm

@@ -207,7 +207,7 @@ object ProjectFrame: TProjectFrame
           Tag = 5
           Left = 305
           Top = 0
-          Caption = #23457#26680#20154
+          Caption = #23457#25209#20154
           Enabled = False
           ImageIndex = 4
           Style = tbsCheck

Frames/ProjectFme.pas

@@ -356,7 +356,7 @@ begin
           ['tenderid', 'phaseno'], [IntToStr(FProjectData.WebID),
           IntToStr(iBef + 1)], vArr) <> 1 then
         begin
-          Application.MessageBox(Pchar('云端自动创建本期审核人列表出错，请重新尝试！'), '警告', MB_OK + MB_ICONWARNING);
+          Application.MessageBox(Pchar('云端自动创建本期审批人列表出错，请重新尝试！'), '警告', MB_OK + MB_ICONWARNING);
           Exit;
         end;
       end;
@@ -551,12 +551,12 @@ procedure TProjectFrame.dxsbViewControlItemClick(Sender: TObject;
   begin
     if FProjectData.ProjProperties.PhaseCount = 0 then
     begin
-      ErrorMessage('当前项目未开始计量，暂无审核比较数据！');
+      ErrorMessage('当前项目未开始计量，暂无审批比较数据！');
       dxsbViewControl.SelectedItem := dxsbViewControl.ActiveGroup.Items[jpsMain.ActivePageIndex];
       Abort;
     end;
 
-    ShowProgressHint('正在准备审核比较数据，请稍候...');
+    ShowProgressHint('正在准备审批比较数据，请稍候...');
     Screen.Cursor := crHourGlass;
     try
       BeforeChangeView;
@@ -876,7 +876,7 @@ begin
       bSubmit := True;
       if not CheckerFrame.HasNormalChecker then
       begin
-        Application.MessageBox('上报审批前请先配置审核人！', '提示', MB_OK + MB_ICONWARNING);
+        Application.MessageBox('上报审批前请先配置审批人！', '提示', MB_OK + MB_ICONWARNING);
         tobtnShowChecker.Down := True;
         tobtnShowChecker.Click;
         Exit;
@@ -1003,7 +1003,7 @@ begin
               CheckerFrame.Me.CheckStatus := csNotPass;
 
             CheckerFrame.Me.CheckerMemo := sCheckerMemo;
-            CheckerFrame.Me.CheckedTime := Format('[%s][线下审核]',[DateToStr(Date)]);
+            CheckerFrame.Me.CheckedTime := Format('[%s][线下审批]',[DateToStr(Date)]);
           end;
         end;
 

Frames/ProjectManagerFme.dfm

@@ -230,6 +230,7 @@ object ProjectManagerFrame: TProjectManagerFrame
         Font.Style = []
         ParentFont = False
         TabOrder = 1
+        OnClick = pnlProgressClick
         object lblPeriodTotal: TLabel
           Left = 217
           Top = 17
@@ -706,7 +707,7 @@ object ProjectManagerFrame: TProjectManagerFrame
         ReadOnly = False
       end
       item
-        Title.Caption = #23457#26680#29366#24577
+        Title.Caption = #23457#25209#29366#24577
         Title.CaptionAcrossCols = '1'
         Title.Font.Charset = GB2312_CHARSET
         Title.Font.Color = clWindowText

Frames/ProjectManagerFme.pas

@@ -90,6 +90,7 @@ type
       var HintInfo: THintInfo; const ACoord: TPoint);
     procedure actnExportUpdate(Sender: TObject);
     procedure actnOpenBackupFolderUpdate(Sender: TObject);
+    procedure pnlProgressClick(Sender: TObject);
   private
     FProjectManagerData: TProjectManagerData;
 
@@ -366,7 +367,7 @@ begin
 
       if not MainForm.CurProjectFrame.CheckFileAndCloudChekerList then
       begin
-        sHint := '项目校验：“' + FWebBidName_OnLine + '”文件中的审核人和云端的审核人不一致，' +
+        sHint := '项目校验：“' + FWebBidName_OnLine + '”文件中的审批人和云端的审批人不一致，' +
           '禁止继续操作，项目即将关闭！请删除本地项目重新从云端获取，' +
           '重新获取后如果仍然存在同样的问题，请联系纵横服务人员以寻求帮助。';
         Application.MessageBox(PChar(sHint), '文件错误', MB_OK +MB_ICONWARNING);
@@ -443,7 +444,7 @@ begin
            vNode.LocateInControl;
          end;
       1: ErrorMessage('当前标段处于打开状态，未能成功接收，请先关闭标段再次接收。');
-      2: ErrorMessage('下载数据与审核状态不一致，未能成功接收，请再次接收。');
+      2: ErrorMessage('下载数据与审批状态不一致，未能成功接收，请再次接收。');
       3: ErrorMessage('升级数据失败，未能成功接收，请再次接收。');
     end;
     vRP.Free;
@@ -1755,34 +1756,36 @@ end;
 // 为了跟PHP的数组兼容，这里限制数组的第一个元素是A[0]（不能是A[1]）
 procedure TProjectManagerFrame.OnLineChecker(AAr: TOVArr; var ABegin,
   AEnd: Integer; var AOnLineEndIsOwner: Boolean);
-var i, j, n: Integer;
+var i, j: Integer;
   vCS: TCheckStatus;
 begin
   ABegin := 0;
   AEnd := 0;
-  AOnLineEndIsOwner := AAr[High(AAr), 7] = '1';
+  AOnLineEndIsOwner := AAr[High(AAr), 7] = '1';       // 接口返回的第7列是线上审批标记
 
-  n := -1;
-
-  for i := 0 to High(AAr) do
+  //  数组必须在位置n处截断，后面的部分作废。n的取值情况：
+  //  ①轮到工作中的那个人的前一个人 ②审核不通过的那个人 ③ 审核通过的人是业主
+  if AOnLineEndIsOwner then
+    AEnd := High(AAr) + 1
+  else
   begin
-    vCS := TCheckStatus(StrToInt(AAr[i, 5])-1);
-    if vCS = csChecking then
+    for i := High(AAr) downto 0 do
     begin
-      n := i - 1;  // 非常重要：传入的数组必须从第一个审核人到轮到工作中的那个人的前一个人
-      Break;
-    end;
-  end;
+      vCS := TCheckStatus(StrToInt(AAr[i, 5]) - 1);
+      if vCS = csChecking then
+      begin
+        if (i > 0) and (AAr[i - 1, 7] = '1') then   // 前一个人且不是第一个人
+          AEnd := i;
 
-  for i := n downto 0 do
-  begin
-    if AAr[i, 7] = '1' then             // 接口返回的第7列是线上审批标记
-    begin
-      AEnd := i + 1;
-      Break;
-    end
-    else
-      Break;
+        Break;
+      end
+      else if vCS = csNotPass then
+      begin
+        if AAr[i, 7] = '1' then
+          AEnd := i + 1;
+        Break;
+      end;
+    end;
   end;
 
   if AEnd = 0 then Exit;
@@ -1821,4 +1824,15 @@ begin
     (stdProjects.IDTree.Selected.Rec.ValueByName('Type').AsInteger = 1);
 end;
 
+procedure TProjectManagerFrame.pnlProgressClick(Sender: TObject);
+var s: string;
+begin
+  if (GetKeyState(VK_LSHIFT) < 0) and (GetKeyState(VK_LCONTROL) < 0) then
+  begin
+    s := Format('%d, %d, %s', [FOnLineCheckerBegin, FOnLineCheckerEnd, BoolToStr(FOnLineCheckerEndIsOwner)]);
+    Application.MessageBox(Pchar(s), 'Hint');
+  end;
+
+end;
+
 end.