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 d0673c4a..8d8eb835 100644 Binary files a/YLErpWeb/App_Docs/导出模板/结算报告模板.xlsx and b/YLErpWeb/App_Docs/导出模板/结算报告模板.xlsx differ 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,