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

BugFix 计算中都使用GrossPrice

Browse Source
This commit is contained in:
锦麟 王
2026-07-02 20:46:58 +08:00
parent bfb69c2eae
commit de0e7f791b
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
YLErpWeb/wwwroot/Scripts/app/swaptrade/incomeSwapTrade.js
+6 -3
View File
@@ -17,7 +17,8 @@ const vue = new Vue({
interestList: [],
marginList: [],
multiplier: 1,
initPosiNetPrice: 0
initPosiNetPrice: 0,
initPosiGrossPrice:0
},
computed: {
maxUnwindDate() {
@@ -42,9 +43,10 @@ const vue = new Vue({
});
this.floatPosition = positions[0];
this.initPosiNetPrice = this.floatPosition.PosiNetPrice;
this.initPosiGrossPrice = this.floatPosition.PosiGrossPrice;
// 互换标的价格固定为期初净价，与平仓不同不需要用户填写
// 期初净价入库为相对价(如1.02)，需转换为界面百分比形态(102)，与平仓页保持一致
this.floatPosition.TradingAmountAvg = this.initPosiNetPrice * this.multiplier;
this.floatPosition.TradingAmountAvg = this.initPosiGrossPrice * this.multiplier;
this.interestList = model.FlowEvents.filter((item) => {
return item.InterestMode == 1 || item.InterestMode == 2 || item.InterestMode == 7 || item.InterestMode == 8 || item.InterestMode == 9;
});
@@ -130,7 +132,8 @@ const vue = new Vue({
let TradingFeePending = thisObj.floatPosition.TradingFeePending == "" ? 0 : parseFloat(thisObj.floatPosition.TradingFeePending);
let DividendIn = thisObj.floatPosition.DividendIn == "" ? 0 : parseFloat(thisObj.floatPosition.DividendIn ?? 0);
let scale = thisObj.getPriceScale();
thisObj.floatPosition.MarkClosePnl = thisObj.deal.CloseNotionalValue * (thisObj.floatPosition.TradingAmountAvg * scale - thisObj.initPosiNetPrice) * floatRatio;
//thisObj.floatPosition.MarkClosePnl = thisObj.deal.CloseNotionalValue * (thisObj.floatPosition.TradingAmountAvg * scale - thisObj.initPosiNetPrice) * floatRatio;
thisObj.floatPosition.MarkClosePnl = thisObj.deal.CloseNotionalValue * (thisObj.floatPosition.TradingAmountAvg * scale - thisObj.initPosiGrossPrice) * floatRatio;
thisObj.floatPosition.MarkClosePnl = otcformat.trading.StockEqvNotional(thisObj.floatPosition.MarkClosePnl);//MarkClosePnl 纯盯市不要计算交易费用和分红
thisObj.floatPosition.FloatPnlSum = (parseFloat(thisObj.floatPosition.MarkClosePnl) + TradingFee + TradingFeePending + DividendIn).toFixed(2);
thisObj.calcCloseAmount();