From 9c4cb65600ada1332ce1f2b1d0512d0ee1b9d75d 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:29:36 +0800
Subject: [PATCH] =?UTF-8?q?Revert=20"fix(risk):=20=E9=A3=8E=E9=99=A9?=
 =?UTF-8?q?=E9=A2=84=E8=AD=A6/=E7=A6=81=E6=AD=A2=E6=9F=A5=E8=AF=A2=20?=
 =?UTF-8?q?=E5=B0=8F=E6=95=B0=E7=82=B9=E7=B2=BE=E5=BA=A6=E8=B0=83=E6=95=B4?=
 =?UTF-8?q?"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit ae5f10124f2d276169d6766e15a4c92b40cb5f90.
---
 .../Scripts/app/risk/SubstandardTrade.js      | 34 +++++++++----------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/YLErpWeb/wwwroot/Scripts/app/risk/SubstandardTrade.js b/YLErpWeb/wwwroot/Scripts/app/risk/SubstandardTrade.js
index 02f7f83d..c351e43c 100644
--- a/YLErpWeb/wwwroot/Scripts/app/risk/SubstandardTrade.js
+++ b/YLErpWeb/wwwroot/Scripts/app/risk/SubstandardTrade.js
@@ -246,7 +246,7 @@ function getColModelDefault() {
             width: 85,
             align: 'center',
             sortable: false,
-            formatter: EventTwoDecimalFormat
+            formatter: otcformat.trading.umprice
         },
         {
             name: 'TradeType2',
@@ -374,7 +374,7 @@ function getColModelDefault() {
         width: 65,
         align: 'center',
         sortable: false,
-        formatter: EventTwoDecimalFormat
+        formatter: otcformat.trading.umprice
     });
 
     return tradeHelper.getAmountToNotional(colModelGrid);
@@ -388,14 +388,6 @@ function ShowStructFormater(cellValue, options, rowObject) {
     return cellValue || '';
 }
 
-function EventTwoDecimalFormat(cellValue) {
-    if (cellValue === null || cellValue === undefined || cellValue === '') {
-        return '';
-    }
-    var price = Number(cellValue);
-    return isFinite(price) ? price.toFixed(2) : cellValue;
-}
-
 function StrikeFormatter(cellValue, options, rowObject) {
     if (rowObject.TradeType === "自定义交易") {
         return "";
@@ -404,12 +396,20 @@ function StrikeFormatter(cellValue, options, rowObject) {
         return "--";
     }
 
-    if (cellValue === null || cellValue === undefined || cellValue === '' || cellValue === 'NaN') return '';
-    var strike = Number(cellValue);
-    if (!isFinite(strike)) return '';
-    return rowObject.IsMoneynessOption === "是"
-        ? (strike * 100).toFixed(2) + '%'
-        : EventTwoDecimalFormat(strike);
+    if (rowObject.Strike) {
+        if (rowObject.IsMoneynessOption === "是") {
+            return otcformat.trading.premiumRateP(rowObject.Strike);
+        } else {
+            return otcformat.trading.umprice(rowObject.Strike);
+        }
+    } else {
+        if (rowObject.Strike === 0) {
+            return otcformat.trading.umprice(0);
+        }
+        else {
+            return "";
+        }
+    }
 }
 
 function CommissionFormatter(cellValue, options, rowObject) {
@@ -651,4 +651,4 @@ function showcolumnChooser() {
 
 function getColModel() {
     return getColModelDefault();
-}
+}
\ No newline at end of file