From 440be21e24e4cfb15e85ee1cf8522cd7d4acf21b Mon Sep 17 00:00:00 2001
From: lihongji <3117313295@qq.com>
Date: 星期三, 20 十一月 2024 16:36:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
_Main/UI/MacroPlannerWebApp/Component_FormFinancialSalesReport/Response_PanelExport_bRefresh_OnClick.def | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormFinancialSalesReport/Response_PanelExport_bRefresh_OnClick.def b/_Main/UI/MacroPlannerWebApp/Component_FormFinancialSalesReport/Response_PanelExport_bRefresh_OnClick.def
index 0308160..b42d5d3 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormFinancialSalesReport/Response_PanelExport_bRefresh_OnClick.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormFinancialSalesReport/Response_PanelExport_bRefresh_OnClick.def
@@ -14,7 +14,10 @@
Body:
[*
FinancialSalesSource::InitializeNew( MacroPlan );
-
+ excelsource := maxobject( MacroPlan, FinancialSalesSource, excelsource, excelsource.IsImport(), excelsource.UploadDateTime() );
+ if( not isnull( excelsource ) ){
+ excelsource.AfterImport();
+ }
table := FinancialSalesSource::InitiateSearch( MacroPlan );//selectobject( MacroPlan, FinancialSalesSource.FinancialSalesReport, table, not table.IsImport() and table.IsShow() );
DataHolderTable.Data( table );
--
Gitblit v1.9.3