创建Master的Dpr。

Dprs/CSL/Measure_Cloud.dof

@@ -115,7 +115,7 @@ AutoIncBuild=1
 MajorVer=3
 MinorVer=1
 Release=3
-Build=1053
+Build=1054
 Debug=0
 PreRelease=0
 Special=0
@@ -126,7 +126,7 @@ CodePage=936
 [Version Info Keys]
 CompanyName=珠海纵横创新软件有限公司
 FileDescription=纵横结算决算计量一体化云版
-FileVersion=3.1.3.1053
+FileVersion=3.1.3.1054
 InternalName=Measure
 LegalCopyright=版权所有(C) 珠海纵横创新软件有限公司 2003-2014。保留所有权利。
 LegalTrademarks=Measure

Dprs/CSL/Measure_Cloud.dpr

@@ -141,7 +141,7 @@ uses
   rmCustomized2Dm in '..\..\DataModules\ReportMemoryDm\rmCustomized2Dm.pas' {rmCustomized2Data: TDataModule},
   CalcDecimal in '..\..\Units\CalcDecimal.pas',
   BillsPasteSelectFrm in '..\..\Forms\BillsPasteSelectFrm.pas' {BillsPasteSelectForm},
-  //DetailExcelImport in '..\..\Units\DetailExcelImport.pas',
+  DetailExcelImport in '..\..\Units\DetailExcelImport.pas',
   GclBillsGatherModel in '..\..\Units\GclBillsGatherModel.pas',
   PriceMarginBillsDm in '..\..\DataModules\PriceMarginBillsDm.pas' {PriceMarginBillsData: TDataModule},
   ProjectGLDm in '..\..\DataModules\ProjectGLDm.pas' {ProjectGLData: TDataModule},
@@ -152,7 +152,8 @@ uses
   rmHaBaiCustomizedDm in '..\..\DataModules\ReportMemoryDm\rmHaBaiCustomizedDm.pas' {rmHaBaiCustomizedData: TDataModule},
   BaseClipboard in '..\..\Units\BaseClipboard.pas',
   SelectDetailGLsFrm in '..\..\Forms\SelectDetailGLsFrm.pas' {SelectDetailGLsForm},
-  DealPayPlanFrm in '..\..\Forms\DealPayPlanFrm.pas' {DealPayPlanForm};
+  DealPayPlanFrm in '..\..\Forms\DealPayPlanFrm.pas' {DealPayPlanForm},
+  mProgressProFrm in '..\..\Forms\mProgressProFrm.pas' {ProgressProForm};
 
 {$R *.res}
 
@@ -196,6 +197,7 @@ begin
     if CheckDogExists then
     begin
       Application.CreateForm(TMainForm, MainForm);
+  Application.CreateForm(TProgressProForm, ProgressProForm);
   end;
     Application.Run;
   end;

Frames/ProjectManagerFme.pas

@@ -361,7 +361,6 @@ var
         end;
       end;
     end
-<<<<<<< HEAD
     else if (iSearch = 10) then
     begin
       if not HasWebBidInfo(FWebID) then
@@ -371,14 +370,6 @@ var
         Exit;
       end;
     end
-=======
-//    else if (iSearch = 10) then
-//    begin
-//      sHint :='该项目[' + FBidName + ']在云端已被删除，点击"确定"后，可手动删除该项目。';
-//      Application.MessageBox(PChar(sHint), '系统提示', MB_OK + MB_ICONINFORMATION);
-//      Exit;
-//    end
->>>>>>> 3.1.3.3
     else if (iSearch = 0) or (iSearch = -1) then
     begin
       sHint := sError + '（因网络出错，无法检测[' + FBidName + ']在云端是否有更新，本次操作已取消，请重试）。';