Jelajahi Sumber

线上审批后,客户端显示审批意见时,应处理换行\n。

Chenshilong 9 tahun lalu
induk
melakukan
f90bbef590
4 mengubah file dengan 9 tambahan dan 5 penghapusan
  1. 2 2
      Dprs/CSL/Measure_Cloud.dof
  2. 5 1
      Dprs/CSL/Measure_Cloud.dpr
  3. TEMPAT SAMPAH
      Dprs/CSL/Measure_Cloud.res
  4. 2 2
      Units/UtilMethods.pas

+ 2 - 2
Dprs/CSL/Measure_Cloud.dof

@@ -115,7 +115,7 @@ AutoIncBuild=1
 MajorVer=3
 MinorVer=1
 Release=3
-Build=1072
+Build=1075
 Debug=0
 PreRelease=0
 Special=0
@@ -126,7 +126,7 @@ CodePage=936
 [Version Info Keys]
 CompanyName=珠海纵横创新软件有限公司
 FileDescription=纵横结算决算计量一体化云版
-FileVersion=3.1.3.1072
+FileVersion=3.1.3.1075
 InternalName=
 LegalCopyright=
 LegalTrademarks=

+ 5 - 1
Dprs/CSL/Measure_Cloud.dpr

@@ -181,7 +181,11 @@ uses
   ClientService in '..\..\Encrypt\NetClient\ClientService.pas',
   CfgPort in '..\..\Encrypt\NetClient\CfgPort.pas',
   CorrespondClient in '..\..\Encrypt\NetClient\CorrespondClient.pas',
-  EnctyptClientData in '..\..\Encrypt\NetClient\EnctyptClientData.pas';
+  EnctyptClientData in '..\..\Encrypt\NetClient\EnctyptClientData.pas',
+  ColVisibleManager in '..\..\Units\ColVisibleManager.pas',
+  ReportPrepare in '..\..\Report\ReportPrepare.pas',
+  rdpBillsGatherDm in '..\..\Report\DataPrepare\rdpBillsGatherDm.pas' {rdpBillsGatherData: TDataModule},
+  rdpTables in '..\..\Report\DataPrepare\rdpTables.pas';
 
 {$R *.res}
 

TEMPAT SAMPAH
Dprs/CSL/Measure_Cloud.res


+ 2 - 2
Units/UtilMethods.pas

@@ -1031,8 +1031,8 @@ end;
 
 function RecoverCharsFromJson(AText: string): string;
 const
-  BefStr: array [0..1] of string = ('¡á', '\r\n');
-  AftStr: array [0..1] of string = ('%', '');
+  BefStr: array [0..3] of string = ('¡á', '\r\n', '\r', '\n');
+  AftStr: array [0..3] of string = ('%', '', '', '');
 var I: Integer;
 begin
   AText := Trim(AText);