diff --git a/YLErpDAL/Modules/SwapModule/SwapDealService.cs b/YLErpDAL/Modules/SwapModule/SwapDealService.cs
index afd9aa15..10a1af7d 100644
--- a/YLErpDAL/Modules/SwapModule/SwapDealService.cs
+++ b/YLErpDAL/Modules/SwapModule/SwapDealService.cs
@@ -276,6 +276,7 @@ namespace YLErp.Modules.SwapModule
floatEvent.PayDirection = position.PosiDirection;
floatEvent.PosiGrossPrice = position.PosiGrossPrice;
floatEvent.PosiNetPrice = position.PosiNetPrice;
+ // 注意:TradingAmountNetAvg 字段名为"成交净价(期末语义)",但收益结算/平仓初始化时装入的是期初净价(PosiNetNoFeePrice),前端展示期初净价时取此字段
floatEvent.TradingAmountNetAvg = position.PosiNetNoFeePrice;
floatEvent.TradingAmountNetFeeAvg = position.PosiNetFeePrice;
floatEvent.PositionType = position.PositionType;
diff --git a/YLErpWeb/Views/SwapTrade2/SwapIncome.cshtml b/YLErpWeb/Views/SwapTrade2/SwapIncome.cshtml
index d86d8631..ca19bcc7 100644
--- a/YLErpWeb/Views/SwapTrade2/SwapIncome.cshtml
+++ b/YLErpWeb/Views/SwapTrade2/SwapIncome.cshtml
@@ -152,9 +152,13 @@
{{floatPosition.UnderlyingCode}}
{{priceFormat(floatPosition.PosiGrossPrice)}} |
- {{priceFormat(floatPosition.TradingAmountNetAvg)}} |
+
+ {{priceFormat(floatPosition.TradingAmountNetAvg > 0 ? floatPosition.TradingAmountNetAvg : floatPosition.PosiNetPrice)}} |
- {{floatPosition.TradingAmountAvg}}
+
+
+
+
|
{{floatPosition.Quantity}} |
diff --git a/YLErpWeb/wwwroot/Scripts/app/swaptrade/incomeSwapTrade.js b/YLErpWeb/wwwroot/Scripts/app/swaptrade/incomeSwapTrade.js
index 2293b45b..311f90ef 100644
--- a/YLErpWeb/wwwroot/Scripts/app/swaptrade/incomeSwapTrade.js
+++ b/YLErpWeb/wwwroot/Scripts/app/swaptrade/incomeSwapTrade.js
@@ -97,11 +97,23 @@ const vue = new Vue({
}
if (!isUseApproval) {
this.getInterestList();
- //this.refreshUnderlyingPrice();
} else {
this.dataFormat();
}
},
+ changeUnderlyingPrice() {//修改标的价格
+ this.calcFloatClosePnl();
+ },
+ refreshUnderlyingPrice() {//刷新标的价格
+ var thisObj = this;
+ main.post("/underlying_manager/GetUnderlyingPriceByCode",
+ { code: thisObj.floatPosition.UnderlyingCode, valuedate: thisObj.deal.ValueDate })
+ .done(function (res) {
+ res.obj = res.obj * thisObj.multiplier;
+ thisObj.floatPosition.TradingAmountAvg = otcformat.trading.tradeSinglePrice(res.obj);
+ thisObj.calcFloatClosePnl();
+ });
+ },
changeTradingFee() {//修改交易费用
this.calcFloatClosePnl();
},
|