diff --git a/Framework/YLErp.Core/ConsGlobal.cs b/Framework/YLErp.Core/ConsGlobal.cs index dc91f9a4..22ca70d5 100644 --- a/Framework/YLErp.Core/ConsGlobal.cs +++ b/Framework/YLErp.Core/ConsGlobal.cs @@ -46,6 +46,10 @@ namespace YLErp /// public const decimal bondShowPriceMultiple = 100m; + /// + /// 限额监控系数 + /// + public const double quotaMonitorMultiple = 0.0001; /// /// 互换结算岗组 /// diff --git a/YLErpDAL/Modules/RiskModule/QuotaMonitorService.cs b/YLErpDAL/Modules/RiskModule/QuotaMonitorService.cs index 2b58766e..8c7d3314 100644 --- a/YLErpDAL/Modules/RiskModule/QuotaMonitorService.cs +++ b/YLErpDAL/Modules/RiskModule/QuotaMonitorService.cs @@ -3562,6 +3562,10 @@ namespace YLErp.Modules.RiskModule { count = 4; } + if (O.QuotaIndex.Contains("名义本金")) + { + O.QuotaLowerLimit *= ConsGlobal.quotaMonitorMultiple; + } O.QuotaLowerLimit = O.QuotaLowerLimit.FormatValue(count); O.QuotaUpperLimit = O.QuotaUpperLimit.FormatValue(count); O.WarningLowerLimit = O.WarningLowerLimit.FormatValue(count); diff --git a/YLErpWeb/wwwroot/Scripts/app/risk/quotaSetting.js b/YLErpWeb/wwwroot/Scripts/app/risk/quotaSetting.js index 78ee2b95..d0ad962e 100644 --- a/YLErpWeb/wwwroot/Scripts/app/risk/quotaSetting.js +++ b/YLErpWeb/wwwroot/Scripts/app/risk/quotaSetting.js @@ -3,6 +3,7 @@ var g_grid = {}; var quotaSettings = {}; var underlyingId = 0; var disabledQuotaIndexs = ["止损金额", "Delta金额", "浮动盈亏"]; +var quotaMonitorMultiple = 10000; $(function () { FastVue.numberInput(document.getElementById('QuotaRange-PercentDays'), { precision: 0 }); var postData = GetPostData(); @@ -40,6 +41,9 @@ $(function () { $("#SingleUnderlyingRate").val(res.SingleUnderlyingRate); quotaSettings = res.QuotaSettings; _.forEach(quotaSettings, (item) => { + if (item.QuotaIndex.indexOf("名义本金") != -1) { + item.QuotaIndex = item.QuotaIndex + "(万)"; + } if (item.Percent) { item.QuotaUpperLimit = item.QuotaUpperLimit == null || item.QuotaUpperLimit == undefined || item.QuotaUpperLimit == "NaN" || item.QuotaUpperLimit === "" ? "" : (Number.parseFloat(item.QuotaUpperLimit) * 100).toFixed(2); item.QuotaLowerLimit = item.QuotaLowerLimit == null || item.QuotaLowerLimit == undefined || item.QuotaLowerLimit == "NaN" || item.QuotaLowerLimit === "" ? "" : (Number.parseFloat(item.QuotaLowerLimit) * 100).toFixed(2); @@ -255,6 +259,13 @@ function save() { item.QuotaLowerLimit = $("#" + v + "_QuotaLowerLimit").val() === "" ? "NaN" : removeThousands($("#" + v + "_QuotaLowerLimit").val()); item.WarningUpperLimit = $("#" + v + "_WarningUpperLimit").val() === "" ? "NaN" : removeThousands($("#" + v + "_WarningUpperLimit").val()); item.WarningLowerLimit = $("#" + v + "_WarningLowerLimit").val() === "" ? "NaN" : removeThousands($("#" + v + "_WarningLowerLimit").val()); + if (item.QuotaIndex.indexOf("名义本金") != -1) { + item.QuotaIndex = item.QuotaIndex.replace("(万)", ""); + item.QuotaUpperLimit = item.QuotaUpperLimi == "NaN" ?"NaN": item.QuotaUpperLimit * quotaMonitorMultiple; + item.QuotaLowerLimit = item.QuotaLowerLimit == "NaN" ? "NaN" : item.QuotaLowerLimit * quotaMonitorMultiple; + item.WarningUpperLimit = item.WarningUpperLimit == "NaN" ? "NaN" : item.WarningUpperLimit * quotaMonitorMultiple; + item.WarningLowerLimit = item.WarningLowerLimit == "NaN" ? "NaN" : item.WarningLowerLimit * quotaMonitorMultiple; + } } arr.push(item); })