Merge remote-tracking branch 'origin/glms/feature/1.4.2' into glms/feature/1.4.2

YLErpWeb/wwwroot/Scripts/app/client/tradeMarketReport.js

@@ -1,4 +1,4 @@
-var g_grid = {};
+var g_grid = {};
 $(function () {
     var PostData = {};
     var calcDate = page.ValueDate;
@@ -291,7 +291,8 @@ function SearchClientBalance() {
     main.post("/trade_span/GetClientLatestBalance", { clientId: $("#ClientId").val(), ValueDateFrom: param.ValueDateStart, ValueDateTo: param.ValueDateEnd, IsClientBalanceGap: param.IsClientBalanceGap, IsGetOuterMarginGap: param.IsGetOuterMarginGap, ParentFlag: param.ParentFlag }).done(function (data) {
         $("#LastDayRemainFund").text(numFormart(data.LastDayRemainFund));
         //R2 阶段三 §3.2 口径（BUG-07 修正，与邮件/Excel 报告 SettlementReportService 同源）：
-        //初始保证金=SwapInitMargin（应付预付金净额）、维持保证金=−MySideMargin（client_span 维持保证金反号聚合）
+        //初始保证金=SwapInitMargin（应付预付金净额+初始预付金授信占用净额）、维持保证金=−MySideMargin（client_span 维持保证金反号聚合）、
+        //授信额度=OriginalTotalCredit（原始授信值，未经最大可用比例折算；公式计算仍用折算后 TotalCredit）
         $("#SwapInitMargin").text(numFormart(data.SwapInitMargin));
         $("#WinLoss").text(numFormart(data.WinLoss));
         $("#CashInCashOutChange").text(numFormart(data.NetFundAll));
@@ -305,7 +306,7 @@ function SearchClientBalance() {
         $("#MarginByPayableMargin").text(numFormart(data.MarginByPayableMarginTotal));
         $("#ToDayRemainFund").text(numFormart(data.AmountFund));
         $("#DesirableFund").text(numFormart(data.DesirableFundTotal));
-        $("#TotalCredit").text(numFormart(data.TotalCredit));
+        $("#TotalCredit").text(numFormart(data.OriginalTotalCredit));
         $("#UsedCredit").text(numFormart(data.UsedCredit));
     });