From 466683b1025e04dcdfa2ab10fc6a67fd35cbfccf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AC=B4=E6=94=BF=20=E6=97=B6?= Date: Thu, 30 Apr 2026 10:34:18 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BA=A4=E6=98=93=E5=AE=A1=E6=89=B9=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E6=9C=9F=E5=88=9D=E4=BB=B7=E6=A0=BC=E5=B1=95=E7=A4=BA?= =?UTF-8?q?=E7=99=BE=E5=88=86=E6=AF=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Scripts/app/trade/tradeApproval.js | 43 +++++++++++-------- 1 file changed, 24 insertions(+), 19 deletions(-) diff --git a/YLErpWeb/wwwroot/Scripts/app/trade/tradeApproval.js b/YLErpWeb/wwwroot/Scripts/app/trade/tradeApproval.js index 868eb6e7..4dfc4855 100644 --- a/YLErpWeb/wwwroot/Scripts/app/trade/tradeApproval.js +++ b/YLErpWeb/wwwroot/Scripts/app/trade/tradeApproval.js @@ -166,7 +166,12 @@ var colModelGrid = [ width: 85, align: 'center', sortable: false, - formatter: otcformat.trading.umprice + formatter: function (cellvalue, options, rowObject) { + if (rowObject.TradeType === "收益互换") { + return otcformat.trading.umprice(cellvalue) * 100 + "%"; + } + return otcformat.trading.umprice(cellvalue); + } }, { name: 'ExerciseMode', label: '行权方式', @@ -419,7 +424,7 @@ function showToolName(cellValue, options, rowObject) { .template(rowObject.id, "审批"); } } - + } else { html = @@ -427,12 +432,12 @@ function showToolName(cellValue, options, rowObject) { .template(rowObject.EncryptId, rowObject.TradeType); if (rowObject.TradeType === "结构化交易" && rowObject.IsGroup == 1) { html = html + "" - .template(rowObject.id, "平仓复核"); + .template(rowObject.id, "平仓复核"); } else { html = html + "" .template(rowObject.EncryptId, rowObject.TradeType, "平仓复核", rowObject.StructureType); } - + } } //没有审批流程(包括审批参数配置为false或者没有审批流程即审批角色id为空)，该用户有该角色权限 @@ -483,7 +488,7 @@ function showToolName(cellValue, options, rowObject) { if (page.IsTradeCheckInfo) { html = html + "" - .template(rowObject.EncryptId, rowObject.TradeType, rowObject.TradeStatus, rowObject.IsGroup, "审批", rowObject.StructureType); + .template(rowObject.EncryptId, rowObject.TradeType, rowObject.TradeStatus, rowObject.IsGroup, "审批", rowObject.StructureType); } else { html = html + @@ -491,7 +496,7 @@ function showToolName(cellValue, options, rowObject) { .template(rowObject.id, "审批"); } } - + } //无审批权限 else { @@ -521,7 +526,7 @@ function showToolName(cellValue, options, rowObject) { if (page.IsTradeCheckInfo) { html = html + "" - .template(rowObject.EncryptId, rowObject.TradeType, rowObject.TradeStatus, rowObject.IsGroup, "审批", rowObject.StructureType); + .template(rowObject.EncryptId, rowObject.TradeType, rowObject.TradeStatus, rowObject.IsGroup, "审批", rowObject.StructureType); } else { html = html + @@ -529,7 +534,7 @@ function showToolName(cellValue, options, rowObject) { .template(rowObject.id, "审批"); } } - + } else { html = @@ -542,7 +547,7 @@ function showToolName(cellValue, options, rowObject) { html = html + "" .template(rowObject.EncryptId, "行权复核"); } - + } } //没有审批流程(包括审批config为false或者没有审批流程即审批角色id为空)，该用户有该角色权限 @@ -557,7 +562,7 @@ function showToolName(cellValue, options, rowObject) { html = html + "" .template(rowObject.EncryptId, "行权复核"); } - + } //没有审批权限 else { @@ -593,7 +598,7 @@ function showToolName(cellValue, options, rowObject) { if (page.IsTradeCheckInfo) { html = html + "" - .template(rowObject.EncryptId, rowObject.TradeType, rowObject.TradeStatus, rowObject.IsGroup, "审批", rowObject.StructureType); + .template(rowObject.EncryptId, rowObject.TradeType, rowObject.TradeStatus, rowObject.IsGroup, "审批", rowObject.StructureType); } else { html = html + @@ -601,7 +606,7 @@ function showToolName(cellValue, options, rowObject) { .template(rowObject.id, "审批"); } } - + } //无审批权限 else { @@ -632,7 +637,7 @@ function showToolName(cellValue, options, rowObject) { if (page.IsTradeCheckInfo) { html = html + "" - .template((rowObject.IsGroup == 1 ? rowObject.id : rowObject.EncryptId), rowObject.TradeType, rowObject.TradeStatus, rowObject.IsGroup, "审批", rowObject.StructureType); + .template((rowObject.IsGroup == 1 ? rowObject.id : rowObject.EncryptId), rowObject.TradeType, rowObject.TradeStatus, rowObject.IsGroup, "审批", rowObject.StructureType); } else { html = html + @@ -655,7 +660,7 @@ function showToolName(cellValue, options, rowObject) { html = html + "" .template(rowObject.id, "复核审批"); - + } } else { @@ -674,7 +679,7 @@ function showToolName(cellValue, options, rowObject) { if (page.IsTradeCheckInfo) { html = html + "" - .template(rowObject.EncryptId, rowObject.TradeType, rowObject.TradeStatus, rowObject.IsGroup, "审批", rowObject.StructureType); + .template(rowObject.EncryptId, rowObject.TradeType, rowObject.TradeStatus, rowObject.IsGroup, "审批", rowObject.StructureType); } else { html = html + @@ -709,7 +714,7 @@ function passorreject(eid) { main.open("审批", url, { area: ['900px', '600px'] }); } -function passorreinfo(eid, tradeType, status, isGroup,StructureType) { +function passorreinfo(eid, tradeType, status, isGroup, StructureType) { var url = ""; var title = "审批"; var height = "900px"; @@ -876,7 +881,7 @@ function unWindSelect(id, tradeType, isReCheck, StructureType) { reloadtrade(); } }); - } else if (tradeType=="收益互换") { + } else if (tradeType == "收益互换") { var url = "/swaptrade2/SwapUnwind/?enid=" + id + "&isUseApproval=" + true;; if (StructureType == "多空组合") { url = "/swaptrade2/SwapLongShortUnwind/?enid=" + id + "&isUseApproval=" + true;; @@ -900,7 +905,7 @@ function unWindSelect(id, tradeType, isReCheck, StructureType) { } } } -function parentUnWindSelect(id,title,reCheck) { +function parentUnWindSelect(id, title, reCheck) { var srcurl = "/trade/tradeSettle/?ids=" + id + "&&reCheck=" + reCheck; main.open(title, srcurl, { area: ["1220px", "100%"], @@ -948,7 +953,7 @@ function starttradeView(id, tradeType) { let srcurl = "/forwardtrade/tradeView/?enid=" + id + "&isOnlyCloseButton=true"; main.open("查看远期交易", srcurl, { area: ['1260px', '800px'] }); } - else if (tradeType=="收益互换") { + else if (tradeType == "收益互换") { main.open("查看交易", "/swaptrade2/tradeView/?enid=" + id + "&isOnlyCloseButton=true", { area: ['90%', '90%'] }); } else {