From ee3321bc3667720698bfa98fdcc9a8ff0332f379 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=90=B4=E6=96=B9=E6=B5=B7?= Date: Fri, 30 May 2025 17:48:36 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SwapModule/SwapFlowEventService.cs | 2 +- YLErpWeb/App_Docs/导出模板/结算报告模板.xlsx | Bin 18065 -> 18085 bytes .../TradeMarketReport_EodPosition.js | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/YLErpDAL/Modules/SwapModule/SwapFlowEventService.cs b/YLErpDAL/Modules/SwapModule/SwapFlowEventService.cs index dbc00b68..b68d59e3 100644 --- a/YLErpDAL/Modules/SwapModule/SwapFlowEventService.cs +++ b/YLErpDAL/Modules/SwapModule/SwapFlowEventService.cs @@ -492,7 +492,7 @@ namespace YLErp.Modules.SwapModule }; if (string.IsNullOrEmpty(req.sidx)) { - req.sidx = "SwapTradeNo,FlowEvent.id"; + req.sidx = "FlowEvent.EventDate,SwapTradeNo"; req.sord = "asc"; } var retListResult = query.ToSearchList(req); diff --git a/YLErpWeb/App_Docs/导出模板/结算报告模板.xlsx b/YLErpWeb/App_Docs/导出模板/结算报告模板.xlsx index d0673c4ac112726b8d33e0dabc3c40dc0e74c67c..8d8eb83521c794aede9fcf7071d9bcfa4d430e0c 100644 GIT binary patch delta 9074 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 delta 9044 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 W$|X@yN*KyN(L?GJ{E7I#i2n!o)-@>r diff --git a/YLErpWeb/wwwroot/Scripts/app/swaptrade/TradeMarketReport_EodPosition.js b/YLErpWeb/wwwroot/Scripts/app/swaptrade/TradeMarketReport_EodPosition.js index df4a8579..9d9142df 100644 --- a/YLErpWeb/wwwroot/Scripts/app/swaptrade/TradeMarketReport_EodPosition.js +++ b/YLErpWeb/wwwroot/Scripts/app/swaptrade/TradeMarketReport_EodPosition.js @@ -163,7 +163,7 @@ var colModelGrid = [ sortable: false }, { name: 'ConfrimNo', - label: '合约编号', + label: '确认书编号', index: 'ConfrimNo', sortIndex: i++, width: 180,