Browse Source

点击【开始一期计量】,点击否,不应该跳转至计量台账界面。

CSL 9 years ago
parent
commit
9abfe50e5d
1 changed files with 6 additions and 3 deletions
  1. 6 3
      Frames/ProjectFme.pas

+ 6 - 3
Frames/ProjectFme.pas

@@ -158,7 +158,7 @@ type
     procedure GeneratePhaseChooseList;
     procedure GenerateStageChooseList;
 
-    procedure CreateNewPhase;
+    function CreateNewPhase: Boolean;
     procedure CreateNewAudit;
 
     procedure RefreshColumnDisplay;
@@ -334,11 +334,12 @@ begin
   end;
 end;
 
-procedure TProjectFrame.CreateNewPhase;
+function TProjectFrame.CreateNewPhase: Boolean;
 var
   iBef: Integer;
   vArr: array of string;
 begin
+  Result := False;
   if QuestMessage('请检查合同支付的初始值,新增一期计量将锁定当前全部的清单数据,是否继续?') then
   begin
     // 网络版创建第二期、第三期等跟第一期有所不同:
@@ -382,6 +383,8 @@ begin
       ButtonControl_NewPhase;
       ButtonControl_UpToWeb;
     end;
+
+    Result := True;
   end;
 end;
 
@@ -1088,9 +1091,9 @@ end;
 
 procedure TProjectFrame.btnNewPhaseClick(Sender: TObject);
 begin
+  if not CreateNewPhase then Exit;
   dxsbViewControl.SelectedItem := dxsbViewControl.Groups[0].Items[1];
   dxsbViewControl.OnItemClick(Sender, dxsbViewControl.Groups[0].Items[1]);
-  CreateNewPhase;
 end;
 
 procedure TProjectFrame.ButtonControl_NewPhase;