diff --git a/Plugins/YLErp.Plugins.ZheShang/App_Docs/结算单/非DMA结算单.xlsx b/Plugins/YLErp.Plugins.ZheShang/App_Docs/结算单/非DMA结算单.xlsx index 38aea405..33ff999d 100644 Binary files a/Plugins/YLErp.Plugins.ZheShang/App_Docs/结算单/非DMA结算单.xlsx and b/Plugins/YLErp.Plugins.ZheShang/App_Docs/结算单/非DMA结算单.xlsx differ diff --git a/YLErpDAL/Modules/SwapModule/SwapConsumerService.cs b/YLErpDAL/Modules/SwapModule/SwapConsumerService.cs index 7abd70fb..24a8e6fd 100644 --- a/YLErpDAL/Modules/SwapModule/SwapConsumerService.cs +++ b/YLErpDAL/Modules/SwapModule/SwapConsumerService.cs @@ -37,11 +37,7 @@ namespace YLErp.Modules.SwapModule { _kafkaConsumer.Subscribe(msg => { - var hedgingSource = OtcAppConfigHelper.HedgingSource==1|| OtcAppConfigHelper.HedgingSource==0; - if (hedgingSource) - { - return; - } + LogFactory.GetLogger("SwapConsumerService").Info("TRS对冲交易回执接口:"+ msg); if (!string.IsNullOrEmpty(msg)) { var result = JsonHelper.Deserialize(msg); diff --git a/YLErpWeb/Views/risk/quotaMonitor.cshtml b/YLErpWeb/Views/risk/quotaMonitor.cshtml index 52496164..cf0e805b 100644 --- a/YLErpWeb/Views/risk/quotaMonitor.cshtml +++ b/YLErpWeb/Views/risk/quotaMonitor.cshtml @@ -209,20 +209,6 @@
-
diff --git a/YLErpWeb/wwwroot/Scripts/app/risk/quotaMonitor.js b/YLErpWeb/wwwroot/Scripts/app/risk/quotaMonitor.js index 3beb5396..94259ded 100644 --- a/YLErpWeb/wwwroot/Scripts/app/risk/quotaMonitor.js +++ b/YLErpWeb/wwwroot/Scripts/app/risk/quotaMonitor.js @@ -274,10 +274,10 @@ function gridComplete(obj) { $("#SingleUnderlyingRate").val(obj.Sum.SingleUnderlyingRate); } $(window).off('resize.jqGrid'); - $(window).on('resize.jqGrid', function () { - $("#listGrid").jqGrid('setGridWidth', $('#riskContent').width() - 2); - }); - $("#listGrid").jqGrid('setGridWidth', $('#riskContent').width() - 2); + //$(window).on('resize.jqGrid', function () { + // $("#listGrid").jqGrid('setGridWidth', $('#riskContent').width() - 2); + //}); + //$("#listGrid").jqGrid('setGridWidth', $('#riskContent').width() - 2); var jgrid = jQuery('#listGrid'); var tag = $("#myTab .active a").attr("tag"); main.setcolumnChooser(jgrid, key + tag);