1. Bug #1590 累计合同计量，计算问题

2. Bug #1631 合同支付，扣款限额计算问题
3. Bug 中开定制报表，表头问题

DataModules/BillsMeasureDm.pas

@@ -1018,6 +1018,30 @@ begin
 
     ANode.Rec.PM_AddTotalPrice.AsFloat := ANode.StageRec.PM_PreTotalPrice.AsFloat + ANode.StageRec.PM_TotalPrice.AsFloat;
     CalcAddCompleteRate(ANode);
+  end
+  else
+  begin
+    if not ANode.HasChildren then
+    begin
+      ANode.Rec.AddDealQuantity.Clear;
+
+      ANode.Rec.AddQcQuantity.Clear;
+      ANode.Rec.AddQcBGLCode.Clear;
+      ANode.Rec.AddQcBGLNum.Clear;
+
+      ANode.Rec.AddPcQuantity.Clear;
+      ANode.Rec.AddPcBGLCode.Clear;
+      ANode.Rec.AddPcBGLNum.Clear;
+
+      ANode.Rec.AddGatherQuantity.Clear;
+    end;
+    ANode.Rec.AddDealTotalPrice.Clear;
+    ANode.Rec.AddQcTotalPrice.Clear;
+    ANode.Rec.AddPcTotalPrice.Clear;
+    ANode.Rec.AddGatherTotalPrice.Clear;
+    ANode.Rec.AddCompleteRate.Clear;
+
+    ANode.Rec.PM_AddTotalPrice.Clear;
   end;
 end;
 

DataModules/DealPaymentDm.pas

@@ -82,7 +82,8 @@ type
 implementation
 
 uses
-  ProjectData, PhasePayDm, PhaseData, ZhAPI, BillsDm, Math, Variants;
+  ProjectData, PhasePayDm, PhaseData, ZhAPI, BillsDm, Math, Variants,
+  ProjectProperty;
 
 {$R *.dfm}
 
@@ -550,7 +551,8 @@ var
   I: Integer;
   Rec: TsdDataRecord;
 begin
-  if TProjectData(FProjectData).ProjProperties.PhaseCount > 0 then Exit;
+  with TProjectData(FProjectData).ProjProperties do
+    if (PhaseCount > 1) or ((PhaseCount = 1) and (AuditStatus <> 0)) then Exit;
   for I := 0 to sddDealPayment.RecordCount - 1 do
   begin
     Rec := sddDealPayment.Records[I];

DataModules/ReportMemoryDm/rmGridHeaderDm.pas

@@ -43,6 +43,8 @@ begin
   cdsGridHeaderPhaseIndex.AsString := Format('%d ÆÚ', [AProjectData.PhaseIndex]);
   cdsGridHeaderDealName.AsString := AProjectData.ProjProperties.DealName;
   cdsGridHeaderFlowIndex.AsInteger := 0;
+  cdsGridHeaderSName_2.AsString := AProjectData.ProjProperties.SName_2;
+  cdsGridHeaderDeadline.AsString := AProjectData.ProjProperties.Deadline;
   cdsGridHeader.Post;
   Result := cdsGridHeader;
 end;