From ed09bf3eb41fcf1b79b083ac3d959f110b7e613b Mon Sep 17 00:00:00 2001
From: lihongji <3117313295@qq.com>
Date: 星期一, 14 十月 2024 18:28:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

---
 _Main/UI/MacroPlannerWebApp/Component_FormFinancialSalesReport/Component_PanelExport.def |   14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormFinancialProductionReport/Component_PanelExport.def b/_Main/UI/MacroPlannerWebApp/Component_FormFinancialSalesReport/Component_PanelExport.def
similarity index 71%
rename from _Main/UI/MacroPlannerWebApp/Component_FormFinancialProductionReport/Component_PanelExport.def
rename to _Main/UI/MacroPlannerWebApp/Component_FormFinancialSalesReport/Component_PanelExport.def
index 512bfd5..e89cf40 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormFinancialProductionReport/Component_PanelExport.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormFinancialSalesReport/Component_PanelExport.def
@@ -1,13 +1,13 @@
 Quintiq file version 2.0
 Component PanelExport
 {
-  #keys: '[415136.0.834352718]'
+  #keys: '[415136.0.1193321967]'
   BaseType: 'WebPanel'
   Children:
   [
-    Component ButtonExport
+    Component ButtonExport570
     {
-      #keys: '[415136.0.834352737]'
+      #keys: '[415136.0.1193321968]'
       BaseType: 'WebButton'
       Properties:
       [
@@ -18,7 +18,7 @@
     }
     Component ButtonSearch
     {
-      #keys: '[415136.0.972170614]'
+      #keys: '[415136.0.1193321969]'
       BaseType: 'WebButton'
       Properties:
       [
@@ -26,9 +26,9 @@
         Taborder: 0
       ]
     }
-    Component bRefresh id:bRefresh_859
+    Component bRefresh
     {
-      #keys: '[415136.0.1153802738]'
+      #keys: '[415136.0.1193321970]'
       BaseType: 'WebButton'
       Properties:
       [
@@ -40,6 +40,6 @@
   Properties:
   [
     Orientation: 'horizontal'
-    Taborder: 4
+    Taborder: 0
   ]
 }

--
Gitblit v1.9.3