|  | @@ -393,7 +393,7 @@ procedure TDealPaymentData.sdvDealPaymentSetText(var Text: string;
 | 
												
													
														
															|  |      begin
 |  |      begin
 | 
												
													
														
															|  |        if (Pos('TotalPrice', AValue.FieldName) = 1) and
 |  |        if (Pos('TotalPrice', AValue.FieldName) = 1) and
 | 
												
													
														
															|  |           (Rec.ValueByName('Formula').AsString <> '') and
 |  |           (Rec.ValueByName('Formula').AsString <> '') and
 | 
												
													
														
															|  | -         (Rec.ValueByName('CalcType').AsInteger <> 2panduan ) then
 |  | 
 | 
												
													
														
															|  | 
 |  | +         (Rec.ValueByName('CalcType').AsInteger <> 2) then
 | 
												
													
														
															|  |        begin
 |  |        begin
 | 
												
													
														
															|  |          // 如果有公式计算,如果是纯数学计算式,则可设置,基数计算,则不可
 |  |          // 如果有公式计算,如果是纯数学计算式,则可设置,基数计算,则不可
 | 
												
													
														
															|  |          sFormula := Rec.ValueByName('Formula').AsString;
 |  |          sFormula := Rec.ValueByName('Formula').AsString;
 |