总分包界面调整

Forms/MainFrm.pas

@@ -941,14 +941,15 @@ begin
   if CurProjectFrame.ProjectData.ProjProperties.PhaseCount = 0 then
     WarningMessage('未开始计量，请在开始计量后再导入分包汇总数据。')
   else if CurProjectFrame.ProjectData.StageDataReadOnly then
-    WarningMessage('当前正在查看往期数据，请切换至最新一起再导入分包汇总数据。')
-  else if SelectFile(sFileName, '.sgf') then
+    WarningMessage('当前正在查看数据非最新数据，请切换至最新一期再导入分包汇总数据。')
+  else if QuestMessage('导入将清空标段本期所有计量数据（合同计量、数量变更计量），确定继续？') and SelectFile(sFileName, '.sgf') then
     CurProjectFrame.ProjectData.ImportSubTenderGather(sFileName);
 end;
 
 procedure TMainForm.actnImportSubTenderGatherUpdate(Sender: TObject);
 begin
-  TAction(Sender).Enabled := (jtsProjects.Tabs.Count > 1) and Assigned(CurProjectFrame);
+  TAction(Sender).Enabled := (jtsProjects.Tabs.Count > 1) and Assigned(CurProjectFrame)
+    and (CurProjectFrame.ProjectData.PhaseData.StageCount <= 1);
 end;
 
 end.

SubTenderGather/stgResultFrm.dfm

@@ -652,12 +652,12 @@ object stgResultForm: TstgResultForm
       OnExecute = actnExportTenderErrorExecute
     end
     object actnExportStgResultExcel: TAction
-      Caption = #23548#20986#20998#21253#27719#24635#32467#26524
+      Caption = #23548#20986#20998#21253#27719#24635'Excel'#26684#24335
       ImageIndex = 13
       OnExecute = actnExportStgResultExcelExecute
     end
     object actnExportStgResult: TAction
-      Caption = #23548#20986#20998#21253#27719#24635#32467#26524
+      Caption = #23548#20986#20998#21253#27719#24635#36719#20214#26684#24335
       ImageIndex = 28
       OnExecute = actnExportStgResultExecute
     end

Units/UtilMethods.pas

@@ -234,7 +234,7 @@ begin
     end;
   P := @X;
   CopyMemory(P, @Buf[0], SizeOf(X));
-  if (ADigit < 0) and (ADigit < GetTrueDigit(AValue)) then
+  if (ADigit < -6) and (ADigit < GetTrueDigit(AValue)) then
     Result := AValue
   else
     Result := InnerRoundTo(X, ADigit, RoundMode);