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