bugs

Dprs/CSL/Measure_Cloud.dof

@@ -112,10 +112,10 @@ RootDir=D:\Program Files\Borland\Delphi7\Bin\
 [Version Info]
 IncludeVerInfo=1
 AutoIncBuild=1
-MajorVer=9999
-MinorVer=999
-Release=999
-Build=1000
+MajorVer=3
+MinorVer=4
+Release=1
+Build=1002
 Debug=0
 PreRelease=0
 Special=0
@@ -126,7 +126,7 @@ CodePage=936
 [Version Info Keys]
 CompanyName=珠海纵横创新软件有限公司
 FileDescription=纵横结算决算计量一体化云版
-FileVersion=9999.999.999.1000
+FileVersion=3.4.1.1002
 InternalName=
 LegalCopyright=
 LegalTrademarks=

Frames/ProjectFme.pas

@@ -213,7 +213,7 @@ uses
   ConstUnit, MD5Unit, sdIDTree, sdDB, mProgressFrm, ConditionalDefines,
   ProjectCommands, ProjectProperty, CheckerMemoFrm, BillsMeasureDm,
   ProgressHintFrm, mProgressProFrm, ReportManagerFrm, BillsCompileDm,
-  ScFileArchiverConsts, Math, ZJJLDm;
+  ScFileArchiverConsts, Math, ZJJLDm, Checker;
 
 {$R *.dfm}
 
@@ -916,6 +916,7 @@ var sURL, sAppFile, sJsonFile_Bills, sJsonFile_Common, sAppFile_UnLock,
   vCF: TCheckerMemoForm;
   bNeedFreeEarlier: Boolean;
 
+
   // 1 审核； 2 批复。
   function SaveAndExport(AType: Integer): Boolean;
 
@@ -926,10 +927,12 @@ var sURL, sAppFile, sJsonFile_Bills, sJsonFile_Common, sAppFile_UnLock,
       else if AType = 2 then
         Result := ProjectData.ReplyProject(sAppFile);
     end;
+
   begin
     Result := False;
     ProgressProCreate(100, '本地数据文件上传到云端');
     ProgressProRun('保存本地数据...', 0);
+    ProjectData.Checkers.LastChecker := ProjectData.Checkers.FindByID(PHPWeb.UserID);
     ProjectData.SaveAndCheck;
     ProgressProRun('保存本地数据。OK', 10, pmtEdit);
 
@@ -1066,7 +1069,9 @@ begin
         DeleteFile(sAppFile);
         ProgressProRun('上传数据包到云端。OK', 100, pmtEdit, pptSet);
         if ProjectData.CurUserIsChecker then
+        begin
           ProjectData.Checkers.FindByID(PHPWeb.UserID).Memo := sCheckerMemo;
+        end;
 
         if ProjectData.PhaseIndex = 0 then   // 0号台账，现已废弃
         begin

Units/ProjectData.pas

@@ -213,6 +213,7 @@ type
     function CurUserIsOwner: Boolean;
     function CurUserIsAuthor: Boolean;
     function CurUserIsChecker: Boolean;
+    function LastCheckerIsOwner: Boolean;
     function IsHistoryPhase: Boolean;
 
     property BillsData: TBillsData read FBillsData;
@@ -538,7 +539,7 @@ begin
   InfoRec.ValueByName('PreTotalPrice').AsFloat := PhaseRec.ValueByName('PreGatherTotalPrice').AsFloat;
   InfoRec.ValueByName('PhasePay').AsFloat := PhaseRec.ValueByName('PhasePay').AsFloat;
   InfoRec.ValueByName('PhaseCount').AsInteger := FProjProperties.PhaseCount;
-  if (G_IsCloud and CurUserIsOwner) then   // 云版的批复始终要显示"批复"，不能从属性表读数字显示成3审（如果业主是3审的话）
+  if (G_IsCloud and CurUserIsOwner and LastCheckerIsOwner) then   // 云版的批复始终要显示"批复"，不能从属性表读数字显示成3审（如果业主是3审的话）
     InfoRec.ValueByName('AuditStatus').AsInteger := -1
   else
     InfoRec.ValueByName('AuditStatus').AsInteger := FProjProperties.AuditStatus;
@@ -2290,4 +2291,9 @@ begin
   end;
 end;
 
+function TProjectData.LastCheckerIsOwner: Boolean;
+begin
+  Result := PHPWeb.UserID = FCheckers.LastChecker.ID;
+end;
+
 end.