From 8f3436246b59cc69b6ee0c805b4b1de7be845cb2 Mon Sep 17 00:00:00 2001 From: xiaqingwen Date: Thu, 20 Jun 2024 15:44:59 +0800 Subject: [PATCH] =?UTF-8?q?#=E8=B0=83=E6=95=B4=20=E5=8F=AF=E5=8F=96?= =?UTF-8?q?=E8=B5=84=E9=87=91=E8=AE=A1=E7=AE=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wwwroot/Scripts/app/client/tradeMarketReport.js | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/YLErpWeb/wwwroot/Scripts/app/client/tradeMarketReport.js b/YLErpWeb/wwwroot/Scripts/app/client/tradeMarketReport.js index c3f600e0..db1699ad 100644 --- a/YLErpWeb/wwwroot/Scripts/app/client/tradeMarketReport.js +++ b/YLErpWeb/wwwroot/Scripts/app/client/tradeMarketReport.js @@ -305,10 +305,10 @@ function SearchClientBalance() { $("#CashInCashOutChange").text(numFormart(data.NetFund)); $("#CashInChange").text(numFormart(data.InFund)); $("#CashOutChange").text(numFormart(data.OutFund)); - $("#OptionPremium").text(numFormart(data.OptionPremium)); + $("#OptionPremium").text(numFormart(data.OptionPremium));//成交支出 $("#OptionPremiumSwap").text(numFormart(data.OptionPremiumSwap)); $("#OtherFund").text(numFormart(data.OtherFund)); - $("#SettlementBalance").text(numFormart(data.SettlementBalance)); + $("#SettlementBalance").text(numFormart(data.SettlementBalance));//了解支出 $("#Coupon").text(numFormart(data.Coupon)); $("#SwapBalance").text(numFormart(data.SwapBalance)); $("#OptionPremiumAndUnwindBalance").text(numFormart(data.OptionPremiumAndUnwindBalanceTotal)); @@ -387,13 +387,12 @@ function SearchClientBalance() { if (ylotc.Company == '浙商') { //保证金占用- 浙商 经过沟通，取值沿用-预付金占用 $("#NoccupyMargin").text(numFormart(data.MinusPayableMarginTotal)); - //期末结存 = 期初结存+出金入金+已实现盈亏+其他收支 - data.AmountFund = data.LastDayRemainFund + data.NetFund + data.WinLoss + data.OtherFund; + //期末结存 = 期初结存+出金入金+已实现盈亏+其他收支 （经过产品沟通，取原理的期末结存值，描述不变更) $("#ToDayRemainFund").text(numFormart(data.AmountFund)); //可用资金=期末结存-保证金占用； $("#AvailableFund").text(numFormart(data.AmountFund - data.MinusPayableMarginTotal)); - //可取资金 = 期末结存 - 持仓亏损 - 保证金占用； - $("#Margin").text(numFormart(data.AmountFund - data.WinLoss - data.MinusPayableMarginTotal)); + //可取资金 = 期末结存 - 持仓亏损 - 保证金占用； 产品沟通调整：可取资金=期末结存-保证金占用+ Min（0，持仓盈亏） + $("#Margin").text(numFormart(data.AmountFund - data.MinusPayableMarginTotal + Math.min(0, isPvRounded ? data.RoundedPositionPnl : data.PositionPnl))); //总资产=期末结存+持仓市值 ； $("#Amount").text(numFormart(isPvRounded ? data.RoundedPositionPv + data.AmountFund : data.PositionPv + data.AmountFund)); }