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

前端，平仓和收益结算扣除掉已实现分红

Browse Source
This commit is contained in:
锦麟 王
2026-06-25 09:40:44 +08:00
parent f9424d0a6d
commit 3627f12e10
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
YLErpWeb/wwwroot/Scripts/app/swaptrade/incomeSwapTrade.js
+1 -1
View File
@@ -184,7 +184,7 @@ const vue = new Vue({
let totalDividend = parseFloat(thisObj.deal.PositionQty) * resp.obj.totalInterest * ratio * floatRatio;
let consumedDividend = parseFloat(resp.obj.consumedDividend ?? 0);
// 互换是全量消费，consumedDividend>0 表示分红已被当天互换消费，归0
thisObj.floatPosition.DividendIn = Math.abs(consumedDividend) > 0 ? 0 : parseFloat(totalDividend.toFixed(2));
thisObj.floatPosition.DividendIn = Math.abs(consumedDividend) > 0 ? parseFloat((totalDividend - consumedDividend).toFixed(2)) : parseFloat(totalDividend.toFixed(2));
thisObj.floatPosition.DividendPending = 0;
thisObj.calcFloatClosePnl();
thisObj.dataFormat();
YLErpWeb/wwwroot/Scripts/app/swaptrade/unwindSwapTrade.js
+1 -1
View File
@@ -283,7 +283,7 @@ const vue = new Vue({
let totalDividend = parseFloat(thisObj.deal.CloseQty) * resp.obj.totalInterest * ratio * floatRatio;
let consumedDividend = parseFloat(resp.obj.consumedDividend ?? 0);
// 互换是全量消费，consumedDividend>0 表示分红已被当天互换消费，归0
thisObj.floatPosition.DividendIn = Math.abs(consumedDividend) > 0 ? 0 : parseFloat(totalDividend.toFixed(2));
thisObj.floatPosition.DividendIn = Math.abs(consumedDividend) > 0 ? parseFloat((totalDividend - consumedDividend).toFixed(2)) : parseFloat(totalDividend.toFixed(2));
var posiQty = parseFloat(thisObj.floatPosition.Quantity) - parseFloat(thisObj.deal.CloseQty);
thisObj.floatPosition.DividendPending = parseFloat((posiQty * resp.obj.totalInterest * ratio * floatRatio).toFixed(2));
thisObj.calcFloatClosePnl();