合并3.1.3.3代码，并解决冲突

DataModules/BillsCompileDm.pas

@@ -146,12 +146,6 @@ end;
 procedure TBillsCompileData.sdvBillsCompileGetText(var Text: String;
   ARecord: TsdDataRecord; AValue: TsdValue; AColumn: TsdViewColumn;
   DisplayText: Boolean);
-<<<<<<< HEAD
-
-  function GetQtyEditText(const AFormulaField: string): Boolean;
-  begin
-
-  end;
 
   procedure GetEditText;
   var
@@ -183,15 +177,8 @@ procedure TBillsCompileData.sdvBillsCompileGetText(var Text: String;
   end;
 
   procedure GetDisplayText;
-=======
-var
-  fDgnPrice: Double;
-begin
-  if AValue.DataType = ftFloat then
->>>>>>> remotes/origin/3.1.3.3
   begin
-    if (Pos('Price', AColumn.FieldName) > 0) or
-       (Pos('Quantity', AColumn.FieldName) > 0) then
+    if AValue.DataType = ftFloat then
     begin
       if not Assigned(AValue) or (AValue.AsFloat = 0) then
         Text := '';

Dprs/Pro/Measure.dpr

@@ -136,12 +136,9 @@ uses
   rmGcl_XmjBillsDm in '..\..\DataModules\ReportMemoryDm\rmGcl_XmjBillsDm.pas' {rmGcl_XmjBillsData: TDataModule},
   rmCustomized2Dm in '..\..\DataModules\ReportMemoryDm\rmCustomized2Dm.pas' {rmCustomized2Data: TDataModule},
   CalcDecimal in '..\..\Units\CalcDecimal.pas',
-<<<<<<< HEAD
   BillsPasteSelectFrm in '..\..\Forms\BillsPasteSelectFrm.pas' {BillsPasteSelectForm},
   DetailExcelImport in '..\..\Units\DetailExcelImport.pas',
   mProgressProFrm in '..\..\Forms\mProgressProFrm.pas' {ProgressProForm},
-=======
->>>>>>> remotes/origin/3.1.3.3
   ProjectGLDm in '..\..\DataModules\ProjectGLDm.pas' {ProjectGLData: TDataModule},
   PriceMarginBillsDm in '..\..\DataModules\PriceMarginBillsDm.pas' {PriceMarginBillsData: TDataModule},
   GclBillsGatherModel in '..\..\Units\GclBillsGatherModel.pas',
@@ -152,7 +149,6 @@ uses
   SelectDetailGLsFrm in '..\..\Forms\SelectDetailGLsFrm.pas' {SelectDetailGLsForm},
   rmHaBaiCustomizedDm in '..\..\DataModules\ReportMemoryDm\rmHaBaiCustomizedDm.pas' {rmHaBaiCustomizedData: TDataModule},
   DealPayPlanFrm in '..\..\Forms\DealPayPlanFrm.pas' {DealPayPlanForm},
-<<<<<<< HEAD
   BaseClipboard in '..\..\Units\BaseClipboard.pas',
   tpBaseGatherData in '..\..\TenderPartition\tpBaseGatherData.pas',
   tpGatherGcl in '..\..\TenderPartition\tpGatherGcl.pas',
@@ -177,10 +173,6 @@ uses
   tpSelectTendersFrm in '..\..\TenderPartition\tpSelectTendersFrm.pas' {SelectTendersForm},
   tpTrialPegInputFrm in '..\..\TenderPartition\tpTrialPegInputFrm.pas' {TrialPegInputForm},
   mPegFilter in '..\..\Units\mPegFilter.pas';
-=======
-  BaseClipboard in '..\..\Units\BaseClipboard.pas';
-
->>>>>>> remotes/origin/3.1.3.3
 
 {$R *.res}
 

Dprs/Pro/Measure_Cloud.dpr

@@ -140,24 +140,18 @@ uses
   rmGcl_XmjBillsDm in '..\..\DataModules\ReportMemoryDm\rmGcl_XmjBillsDm.pas' {rmGcl_XmjBillsData: TDataModule},
   rmCustomized2Dm in '..\..\DataModules\ReportMemoryDm\rmCustomized2Dm.pas' {rmCustomized2Data: TDataModule},
   CalcDecimal in '..\..\Units\CalcDecimal.pas',
-<<<<<<< HEAD
-  BillsPasteSelectFrm in '..\..\Forms\BillsPasteSelectFrm.pas' {BillsPasteSelectForm},
   DetailExcelImport in '..\..\Units\DetailExcelImport.pas',
   mProgressProFrm in '..\..\Forms\mProgressProFrm.pas' {ProgressProForm},
   rmHaBaiCustomizedDm in '..\..\DataModules\ReportMemoryDm\rmHaBaiCustomizedDm.pas' {rmHaBaiCustomizedData: TDataModule},
-=======
-  rmHaBaiCustomizedDm in '..\..\DataModules\ReportMemoryDm\rmHaBaiCustomizedDm.pas' {rmHaBaiCustomizedData: TDataModule},
   BillsPasteSelectFrm in '..\..\Forms\BillsPasteSelectFrm.pas' {BillsPasteSelectForm},
   DealPayPlanFrm in '..\..\Forms\DealPayPlanFrm.pas' {DealPayPlanForm},
   GclBillsGatherModel in '..\..\Units\GclBillsGatherModel.pas',
->>>>>>> remotes/origin/3.1.3.3
   ProjectGLDm in '..\..\DataModules\ProjectGLDm.pas' {ProjectGLData: TDataModule},
   PriceMarginBillsDm in '..\..\DataModules\PriceMarginBillsDm.pas' {PriceMarginBillsData: TDataModule},
   DetailGLDm in '..\..\DataModules\DetailGLDm.pas' {DetailGLData: TDataModule},
   BaseClipboard in '..\..\Units\BaseClipboard.pas',
   PriceMarginFme in '..\..\Frames\PriceMarginFme.pas' {PriceMarginFrame: TFrame},
   ProjectGLFme in '..\..\Frames\ProjectGLFme.pas' {ProjectGLFrame: TFrame},
-<<<<<<< HEAD
   SelectDetailGLsFrm in '..\..\Forms\SelectDetailGLsFrm.pas' {SelectDetailGLsForm},
   DealPayPlanFrm in '..\..\Forms\DealPayPlanFrm.pas' {DealPayPlanForm},
   BaseClipboard in '..\..\Units\BaseClipboard.pas',
@@ -184,10 +178,7 @@ uses
   tpSelectTenderNode in '..\..\TenderPartition\tpSelectTenderNode.pas',
   tpSelectTendersFrm in '..\..\TenderPartition\tpSelectTendersFrm.pas' {SelectTendersForm},
   tpTrialPegInputFrm in '..\..\TenderPartition\tpTrialPegInputFrm.pas' {TrialPegInputForm};
-=======
   PriceMarginBillsFme in '..\..\Frames\PriceMarginBillsFme.pas' {PriceMarginBillsFrame: TFrame},
-  SelectDetailGLsFrm in '..\..\Forms\SelectDetailGLsFrm.pas' {SelectDetailGLsForm};
->>>>>>> remotes/origin/3.1.3.3
 
 {$R *.res}
 

Dprs/Pro/Measure_GuangDong.dpr

@@ -136,12 +136,8 @@ uses
   rmGcl_XmjBillsDm in '..\..\DataModules\ReportMemoryDm\rmGcl_XmjBillsDm.pas' {rmGcl_XmjBillsData: TDataModule},
   rmCustomized2Dm in '..\..\DataModules\ReportMemoryDm\rmCustomized2Dm.pas' {rmCustomized2Data: TDataModule},
   CalcDecimal in '..\..\Units\CalcDecimal.pas',
-<<<<<<< HEAD
   DetailExcelImport in '..\..\Units\DetailExcelImport.pas',
   mProgressProFrm in '..\..\Forms\mProgressProFrm.pas' {ProgressProForm},
-=======
-
->>>>>>> remotes/origin/3.1.3.3
   BaseClipboard in '..\..\Units\BaseClipboard.pas',
   PriceMarginBillsDm in '..\..\DataModules\PriceMarginBillsDm.pas' {PriceMarginBillsData: TDataModule},
   ProjectGLDm in '..\..\DataModules\ProjectGLDm.pas' {ProjectGLData: TDataModule},
@@ -153,7 +149,6 @@ uses
   PriceMarginFme in '..\..\Frames\PriceMarginFme.pas' {PriceMarginFrame: TFrame},
   ProjectGLFme in '..\..\Frames\ProjectGLFme.pas' {ProjectGLFrame: TFrame},
   SelectDetailGLsFrm in '..\..\Forms\SelectDetailGLsFrm.pas' {SelectDetailGLsForm},
-<<<<<<< HEAD
   DealPayPlanFrm in '..\..\Forms\DealPayPlanFrm.pas' {DealPayPlanForm},
   tpBaseGatherData in '..\..\TenderPartition\tpBaseGatherData.pas',
   tpGatherGcl in '..\..\TenderPartition\tpGatherGcl.pas',
@@ -178,9 +173,6 @@ uses
   tpSelectTendersFrm in '..\..\TenderPartition\tpSelectTendersFrm.pas' {SelectTendersForm},
   tpTrialPegInputFrm in '..\..\TenderPartition\tpTrialPegInputFrm.pas' {TrialPegInputForm},
   mPegFilter in '..\..\Units\mPegFilter.pas';
-=======
-  DealPayPlanFrm in '..\..\Forms\DealPayPlanFrm.pas' {DealPayPlanForm};
->>>>>>> remotes/origin/3.1.3.3
 
 {$R *.res}
 

Dprs/Pro/Measure_GuangDong_Cloud.dpr

@@ -140,12 +140,9 @@ uses
   rmGcl_XmjBillsDm in '..\..\DataModules\ReportMemoryDm\rmGcl_XmjBillsDm.pas' {rmGcl_XmjBillsData: TDataModule},
   rmCustomized2Dm in '..\..\DataModules\ReportMemoryDm\rmCustomized2Dm.pas' {rmCustomized2Data: TDataModule},
   CalcDecimal in '..\..\Units\CalcDecimal.pas',
-<<<<<<< HEAD
   BillsPasteSelectFrm in '..\..\Forms\BillsPasteSelectFrm.pas' {BillsPasteSelectForm},
   DetailExcelImport in '..\..\Units\DetailExcelImport.pas',
   mProgressProFrm in '..\..\Forms\mProgressProFrm.pas' {ProgressProForm},
-=======
->>>>>>> remotes/origin/3.1.3.3
   BaseClipboard in '..\..\Units\BaseClipboard.pas',
   PriceMarginBillsDm in '..\..\DataModules\PriceMarginBillsDm.pas' {PriceMarginBillsData: TDataModule},
   ProjectGLDm in '..\..\DataModules\ProjectGLDm.pas' {ProjectGLData: TDataModule},
@@ -156,7 +153,6 @@ uses
   PriceMarginFme in '..\..\Frames\PriceMarginFme.pas' {PriceMarginFrame: TFrame},
   ProjectGLFme in '..\..\Frames\ProjectGLFme.pas' {ProjectGLFrame: TFrame},
   SelectDetailGLsFrm in '..\..\Forms\SelectDetailGLsFrm.pas' {SelectDetailGLsForm},
-<<<<<<< HEAD
   DealPayPlanFrm in '..\..\Forms\DealPayPlanFrm.pas' {DealPayPlanForm},
   tpBaseGatherData in '..\..\TenderPartition\tpBaseGatherData.pas',
   tpGatherGcl in '..\..\TenderPartition\tpGatherGcl.pas',
@@ -181,9 +177,6 @@ uses
   tpSelectTendersFrm in '..\..\TenderPartition\tpSelectTendersFrm.pas' {SelectTendersForm},
   tpTrialPegInputFrm in '..\..\TenderPartition\tpTrialPegInputFrm.pas' {TrialPegInputForm},
   mPegFilter in '..\..\Units\mPegFilter.pas';
-=======
-  DealPayPlanFrm in '..\..\Forms\DealPayPlanFrm.pas' {DealPayPlanForm};
->>>>>>> remotes/origin/3.1.3.3
 
 {$R *.res}
 

Dprs/Pro/Measure_GuangDong_TZ.dpr

@@ -136,11 +136,8 @@ uses
   rmGcl_XmjBillsDm in '..\..\DataModules\ReportMemoryDm\rmGcl_XmjBillsDm.pas' {rmGcl_XmjBillsData: TDataModule},
   rmCustomized2Dm in '..\..\DataModules\ReportMemoryDm\rmCustomized2Dm.pas' {rmCustomized2Data: TDataModule},
   CalcDecimal in '..\..\Units\CalcDecimal.pas',
-<<<<<<< HEAD
   DetailExcelImport in '..\..\Units\DetailExcelImport.pas',
   mProgressProFrm in '..\..\Forms\mProgressProFrm.pas' {ProgressProForm},
-=======
->>>>>>> remotes/origin/3.1.3.3
   BaseClipboard in '..\..\Units\BaseClipboard.pas',
   PriceMarginBillsDm in '..\..\DataModules\PriceMarginBillsDm.pas' {PriceMarginBillsData: TDataModule},
   ProjectGLDm in '..\..\DataModules\ProjectGLDm.pas' {ProjectGLData: TDataModule},
@@ -152,7 +149,6 @@ uses
   PriceMarginFme in '..\..\Frames\PriceMarginFme.pas' {PriceMarginFrame: TFrame},
   ProjectGLFme in '..\..\Frames\ProjectGLFme.pas' {ProjectGLFrame: TFrame},
   SelectDetailGLsFrm in '..\..\Forms\SelectDetailGLsFrm.pas' {SelectDetailGLsForm},
-<<<<<<< HEAD
   DealPayPlanFrm in '..\..\Forms\DealPayPlanFrm.pas' {DealPayPlanForm},
   tpBaseGatherData in '..\..\TenderPartition\tpBaseGatherData.pas',
   tpGatherGcl in '..\..\TenderPartition\tpGatherGcl.pas',
@@ -177,10 +173,6 @@ uses
   tpSelectTendersFrm in '..\..\TenderPartition\tpSelectTendersFrm.pas' {SelectTendersForm},
   tpTrialPegInputFrm in '..\..\TenderPartition\tpTrialPegInputFrm.pas' {TrialPegInputForm},
   mPegFilter in '..\..\Units\mPegFilter.pas';
-=======
-
-  DealPayPlanFrm in '..\..\Forms\DealPayPlanFrm.pas' {DealPayPlanForm};
->>>>>>> remotes/origin/3.1.3.3
 
 {$R *.res}
 

Dprs/Pro/Measure_TZ.dpr

@@ -136,12 +136,8 @@ uses
   rmGcl_XmjBillsDm in '..\..\DataModules\ReportMemoryDm\rmGcl_XmjBillsDm.pas' {rmGcl_XmjBillsData: TDataModule},
   rmCustomized2Dm in '..\..\DataModules\ReportMemoryDm\rmCustomized2Dm.pas' {rmCustomized2Data: TDataModule},
   CalcDecimal in '..\..\Units\CalcDecimal.pas',
-<<<<<<< HEAD
   DetailExcelImport in '..\..\Units\DetailExcelImport.pas',
   mProgressProFrm in '..\..\Forms\mProgressProFrm.pas' {ProgressProForm},
-=======
-
->>>>>>> remotes/origin/3.1.3.3
   BaseClipboard in '..\..\Units\BaseClipboard.pas',
   PriceMarginBillsDm in '..\..\DataModules\PriceMarginBillsDm.pas' {PriceMarginBillsData: TDataModule},
   ProjectGLDm in '..\..\DataModules\ProjectGLDm.pas' {ProjectGLData: TDataModule},
@@ -153,7 +149,6 @@ uses
   PriceMarginFme in '..\..\Frames\PriceMarginFme.pas' {PriceMarginFrame: TFrame},
   ProjectGLFme in '..\..\Frames\ProjectGLFme.pas' {ProjectGLFrame: TFrame},
   SelectDetailGLsFrm in '..\..\Forms\SelectDetailGLsFrm.pas' {SelectDetailGLsForm},
-<<<<<<< HEAD
   DealPayPlanFrm in '..\..\Forms\DealPayPlanFrm.pas' {DealPayPlanForm},
   tpBaseGatherData in '..\..\TenderPartition\tpBaseGatherData.pas',
   tpGatherGcl in '..\..\TenderPartition\tpGatherGcl.pas',
@@ -178,10 +173,6 @@ uses
   tpSelectTendersFrm in '..\..\TenderPartition\tpSelectTendersFrm.pas' {SelectTendersForm},
   tpTrialPegInputFrm in '..\..\TenderPartition\tpTrialPegInputFrm.pas' {TrialPegInputForm},
   mPegFilter in '..\..\Units\mPegFilter.pas';
-=======
-
-  DealPayPlanFrm in '..\..\Forms\DealPayPlanFrm.pas' {DealPayPlanForm};
->>>>>>> remotes/origin/3.1.3.3
 
 {$R *.res}
 

Dprs/Trail/Measure.dpr

@@ -136,12 +136,8 @@ uses
   rmGcl_XmjBillsDm in '..\..\DataModules\ReportMemoryDm\rmGcl_XmjBillsDm.pas' {rmGcl_XmjBillsData: TDataModule},
   rmCustomized2Dm in '..\..\DataModules\ReportMemoryDm\rmCustomized2Dm.pas' {rmCustomized2Data: TDataModule},
   CalcDecimal in '..\..\Units\CalcDecimal.pas',
-<<<<<<< HEAD
   DetailExcelImport in '..\..\Units\DetailExcelImport.pas',
   mProgressProFrm in '..\..\Forms\mProgressProFrm.pas' {ProgressProForm},
-=======
-
->>>>>>> remotes/origin/3.1.3.3
   BaseClipboard in '..\..\Units\BaseClipboard.pas',
   PriceMarginBillsDm in '..\..\DataModules\PriceMarginBillsDm.pas' {PriceMarginBillsData: TDataModule},
   ProjectGLDm in '..\..\DataModules\ProjectGLDm.pas' {ProjectGLData: TDataModule},
@@ -153,10 +149,6 @@ uses
   PriceMarginFme in '..\..\Frames\PriceMarginFme.pas' {PriceMarginFrame: TFrame},
   ProjectGLFme in '..\..\Frames\ProjectGLFme.pas' {ProjectGLFrame: TFrame},
   SelectDetailGLsFrm in '..\..\Forms\SelectDetailGLsFrm.pas' {SelectDetailGLsForm},
-<<<<<<< HEAD
-=======
-
->>>>>>> remotes/origin/3.1.3.3
   DealPayPlanFrm in '..\..\Forms\DealPayPlanFrm.pas' {DealPayPlanForm};
 
 {$R *.res}

Dprs/Trail/Measure_GuangDong.dpr

@@ -136,12 +136,8 @@ uses
   rmGcl_XmjBillsDm in '..\..\DataModules\ReportMemoryDm\rmGcl_XmjBillsDm.pas' {rmGcl_XmjBillsData: TDataModule},
   rmCustomized2Dm in '..\..\DataModules\ReportMemoryDm\rmCustomized2Dm.pas' {rmCustomized2Data: TDataModule},
   CalcDecimal in '..\..\Units\CalcDecimal.pas',
-<<<<<<< HEAD
   DetailExcelImport in '..\..\Units\DetailExcelImport.pas',
   mProgressProFrm in '..\..\Forms\mProgressProFrm.pas' {ProgressProForm},
-=======
-
->>>>>>> remotes/origin/3.1.3.3
   BaseClipboard in '..\..\Units\BaseClipboard.pas',
   PriceMarginBillsDm in '..\..\DataModules\PriceMarginBillsDm.pas' {PriceMarginBillsData: TDataModule},
   ProjectGLDm in '..\..\DataModules\ProjectGLDm.pas' {ProjectGLData: TDataModule},
@@ -153,10 +149,6 @@ uses
   PriceMarginFme in '..\..\Frames\PriceMarginFme.pas' {PriceMarginFrame: TFrame},
   ProjectGLFme in '..\..\Frames\ProjectGLFme.pas' {ProjectGLFrame: TFrame},
   SelectDetailGLsFrm in '..\..\Forms\SelectDetailGLsFrm.pas' {SelectDetailGLsForm},
-<<<<<<< HEAD
-=======
-
->>>>>>> remotes/origin/3.1.3.3
   DealPayPlanFrm in '..\..\Forms\DealPayPlanFrm.pas' {DealPayPlanForm};
 
 {$R *.res}

Forms/MainFrm.dfm

@@ -1021,7 +1021,6 @@ object MainForm: TMainForm
       Visible = ivAlways
       ImageIndex = 15
     end
-<<<<<<< HEAD
     object dxbtnFxZJJL: TdxBarButton
       Caption = '0'#21495#21488#36134#26684#24335
       Category = 0
@@ -1032,12 +1031,11 @@ object MainForm: TMainForm
       Caption = #24635#37327#25511#21046#26684#24335
       Category = 0
       Hint = #24635#37327#25511#21046#26684#24335
-=======
+    end
     object dxbtnInsertCol: TdxBarButton
       Caption = #26032#22686#19968#21015
       Category = 0
       Hint = #26032#22686#19968#21015
->>>>>>> remotes/origin/3.1.3.3
       Visible = ivAlways
     end
   end

Forms/MainFrm.pas

@@ -151,12 +151,9 @@ type
     dxbtnCopyDetailGls: TdxBarButton;
     dxbtnApplyToSameBills: TdxBarButton;
     dxbtnCalculatePriceMargin: TdxBarButton;
-<<<<<<< HEAD
     dxbtnFxZJJL: TdxBarButton;
     dxbtnGclZJJL: TdxBarButton;
-=======
     dxbtnInsertCol: TdxBarButton;
->>>>>>> remotes/origin/3.1.3.3
     procedure FormCreate(Sender: TObject);
     procedure FormDestroy(Sender: TObject);
     procedure jtsProjectsChange(Sender: TObject; NewTab: Integer;

Frames/BillsCompileFme.pas

@@ -5,11 +5,7 @@ interface
 uses
   BillsCompileDm, UtilMethods, BillsClipboard, sdIDTree, BatchReplaceBillsFrm,
   CheckAndClearFrm, DealBillsFrm, BillsPasteSelectFrm,
-<<<<<<< HEAD
-  sdDB, BillsTree,
-=======
-  sdDB, sdIDTreeCells,
->>>>>>> remotes/origin/3.1.3.3
+  sdDB, BillsTree, sdIDTreeCells,
   Windows, Messages, SysUtils, Variants, Classes, Graphics, Controls, Forms, 
   Dialogs, ActnList, sdGridDBA, sdGridTreeDBA, dxBar, ZJGrid, StdCtrls,
   ExtCtrls;
@@ -116,11 +112,7 @@ implementation
 
 uses
   MainFrm, BatchInsertBillsFrm, ExportExcel, ProjectData, mEncryptEditions,
-<<<<<<< HEAD
   ExcelImport, DetailExcelImport, mDataRecord;
-=======
-  ExcelImport, BillsTree;
->>>>>>> remotes/origin/3.1.3.3
 
 {$R *.dfm}
 
@@ -254,11 +246,7 @@ var
   stnNode: TBillsIDTreeNode;
   iCreatePhaseID: Integer;
 begin
-<<<<<<< HEAD
   if ACoord.Y > stdBillsCompile.IDTree.Count + 2 then Exit;
-=======
-  if ACoord.Y > stdBillsCompile.IDTree.Count + 1 then Exit;
->>>>>>> remotes/origin/3.1.3.3
   stnNode := TBillsIDTreeNode(stdBillsCompile.IDTree.Items[ACoord.Y - 3]);
   if not Assigned(stnNode) then Exit;
   iCreatePhaseID := stnNode.Rec.CreatePhaseID.AsInteger;
@@ -267,11 +255,7 @@ begin
   else if (stnNode.Rec.B_Code.AsString = '') and (stnNode.Level > 0) then
     AColor := $00F9E8DF;
   // 书签
-<<<<<<< HEAD
   if stnNode.Rec.HasBookMark.AsBoolean then
-=======
-  if stnNode.Rec.HasBookmark.AsBoolean then
->>>>>>> remotes/origin/3.1.3.3
     AColor := $00CFE2F9;
   // 根据节点创建期数底色不同
   if iCreatePhaseID > 0 then
@@ -602,7 +586,6 @@ begin
   stdBillsCompile.Column('DrawingCode').ReadOnly := AReadOnly;
 end;
 
-<<<<<<< HEAD
 procedure TBillsCompileFrame.actnImportPlaneFxBillsToXmjExecute(
   Sender: TObject);
 var
@@ -629,7 +612,8 @@ begin
   finally
     EndExpandNode;
   end;
-=======
+end;
+
 procedure TBillsCompileFrame.ExpandMouseDown(AGridCell: TzjCell);
 
   procedure CommonExpand(vNode: TsdIDTreeNode);
@@ -660,7 +644,6 @@ begin
     QuikExpand(stnNode)
   else
     CommonExpand(stnNode);
->>>>>>> remotes/origin/3.1.3.3
 end;
 
 end.

Frames/BillsMeasureFme.pas

@@ -60,13 +60,9 @@ type
     FOnAfterSetBookmark: TBookmarkRefreshEvent;
     FShowAlias: Boolean;
 
-<<<<<<< HEAD
-    function CheckExprsColumn: Boolean;
-=======
     procedure ExpandMouseDown(AGridCell: TzjCell);
 
-    function CheckExprsColumn(ACol: Integer): Boolean;
->>>>>>> remotes/origin/3.1.3.3
+    function CheckExprsColumn: Boolean;
 
     procedure SetColumnVisible(const AColumn: string; AVisible: Boolean);
     procedure SetAddFieldVisible(AValue: Boolean);
@@ -197,11 +193,7 @@ var
   stnNode: TBillsIDTreeNode;
   iCreatePhaseID: Integer;
   StageRec: TStageRecord;
-<<<<<<< HEAD
   fDiffer: Double;
-=======
-  fQtyDiffer: Double;
->>>>>>> remotes/origin/3.1.3.3
 begin
   AColor := clWindow;
   if ACoord.Y > stdBillsMeasure.IDTree.Count + 1 then Exit;
@@ -216,13 +208,8 @@ begin
   // 书签
   if TProjectData(FBillsMeasureData.ProjectData).ProjProperties.PhaseCount > 0 then
   begin
-<<<<<<< HEAD
-    StageRec := TBillsIDTreeNode(stnNode).StageRec;
-    if Assigned(StageRec) and StageRec.HasBookMark.AsBoolean then
-=======
     StageRec := stnNode.StageRec;
     if Assigned(StageRec) and StageRec.HasBookmark.AsBoolean then
->>>>>>> remotes/origin/3.1.3.3
       AColor := $00CFE2F9;
   end;
   // 根据节点创建期数底色不同
@@ -239,7 +226,6 @@ begin
   if not stnNode.HasChildren then
   begin
     with stnNode.Rec do
-<<<<<<< HEAD
     begin
       if CalcType.AsInteger = 0 then
         fDiffer := QuantityRoundTo(AddDealQuantity.AsFloat - Quantity.AsFloat)
@@ -248,11 +234,6 @@ begin
       if fDiffer > 0 then
         AColor := $00646AFE;
     end;
-=======
-      fQtyDiffer := QuantityRoundTo(AddDealQuantity.AsFloat - Quantity.AsFloat);
-    if fQtyDiffer > 0 then
-      AColor := $00646AFE;
->>>>>>> remotes/origin/3.1.3.3
   end;
 end;
 

Frames/ProjectFme.pas

@@ -639,14 +639,9 @@ end;
 
 procedure TProjectFrame.dxpmExpandBillsPopup(Sender: TObject);
 begin
-<<<<<<< HEAD
   dxpmExpandBills.ItemLinks.Items[8].Visible := G_IsTest;
-  dxpmExpandBills.ItemLinks.Items[7].Visible := jpsMain.ActivePageIndex in [0, 1, 3];
-  dxpmExpandBills.ItemLinks.Items[6].Visible := jpsMain.ActivePageIndex in [1, 3];
-=======
   dxpmExpandBills.ItemLinks.Items[7].Visible := jpsMain.ActivePageIndex in [0, 1, 4];
   dxpmExpandBills.ItemLinks.Items[6].Visible := jpsMain.ActivePageIndex in [1, 4];
->>>>>>> remotes/origin/3.1.3.3
   SetDxBtnAction(actnFirstLevel, MainForm.dxbtnFirstLevel);
   SetDxBtnAction(actnSecondLevel, MainForm.dxbtnSecondLevel);
   SetDxBtnAction(actnThirdLevel, MainForm.dxbtnThirdLevel);

Units/ExcelImport.pas

@@ -789,8 +789,8 @@ begin
     begin
       Rec := FProjectData.DealBillsData.sddDealBills.Add;
       Rec.ValueByName('ID').AsInteger := FBillsID;
-      Rec.ValueByName('B_Code').AsString := sB_Code;
-<<<<<<< HEAD
+      Rec.ValueByName('B_Code').AsString := sB_Code; 
+      Rec.ValueByName('IndexCode').AsString := B_CodeToIndexCode(sB_Code);
       Rec.ValueByName('Name').AsString := GetCellTrimText(ASheet, FNameCol, FCurRow);
       Rec.ValueByName('Units').AsString := GetCellTrimText(ASheet, FUnitsCol, FCurRow);
       Rec.ValueByName('Price').AsFloat := PriceRoundTo(
@@ -799,20 +799,6 @@ begin
           StrToFloatDef(GetCellTrimText(ASheet, FQuantityCol, FCurRow), 0));
       Rec.ValueByName('TotalPrice').AsFloat := TotalPriceRoundTo(
           StrToFloatDef(GetCellTrimText(ASheet, FTotalPriceCol, FCurRow), 0));
-=======
-      Rec.ValueByName('IndexCode').AsString := B_CodeToIndexCode(sB_Code);
-      with ASheet.Cells do
-      begin
-        Rec.ValueByName('Name').AsString := VarToStrDef(GetValue(FNameCol, FCurRow), '');
-        Rec.ValueByName('Units').AsString := VarToStrDef(GetValue(FUnitsCol, FCurRow), '');
-        Rec.ValueByName('Price').AsFloat := PriceRoundTo(
-            StrToFloatDef(VarToStrDef(GetValue(FPriceCol, FCurRow), ''), 0));
-        Rec.ValueByName('Quantity').AsFloat := QuantityRoundTo(
-            StrToFloatDef(VarToStrDef(GetValue(FQuantityCol, FCurRow), ''), 0));
-        Rec.ValueByName('TotalPrice').AsFloat := TotalPriceRoundTo(
-            StrToFloatDef(VarToStrDef(GetValue(FTotalPriceCol, FCurRow), ''), 0));
-      end;
->>>>>>> remotes/origin/3.1.3.3
       Inc(FBillsID);
     end;
     Inc(FCurRow);

Units/mDataRecord.pas

@@ -688,12 +688,12 @@ begin
     AValue.AsInteger := AInt;
 end;
 
-<<<<<<< HEAD
 procedure TMeasureBaseRecord.SetStrValue(AValue: TsdValue; AStr: string);
 begin
   if AValue.AsString <> AStr then
     AValue.AsString := AStr;
-=======
+end;
+
 { TStageCompareRecord }
 
 procedure TStageCompareRecord.DoAfterAddFields;
@@ -730,7 +730,6 @@ begin
   FTotalPrice13 := ValueByName('TotalPrice13');
   FQuantity14 := ValueByName('Quantity14');
   FTotalPrice14 := ValueByName('TotalPrice14');
->>>>>>> remotes/origin/3.1.3.3
 end;
 
 end.