diff --git a/YLErpWeb/wwwroot/Scripts/app/swaptrade/incomeSwapTrade.js b/YLErpWeb/wwwroot/Scripts/app/swaptrade/incomeSwapTrade.js index eea6de93..9cdd68fa 100644 --- a/YLErpWeb/wwwroot/Scripts/app/swaptrade/incomeSwapTrade.js +++ b/YLErpWeb/wwwroot/Scripts/app/swaptrade/incomeSwapTrade.js @@ -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(); diff --git a/YLErpWeb/wwwroot/Scripts/app/swaptrade/unwindSwapTrade.js b/YLErpWeb/wwwroot/Scripts/app/swaptrade/unwindSwapTrade.js index 7539f08b..21243e1b 100644 --- a/YLErpWeb/wwwroot/Scripts/app/swaptrade/unwindSwapTrade.js +++ b/YLErpWeb/wwwroot/Scripts/app/swaptrade/unwindSwapTrade.js @@ -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();