Jaymr/zszq-trs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

#调整 可取资金计算

Browse Source
This commit is contained in:
xiaqingwen
2024-06-20 15:45:22 +08:00
parent b74695fc17
commit 8f3436246b
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
YLErpWeb/wwwroot/Scripts/app/client/tradeMarketReport.js
+5 -6
View File
@@ -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));
}