Merge branch '10.1.0' of http://192.168.1.41:3000/SmartCost/SmartCost into 10.1.0

Common/ScFileArchiverConsts.pas

@@ -74,8 +74,8 @@ const
   ConstEstimateFileVersion = '1.2.7.9';
   ConstRationLibFileVersion = '1.2.5.8';
 }
-  ConstBillsFileVersion = '10.1.4.1003';
-  ConstBudgetFileVersion = '10.1.4.1003';
+  ConstBillsFileVersion = '10.1.4.1004';
+  ConstBudgetFileVersion = '10.1.4.1004';
   ConstEstimateFileVersion = '7.2.0.5';
   ConstRationLibFileVersion = '10.0.1.5';
 

Common/ScTablesUnit.pas

@@ -406,7 +406,7 @@ const
    人均耕地占有量、参保人数、地区标准、养老保险小计、农业税、耕地占用税、
    是否保护区、是否水田}
   SGroundCompensate = 'GroundCompensate';
-  tdGroundCompensate: array [0..65] of TScFieldDef = (
+  tdGroundCompensate: array [0..66] of TScFieldDef = (
     (FieldName: 'ID'; FieldType: ftInteger; Size: 0; Precision: 0; NotNull: True; PrimaryKey: True; ForceUpdate: False),
     (FieldName: 'BillID'; FieldType: ftInteger; Size: 0; Precision: 0; NotNull: True; PrimaryKey: False; ForceUpdate: False),
     (FieldName: 'ParentID'; FieldType: ftInteger; Size: 0; Precision: 0; NotNull: True; PrimaryKey: False; ForceUpdate: False),
@@ -424,6 +424,7 @@ const
     (FieldName: 'ExtractBase'; FieldType: ftCurrency; Size: 4; Precision: 0; NotNull: False; PrimaryKey: False; ForceUpdate: False),
     (FieldName: 'ExtractRatio'; FieldType: ftCurrency; Size: 4; Precision: 0; NotNull: False; PrimaryKey: False; ForceUpdate: False),
     (FieldName: 'ExtractSubtotal'; FieldType: ftCurrency; Size: 4; Precision: 0; NotNull: False; PrimaryKey: False; ForceUpdate: False),
+    (FieldName: 'Resettle'; FieldType: ftCurrency; Size: 4; Precision: 0; NotNull: False; PrimaryKey: False; ForceUpdate: False),
     (FieldName: 'TilthAmountPerPeople'; FieldType: ftCurrency; Size: 4; Precision: 0; NotNull: False; PrimaryKey: False; ForceUpdate: False),
     (FieldName: 'InsurePeopleCount'; FieldType: ftCurrency; Size: 4; Precision: 0; NotNull: False; PrimaryKey: False; ForceUpdate: False),
     (FieldName: 'AreaStandard'; FieldType: ftCurrency; Size: 4; Precision: 0; NotNull: False; PrimaryKey: False; ForceUpdate: False),

DPRs/CSL/SmartCost_GuangDong.dof

@@ -115,7 +115,7 @@ AutoIncBuild=1
 MajorVer=10
 MinorVer=4
 Release=612
-Build=73
+Build=74
 Debug=0
 PreRelease=0
 Special=0
@@ -126,7 +126,7 @@ CodePage=936
 [Version Info Keys]
 CompanyName=珠海纵横创新软件有限公司
 FileDescription=广东公路造价编审系统
-FileVersion=10.4.612.73
+FileVersion=10.4.612.74
 InternalName=SmartCost
 LegalCopyright=版权所有(C) 珠海纵横创新软件有限公司 2003-2014。保留所有权利。
 LegalTrademarks=SmartCost

MainModule/Model/ScGroundCompensateDM.dfm

@@ -363,5 +363,11 @@ object GCTreeDM: TGCTreeDM
       OnGetText = cdsGCGroundCompSubtotalGetText
       OnSetText = cdsGCUnitPriceSetText
     end
+    object cdsGCResettle: TBCDField
+      FieldName = 'Resettle'
+      OnChange = cdsGCGroundCompFeeChange
+      OnGetText = cdsGCGroundCompSubtotalGetText
+      OnSetText = cdsGCUnitPriceSetText
+    end
   end
 end

MainModule/Model/ScGroundCompensateDM.pas

@@ -35,6 +35,7 @@ type
     FInsureSubtotal: Currency;
     FGroundRepayUseFee: Currency;
     FGroundCompFee: Currency;
+    FResettle: Currency;
     FLeftGroundFee: Currency;
     FForestRecoverFee: Currency;
     FTilthAssartFee: Currency;
@@ -87,6 +88,7 @@ type
     procedure CalcBySelf; override;
   public
     property GroundCompFee: Currency read FGroundCompFee write FGroundCompFee;
+    property Resettle: Currency read FResettle write FResettle;
     property GroundCompSubtotal: Currency read FGroundCompSubtotal write FGroundCompSubtotal;
     property SeedlingCompFee: Currency read FSeedlingCompFee write FSeedlingCompFee;
     property SeedlingCompSubtotal: Currency read FSeedlingCompSubtotal write FSeedlingCompSubtotal;
@@ -231,6 +233,7 @@ type
     cdsGCExtractBase: TBCDField;
     cdsGCExtractRatio: TBCDField;
     cdsGCExtractSubtotal: TBCDField;
+    cdsGCResettle: TBCDField;
 
     procedure DataModuleCreate(Sender: TObject);
 
@@ -272,7 +275,6 @@ type
     procedure AssignAreaData(ANode: TAreaNode);
     procedure ClearAreaData;
     procedure AssignForestRecoverFeeData(AID: Integer);
-    function GetGroundCompFee(AGroundKindID, AAreaCategoryID: Integer): Double;
     function GetTilthAssartFee(ANode: TAreaNode): Double; overload;
     function GetTilthAssartFee(AID: Integer): Double; overload;
     function GetGroundSurveyFee(AAcreage: Double): Double;
@@ -320,6 +322,7 @@ end;
 procedure TGCTreeDM.cdsGCBeforePost(DataSet: TDataSet);
 var isLeaf, bNeedCalcGrdMngFee, b2019: Boolean;
   vNode: TGCNode;
+  v1, v2: Double;
 
   function RU(const AValue: Double): Extended;
   begin
@@ -353,6 +356,7 @@ begin
       cdsGCTotalPrice.AsCurrency := RT(cdsGCQuantity.AsCurrency * cdsGCUnitPrice.AsCurrency);
 
       cdsGCGroundCompFee.AsCurrency := 0;
+      cdsGCResettle.AsCurrency := 0;
       cdsGCNewAddFee_GC_1.AsCurrency := 0;
       cdsGCNewAddFee_GC_2.AsCurrency := 0;
       cdsGCNewAddFee_GC_3.AsCurrency := 0;
@@ -411,18 +415,20 @@ begin
     // A.土地补偿
     if (cdsGCIsCountPriceMode.Tag = 1) or (cdsGCAreaCategoryID.Tag = 1) or (cdsGCGroundKindID.Tag = 1) then
     begin
-      cdsGCGroundCompFee.AsFloat := GCFeeLib.GetGroundCompFee(
-        cdsGCGroundKindID.AsInteger, cdsGCAreaCategoryID.AsInteger);
+      GCFeeLib.GetStdGCFee(cdsGCGroundKindID.AsInteger, cdsGCAreaCategoryID.AsInteger, v1, v2);
 
+      cdsGCGroundCompFee.AsFloat := v1;
+      cdsGCResettle.AsFloat := v2;
       cdsGCAreaCategoryID.Tag := 0;
       cdsGCGroundKindID.Tag := 0;
     end;
 
-    if (cdsGCGroundCompFee.Tag = 1) or (cdsGCNewAddFee_GC_1.Tag = 1) or
+    if (cdsGCGroundCompFee.Tag = 1) or (cdsGCResettle.Tag = 1) or (cdsGCNewAddFee_GC_1.Tag = 1) or
       (cdsGCNewAddFee_GC_2.Tag = 1) or (cdsGCNewAddFee_GC_3.Tag = 1) then
     begin
       cdsGCGroundCompSubtotal.AsCurrency :=
         cdsGCGroundCompFee.AsCurrency
+        + cdsGCResettle.AsCurrency
         + cdsGCNewAddFee_GC_1.AsCurrency
         + cdsGCNewAddFee_GC_2.AsCurrency
         + cdsGCNewAddFee_GC_3.AsCurrency;
@@ -431,6 +437,7 @@ begin
       bNeedCalcGrdMngFee := True;
 
       cdsGCGroundCompFee.Tag := 0;
+      cdsGCResettle.Tag := 0;
       cdsGCNewAddFee_GC_1.Tag := 0;
       cdsGCNewAddFee_GC_2.Tag := 0;
       cdsGCNewAddFee_GC_3.Tag := 0;
@@ -774,6 +781,7 @@ begin
     ANode.FInsureSubtotal := FieldByName('InsureSubtotal').AsCurrency;
     ANode.FGroundRepayUseFee := FieldByName('GroundRepayUseFee').AsCurrency;
     ANode.FGroundCompFee := FieldByName('GroundCompFee').AsCurrency;
+    ANode.FResettle := FieldByName('Resettle').AsCurrency;
     ANode.FLeftGroundFee := FieldByName('LeftGroundFee').AsCurrency;
     ANode.FForestRecoverFee := FieldByName('ForestRecoverFee').AsCurrency;
     ANode.FTilthAssartFee := FieldByName('TilthAssartFee').AsCurrency;
@@ -788,7 +796,6 @@ begin
     ANode.ExtractSubtotal := FieldByName('ExtractSubtotal').AsCurrency;
     ANode.FGroundCompSubtotal := FieldByName('GroundCompSubtotal').AsCurrency;
 
-
     ANode.FAreaID := FieldByName('AreaID').AsInteger;
     ANode.FAreaName := FieldByName('AreaName').asString;
     ANode.FAreaCategoryID := FieldByName('AreaCategoryID').AsInteger;
@@ -826,6 +833,7 @@ begin
 end;
 
 procedure TGCTreeDM.AssignAreaData(ANode: TAreaNode);
+var v1, v2: Double;
 begin
   if Assigned(ANode) then
   begin
@@ -834,7 +842,9 @@ begin
     cdsGCAreaName.AsString := ANode.AreaName;
     cdsGCAreaCategoryID.AsInteger := ANode.AreaCategoryID;
     cdsGCAreaCategoryName.AsString := ANode.AreaCategoryName;
-    cdsGCGroundCompFee.AsFloat := GetGroundCompFee(cdsGCGroundKindID.AsInteger, ANode.AreaCategoryID);
+    GCFeeLib.GetStdGCFee(cdsGCGroundKindID.AsInteger, ANode.AreaCategoryID, v1, v2);
+    cdsGCGroundCompFee.AsFloat := v1;
+    cdsGCResettle.AsFloat := v2;
     cdsGCTilthAssartFee.AsFloat := GetTilthAssartFee(ANode);
     // Modified By MaiXinRong 2012-03-02 根据用户选择按照新旧标准数据进行计算
     if TScProject(Owner.Project).Properties.TilthCalcSta = 0 then
@@ -845,11 +855,6 @@ begin
   end;
 end;
 
-function TGCTreeDM.GetGroundCompFee(AGroundKindID,
-  AAreaCategoryID: Integer): Double;
-begin
-  Result := GCFeeLib.GetGroundCompFee(AGroundKindID, AAreaCategoryID);
-end;
 
 function TGCTreeDM.GetTilthAssartFee(ANode: TAreaNode): Double;
 var fKK: Double;
@@ -1043,6 +1048,7 @@ begin
   vGCNode.FInsureSubtotal := DataSet.FieldByName('InsureSubtotal').AsCurrency;
   vGCNode.FGroundRepayUseFee := DataSet.FieldByName('GroundRepayUseFee').AsCurrency;
   vGCNode.FGroundCompFee := DataSet.FieldByName('GroundCompFee').AsCurrency;
+  vGCNode.FResettle := DataSet.FieldByName('Resettle').AsCurrency;
   vGCNode.FLeftGroundFee := DataSet.FieldByName('LeftGroundFee').AsCurrency;
   vGCNode.FForestRecoverFee := DataSet.FieldByName('ForestRecoverFee').AsCurrency;
   vGCNode.FTilthAssartFee := DataSet.FieldByName('TilthAssartFee').AsCurrency;
@@ -1138,10 +1144,11 @@ begin
 
     // A.土地补偿
     GroundCompFee := RU(GroundCompFee);
+    Resettle := RU(Resettle);
     NewAddFee_GC_1 := RU(NewAddFee_GC_1);
     NewAddFee_GC_2 := RU(NewAddFee_GC_2);
     NewAddFee_GC_3 := RU(NewAddFee_GC_3);
-    GroundCompSubtotal := GroundCompFee + NewAddFee_GC_1 + NewAddFee_GC_2 + NewAddFee_GC_3;
+    GroundCompSubtotal := GroundCompFee + Resettle + NewAddFee_GC_1 + NewAddFee_GC_2 + NewAddFee_GC_3;
 
     // B.青苗补偿
     SeedlingCompFee := RU(SeedlingCompFee);
@@ -1250,6 +1257,7 @@ begin
         cdsAllGroundTaxFeeSubtotal.AsFloat := GroundTaxFeeSubtotal;
         cdsAllSeedlingCompFee.AsFloat := SeedlingCompFee;
         cdsAllGroundCompFee.AsFloat := GroundCompFee;
+        cdsAllResettle.AsFloat := Resettle;
         cdsAllTilthAmountPerPeople.AsFloat := TilthAmountPerPeople;
         cdsAllExtractBase.AsFloat := ExtractBase;
         cdsAllExtractRatio.AsFloat := ExtractRatio;
@@ -1345,6 +1353,7 @@ begin
   cdsGCAreaCategoryID.Clear;
   cdsGCAreaCategoryName.Clear;
   cdsGCGroundCompFee.AsFloat := 0;
+  cdsGCResettle.AsFloat := 0;
   cdsGCTilthAssartFee.AsFloat := 0;
   cdsGCTilthImprTax.AsFloat := 0;
   cdsGC.Post;

MainModule/Model/ScGroundCompensateFeeLib.dfm

@@ -2,8 +2,8 @@ object GCFeeLib: TGCFeeLib
   OldCreateOrder = False
   OnCreate = DataModuleCreate
   OnDestroy = DataModuleDestroy
-  Left = 692
-  Top = 224
+  Left = 482
+  Top = 220
   Height = 370
   Width = 373
   object acGC: TADOConnection
@@ -84,6 +84,9 @@ object GCFeeLib: TGCFeeLib
     object aqGroundCompFeeFeeValue: TFloatField
       FieldName = 'FeeValue'
     end
+    object aqGroundCompFeeResettle: TFloatField
+      FieldName = 'Resettle'
+    end
   end
   object dspArea: TDataSetProvider
     DataSet = atArea

MainModule/Model/ScGroundCompensateFeeLib.pas

@@ -92,6 +92,7 @@ type
     cdsAreaTilthAssartFee2010: TFloatField;
     cdsOrgAreaTilthImprTax2010: TFloatField;
     cdsOrgAreaTilthAssartFee2010: TFloatField;
+    aqGroundCompFeeResettle: TFloatField;
     procedure DataModuleCreate(Sender: TObject);
     procedure DataModuleDestroy(Sender: TObject);
   private
@@ -108,7 +109,7 @@ type
     function AreaNameToID(AName: string): Integer;
     procedure GetAreaNames(AStrings: TStrings);
     procedure AnalyzeAreaByStr(AStr: string; AStringList: TStringList);
-    function GetGroundCompFee(AGroundKindID, AAreaCategoryID: Integer): Double;
+    procedure GetStdGCFee(AGroundKindID, AAreaCategoryID: Integer; var A, B: Double);
 
     property AreaTree: TAreaTree read FAreaTree write FAreaTree;
   end;
@@ -248,17 +249,21 @@ begin
   end;
 end;
 
-function TGCFeeLib.GetGroundCompFee(AGroundKindID, AAreaCategoryID: Integer): Double;
+procedure TGCFeeLib.GetStdGCFee(AGroundKindID, AAreaCategoryID: Integer; var A, B: Double);
 begin
-  Result := 0;
-
+  A := 0;
+  B := 0;
   aqGroundCompFee.Close;
   aqGroundCompFee.Parameters[0].Value := AGroundKindID;
   aqGroundCompFee.Parameters[1].Value := AAreaCategoryID;
   aqGroundCompFee.Open;
 
   if aqGroundCompFee.RecordCount > 0 then
-    Result := aqGroundCompFeeFeeValue.AsFloat;
+  begin
+    A := aqGroundCompFeeFeeValue.AsFloat;
+    B := aqGroundCompFeeResettle.AsFloat;
+  end;
+  aqGroundCompFee.Close;
 end;
 
 procedure TGCFeeLib.DataModuleDestroy(Sender: TObject);

MainModule/Model/ScLeafTrees.dfm

@@ -220,6 +220,9 @@ object LeafTreesDM: TLeafTreesDM
     object cdsAllExtractSubtotal: TBCDField
       FieldName = 'ExtractSubtotal'
     end
+    object cdsAllResettle: TBCDField
+      FieldName = 'Resettle'
+    end
   end
   object cdsCalc: TClientDataSet
     Aggregates = <>
@@ -436,5 +439,8 @@ object LeafTreesDM: TLeafTreesDM
     object cdsCalcExtractBase: TBCDField
       FieldName = 'ExtractBase'
     end
+    object cdsCalcResettle: TBCDField
+      FieldName = 'Resettle'
+    end
   end
 end

MainModule/Model/ScLeafTrees.pas

@@ -202,6 +202,8 @@ type
     cdsCalcExtractBase: TBCDField;
     cdsCalcExtractRatio: TBCDField;
     cdsCalcExtractSubtotal: TBCDField;
+    cdsAllResettle: TBCDField;
+    cdsCalcResettle: TBCDField;
     procedure cdsAllAfterOpen(DataSet: TDataSet);
     procedure DataModuleCreate(Sender: TObject);
     procedure DataModuleDestroy(Sender: TObject);
@@ -648,6 +650,7 @@ var vTree: TBaseTree;
   procedure AssignItem(ANode: TXmlNode; AItem: TBaseNode);
   var s: string;
     isLeaf: Boolean;
+    v1, v2: Double;
   begin
     if ANode.HasAttribute('Code') then
       AItem.Code := ANode.AttributeValueByName['Code'];
@@ -685,7 +688,9 @@ var vTree: TBaseTree;
         TGCNode(AItem).GroundKindID := GCFeeLib.GroundNameToID(s);
       end;
 
-      TGCNode(AItem).GroundCompFee := TGCTree(vTree).DM.GetGroundCompFee(TGCNode(AItem).GroundKindID, TGCNode(AItem).AreaCategoryID);
+      GCFeeLib.GetStdGCFee(TGCNode(AItem).GroundKindID, TGCNode(AItem).AreaCategoryID, v1, v2);
+      TGCNode(AItem).GroundCompFee := v1;
+      TGCNode(AItem).Resettle := v2;
       TGCNode(AItem).TilthAssartFee := TGCTree(vTree).DM.GetTilthAssartFee(TGCNode(AItem).AreaID);
     end;
 

MainModule/Model/ScXMLConsts.pas

@@ -389,6 +389,7 @@ const
   c_ExtractBase = 'ExtractBase';
   c_ExtractRatio = 'ExtractRatio';
   c_ExtractSubtotal = 'ExtractSubtotal';
+  c_Resettle = 'Resettle';   // °²Öò¹Öú±ê×¼(Ôª/Ķ)
   c_AreaStandard = 'AreaStandard';
   c_AgricultureTax = 'AgricultureTax';
   c_TilthImprTax = 'TilthImprTax';

MainModule/Model/ScXMLSavers.pas

@@ -6031,6 +6031,7 @@ var
       AXMLNode.Attributes[c_TilthAmountPerPeople] := ANode.TilthAmountPerPeople;
       AXMLNode.Attributes[c_ExtractBase] := ANode.ExtractBase;
       AXMLNode.Attributes[c_ExtractRatio] := ANode.ExtractRatio;
+      AXMLNode.Attributes[c_Resettle] := ANode.Resettle;
       AXMLNode.Attributes[c_ExtractSubtotal] := ANode.ExtractSubtotal;
       AXMLNode.Attributes[c_AreaStandard] := ANode.AreaStandard;
       AXMLNode.Attributes[c_AgricultureTax] := ANode.AgricultureTax;
@@ -6158,6 +6159,7 @@ procedure TScXMLSaver.LoadGCForPaste2(ABillID: Integer; ABaseTree: TBaseTree;
       ANode.ExtractBase := AXMLNode.Attributes[c_ExtractBase];
       ANode.ExtractRatio := AXMLNode.Attributes[c_ExtractRatio];
       ANode.ExtractSubtotal := AXMLNode.Attributes[c_ExtractSubtotal];
+      ANode.Resettle := AXMLNode.Attributes[c_Resettle];
       ANode.AreaStandard := AXMLNode.Attributes[c_AreaStandard];
       ANode.AgricultureTax := AXMLNode.Attributes[c_AgricultureTax];
       ANode.TilthImprTax := AXMLNode.Attributes[c_TilthImprTax];
@@ -6237,6 +6239,7 @@ procedure TScXMLSaver.LoadGCForPaste2(ABillID: Integer; ABaseTree: TBaseTree;
           cdsAllExtractBase.AsVariant := ZeroToNull(vGCNode.ExtractBase);
           cdsAllExtractRatio.AsVariant := ZeroToNull(vGCNode.ExtractRatio);
           cdsAllExtractSubtotal.AsVariant := ZeroToNull(vGCNode.ExtractSubtotal);
+          cdsAllResettle.AsVariant := ZeroToNull(vGCNode.Resettle);
           cdsAllAreaStandard.AsVariant := ZeroToNull(vGCNode.AreaStandard);
           cdsAllAgricultureTax.AsVariant := ZeroToNull(vGCNode.AgricultureTax);
           cdsAllTilthImprTax.AsVariant := ZeroToNull(vGCNode.TilthImprTax);

MainModule/UI/ScBillsSubItemViews.dfm

@@ -86,7 +86,7 @@ object ScBillsSubItemView: TScBillsSubItemView
             Height = 20
             DropDownCount = 20
             ImeName = #20013#25991' ('#31616#20307') - '#24494#36719#25340#38899
-            ItemHeight = 12
+            ItemHeight = 0
             TabOrder = 2
             Visible = False
           end
@@ -230,7 +230,7 @@ object ScBillsSubItemView: TScBillsSubItemView
           Height = 20
           Style = csDropDownList
           ImeName = #20013#25991' - QQ'#25340#38899#36755#20837#27861
-          ItemHeight = 12
+          ItemHeight = 0
           TabOrder = 2
           Visible = False
         end
@@ -240,7 +240,7 @@ object ScBillsSubItemView: TScBillsSubItemView
           Width = 145
           Height = 20
           ImeName = #20013#25991' - QQ'#25340#38899#36755#20837#27861
-          ItemHeight = 12
+          ItemHeight = 0
           TabOrder = 3
           Visible = False
         end
@@ -335,7 +335,7 @@ object ScBillsSubItemView: TScBillsSubItemView
         Height = 427
         Options = [goRangeSelect, goRowSizing, goColSizing, goCellNotMaintainData, goFixedRowShowNo, goFixedColShowNo, goAlwaysShowSelection, goShowTreeLine]
         OptionsEx = []
-        ColCount = 56
+        ColCount = 57
         RowCount = 13
         FixedRowCount = 3
         ShowGridLine = False
@@ -1227,7 +1227,7 @@ object ScBillsSubItemView: TScBillsSubItemView
       end
       item
         Title.Caption = #22303#22320#34917#20607#21644#23433#32622#34917#21161#36153'|'#34917#20607#26631#20934'('#20803'/'#20137')'
-        Title.CaptionAcrossCols = '5|1'
+        Title.CaptionAcrossCols = '6|1'
         Title.Font.Charset = GB2312_CHARSET
         Title.Font.Color = clWindowText
         Title.Font.Height = -12
@@ -1244,8 +1244,26 @@ object ScBillsSubItemView: TScBillsSubItemView
         ReadOnly = False
       end
       item
+        Title.Caption = '|'#23433#32622#34917#21161#26631#20934'('#20803'/'#20137')'
+        Title.CaptionAcrossCols = '1'
+        Title.Font.Charset = GB2312_CHARSET
+        Title.Font.Color = clWindowText
+        Title.Font.Height = -12
+        Title.Font.Name = #23435#20307
+        Title.Font.Style = []
+        Alignment = taRightJustify
+        Font.Charset = GB2312_CHARSET
+        Font.Color = clWindowText
+        Font.Height = -12
+        Font.Name = #23435#20307
+        Font.Style = []
+        FieldName = 'Resettle'
+        Width = 40
+        ReadOnly = False
+      end
+      item
         Title.Caption = '|'#26032#22686'1'
-        Title.CaptionAcrossCols = '5|1'
+        Title.CaptionAcrossCols = '1'
         Title.Font.Charset = GB2312_CHARSET
         Title.Font.Color = clWindowText
         Title.Font.Height = -12
@@ -1263,7 +1281,7 @@ object ScBillsSubItemView: TScBillsSubItemView
       end
       item
         Title.Caption = '|'#26032#22686'2'
-        Title.CaptionAcrossCols = '5|1'
+        Title.CaptionAcrossCols = '1'
         Title.Font.Charset = GB2312_CHARSET
         Title.Font.Color = clWindowText
         Title.Font.Height = -12
@@ -1281,7 +1299,7 @@ object ScBillsSubItemView: TScBillsSubItemView
       end
       item
         Title.Caption = '|'#26032#22686'3'
-        Title.CaptionAcrossCols = '5|1'
+        Title.CaptionAcrossCols = '1'
         Title.Font.Charset = GB2312_CHARSET
         Title.Font.Color = clWindowText
         Title.Font.Height = -12