From af364b5c8a22f63c33b5ece510af662007dd1a9a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E5=90=8D=E9=94=90?= <1565842059@qq.com>
Date: Tue, 28 Jul 2026 14:50:01 +0800
Subject: [PATCH] =?UTF-8?q?Revert=20"fix(swaptrade):=20=E4=BA=92=E6=8D=A2?=
 =?UTF-8?q?=E5=BC=80=E5=B9=B3=E4=BB=93=E4=BA=8B=E4=BB=B6=E6=B5=81=E6=B0=B4?=
 =?UTF-8?q?=20=E5=B0=8F=E6=95=B0=E7=82=B9=E7=B2=BE=E5=BA=A6=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit bf6b27ba19e498cf338f0fc646b7e3af322f7c8a.
---
 .../Modules/SwapModule/SwapFlowService.cs     | 16 +++----
 YLErpWeb/Views/SwapTrade2/EventList.cshtml    |  4 +-
 .../Scripts/app/swaptrade/eventlist.js        | 44 +++++++------------
 3 files changed, 26 insertions(+), 38 deletions(-)

diff --git a/YLErpDAL/Modules/SwapModule/SwapFlowService.cs b/YLErpDAL/Modules/SwapModule/SwapFlowService.cs
index 30a40623..430a5e53 100644
--- a/YLErpDAL/Modules/SwapModule/SwapFlowService.cs
+++ b/YLErpDAL/Modules/SwapModule/SwapFlowService.cs
@@ -372,16 +372,16 @@ namespace YLErp.Modules.SwapModule
                 exportModel.PositionType = item.PositionType==1?"多头":"空头";
                 exportModel.UnderlyingCode = item.UnderlyingCode;
                 exportModel.MatuirityDate = item.MatuirityDate.OtcFormatDate();
-                exportModel.TradingAmountAvg = item.TradingAmountAvg.OtcFormatMoney(grouping: false);
-                exportModel.TradingAmountFeeAvg = item.TradingAmountFeeAvg.OtcFormatMoney(grouping: false);
+                exportModel.TradingAmountAvg = item.TradingAmountAvg.OtcFormat(OtcFormatFlag.umprice);
+                exportModel.TradingAmountFeeAvg = item.TradingAmountFeeAvg.OtcFormat(OtcFormatFlag.umprice);
                 exportModel.Quantity = item.Quantity.OtcFormatMoney(false, 4);
-                exportModel.TradingAmount = item.TradingAmount.OtcFormatMoney(false, 2);
+                exportModel.TradingAmount = item.TradingAmount.OtcFormatMoney(false, 4);
                 exportModel.ContractSize = item.ContractSize.ToString();
-                exportModel.TradingFee = item.TradingFee.OtcFormatMoney(false, 2);
-                exportModel.TradingFeePending = item.TradingFeePending.OtcFormatMoney(false, 2);
-                exportModel.DividendPending = item.DividendPending.OtcFormatMoney(false, 2);
-                exportModel.MarkClosePnl = item.MarkClosePnl.OtcFormatMoney(false, 2);
-                exportModel.DividendIn = item.DividendIn.OtcFormatMoney(false, 2);
+                exportModel.TradingFee = item.TradingFee.OtcFormatMoney(false, 4);
+                exportModel.TradingFeePending = item.TradingFeePending.OtcFormatMoney(false, 4);
+                exportModel.DividendPending = item.DividendPending.OtcFormatMoney(false, 4);
+                exportModel.MarkClosePnl = item.MarkClosePnl.OtcFormatMoney(false, 4);
+                exportModel.DividendIn = item.DividendIn.OtcFormatMoney(false, 4);
                 exportModel.OptLog = item.OptLog;
                 exportModel.InitYtm = item.InitYtm;
                 list.Add(exportModel);
diff --git a/YLErpWeb/Views/SwapTrade2/EventList.cshtml b/YLErpWeb/Views/SwapTrade2/EventList.cshtml
index c3905e38..cfbe53fc 100644
--- a/YLErpWeb/Views/SwapTrade2/EventList.cshtml
+++ b/YLErpWeb/Views/SwapTrade2/EventList.cshtml
@@ -12,7 +12,7 @@
     </script>
     <script src="~/front/calendar?v=@(HtmlUtil.JsVersion)"></script>
     <script src="~/Scripts/app/tradeHelper.js?v=@HtmlUtil.JsVersion"></script>
-    <script src="~/Scripts/app/swaptrade/eventlist.js?v=@HtmlUtil.JsVersion&eventPriceFormatV=2"></script>
+    <script src="~/Scripts/app/swaptrade/eventlist.js?v=@HtmlUtil.JsVersion"></script>
 }
 <div id="eventVue">
     <div class="searchdiv">
@@ -28,4 +28,4 @@
 </div>
 <form target="_blank" method="post" id="exportForm" action="">
     <input type="hidden" name="" value="" />
-</form>
+</form>
\ No newline at end of file
diff --git a/YLErpWeb/wwwroot/Scripts/app/swaptrade/eventlist.js b/YLErpWeb/wwwroot/Scripts/app/swaptrade/eventlist.js
index c8c32767..e9f8f6b7 100644
--- a/YLErpWeb/wwwroot/Scripts/app/swaptrade/eventlist.js
+++ b/YLErpWeb/wwwroot/Scripts/app/swaptrade/eventlist.js
@@ -176,31 +176,36 @@ var getColModelGrid = function () {
             label: '成交全价',
             width: 90,
             align: 'center',
-            formatter: EventTwoDecimalFormat
+            formatter: otcformat.trading.umprice
         }, {
             name: 'TradingAmountFeeAvg',
             label: '成交全价(含费)',
             width: 90,
             align: 'center',
-            formatter: EventTwoDecimalFormat
+            formatter: otcformat.trading.umprice
         }, {
             name: 'TradingAmountNetAvg',
             label: '成交净价',
             width: 90,
             align: 'center',
-            formatter: EventTwoDecimalFormat
+            formatter: otcformat.trading.umprice
         }, {
             name: 'InitYtm',
             label: '成交收益率',
             width: 90,
             align: 'center',
-            formatter: EventNineDecimalFormat
+            formatter: function (cellValue, options, rowObject) {
+                if (cellValue == null) {
+                    return "";
+                }
+                return otcformat.trading.premiumRateP(cellValue);
+            }
         }, {
             name: 'TradingAmountNetFeeAvg',
             label: '成交净价(含费)',
             width: 90,
             align: 'center',
-            formatter: EventTwoDecimalFormat
+            formatter: otcformat.trading.umprice
         }, {
             name: 'Quantity',
             label: '成交数量/张数',
@@ -212,7 +217,7 @@ var getColModelGrid = function () {
             label: '成交金额(元)',
             width: 90,
             align: 'center',
-            formatter: EventTwoDecimalFormat
+            formatter: otcformat.trading.umprice
         }, {
             name: 'ContractSize',
             label: '乘数',
@@ -225,31 +230,31 @@ var getColModelGrid = function () {
             label: '交易费用佣金',
             width: 90,
             align: 'center',
-            formatter: EventTwoDecimalFormat
+            formatter: otcformat.trading.umprice
         }, {
             name: 'TradingFeePending',
             label: '待结算交易费用佣金',
             width: 90,
             align: 'center',
-            formatter: EventTwoDecimalFormat
+            formatter: otcformat.trading.umprice
         }, {
             name: 'DividendPending',
             label: '待结算分红收益',
             width: 90,
             align: 'center',
-            formatter: EventTwoDecimalFormat
+            formatter: otcformat.trading.umprice
         }, {
             name: 'MarkClosePnl',
             label: '浮动端平仓盈亏·浮动',
             width: 160,
             align: 'center',
-            formatter: EventTwoDecimalFormat
+            formatter: otcformat.trading.umprice
         }, {
             name: 'DividendIn',
             label: '浮动端平仓盈亏·分红',
             width: 160,
             align: 'center',
-            formatter: EventTwoDecimalFormat
+            formatter: otcformat.trading.umprice
         }
     ];
     return col;
@@ -257,23 +262,6 @@ var getColModelGrid = function () {
 
 var colModelGrid = getColModelGrid();
 
-function EventTwoDecimalFormat(cellValue) {
-    if (cellValue === null || cellValue === undefined || cellValue === '') {
-        return '';
-    }
-    var price = Number(cellValue);
-    return isFinite(price) ? price.toFixed(2) : cellValue;
-}
-
-function EventNineDecimalFormat(cellValue) {
-    if (cellValue === null || cellValue === undefined || cellValue === '') {
-        return '';
-    }
-    var price = Number(cellValue);  
-    return isFinite(price) ? price.toFixed(9) : cellValue;
-}
-
-
 function gridComplete() {
     $('.ui-jqgrid-bdiv', '#gbox_listGrid').floatingScroll();
 }