diff --git a/YLErpDAL/Modules/SwapModule/SwapEodPositionService.cs b/YLErpDAL/Modules/SwapModule/SwapEodPositionService.cs index 454b5a5c..e5334b3d 100644 --- a/YLErpDAL/Modules/SwapModule/SwapEodPositionService.cs +++ b/YLErpDAL/Modules/SwapModule/SwapEodPositionService.cs @@ -599,7 +599,7 @@ namespace YLErp.Modules.SwapModule PositionQty = eodPosi.PosiQuantity, Quantity = 0, ContractSize = eodPosi.ContractSize, - TradingAmountAvg = eodPosi.PosiNetPrice, + TradingAmountAvg = eodPosi.PosiGrossPrice, TradingAmountNetAvg = eodPosi.PosiNetNoFeePrice, PosiGrossPrice = eodPosi.PosiGrossPrice, PosiNetPrice = eodPosi.PosiNetPrice, diff --git a/YLErpWeb/Views/SwapTrade2/TradeView.cshtml b/YLErpWeb/Views/SwapTrade2/TradeView.cshtml index 979dfd6c..310b7897 100644 --- a/YLErpWeb/Views/SwapTrade2/TradeView.cshtml +++ b/YLErpWeb/Views/SwapTrade2/TradeView.cshtml @@ -71,18 +71,21 @@ 提前终止 } + @if (swap_deals.Count > 0) { } + @if (trade.ClientCashInCashOutList.Count > 0) { } +
@@ -820,6 +823,7 @@ }
} + @if (!singleTrade && closeSwapDeals.Count > 0) { var index = 1; @@ -849,6 +853,7 @@ } } + @if (swap_deals.Count > 0) { var index = 1; @@ -919,6 +924,7 @@ } + @if (swapInterests.Count > 0) {
@@ -1014,6 +1020,7 @@ }
} + @if (trade.ClientCashInCashOutList.Count > 0) {
@@ -1048,6 +1055,7 @@
} +