From 4e81774a232b45a6a9df3dfd06893c481c83695d Mon Sep 17 00:00:00 2001
From: lihongji <3117313295@qq.com>
Date: 星期三, 07 八月 2024 15:56:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

---
 _Main/UI/MacroPlannerWebApp/Component_FormFinancialProductionReport/Response_OnCreated.def |   10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormFinancialProductionReport/Response_OnCreated.def b/_Main/UI/MacroPlannerWebApp/Component_FormFinancialProductionReport/Response_OnCreated.def
index e6a840f..d90dc62 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormFinancialProductionReport/Response_OnCreated.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormFinancialProductionReport/Response_OnCreated.def
@@ -10,13 +10,15 @@
     Body:
     [*
       //鍒濆鍖�
-      if( not exists( MacroPlan, FinancialProductionSource, source, not source.IsImport() ) ){
+      //if( not exists( MacroPlan, FinancialProductionSource, source, not source.IsImport() ) ){
         FinancialProductionSource::Initialize( MacroPlan );
-      }
+      //}
       //info( '------------------1----------------' );
-      table := selectobject( MacroPlan, FinancialProductionSource.FinancialProductionReport, table, not table.IsImport() );
-      //info( '------------------2----------------' );
+      table := selectobject( MacroPlan, FinancialProductionSource.FinancialProductionReport, table, not table.IsImport() and table.IsShow() );
+      //info( '------------------2----------------', table.IsImport(), table.IsShow() );
       DataHolderTable.Data( table );
+      
+      dhSearch.Data( table.FinancialProductionSource().FinancialProductionSearch() );
     *]
     GroupServerCalls: false
   }

--
Gitblit v1.9.3