From d901b1ab0ee0b690f5ac211b9cdb1db3a58bca86 Mon Sep 17 00:00:00 2001
From: yanweiyuan3 <yanweiyuan3@gmail.com>
Date: 星期二, 10 十月 2023 17:45:58 +0800
Subject: [PATCH] Merge branch 'dev' into dev_yy

---
 _Main/UI/MacroPlannerWebApp/Component_FrmOrderForecast/Component_Panel351.def |   42 ++++++++++++++++++++++++++++++++++--------
 1 files changed, 34 insertions(+), 8 deletions(-)

diff --git a/_Main/UI/MacroPlannerWebApp/Component_FrmOrderForecast/Component_Panel351.def b/_Main/UI/MacroPlannerWebApp/Component_FrmOrderForecast/Component_Panel351.def
index 8801397..2d6bd11 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FrmOrderForecast/Component_Panel351.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FrmOrderForecast/Component_Panel351.def
@@ -11,9 +11,10 @@
       BaseType: 'WebButton'
       Properties:
       [
+        ButtonSize: 'compact'
         Description: '璁㈠崟鏂板鍙嶇/鎺堟潈'
         Label: '璁㈠崟鏂板鍙嶇/鎺堟潈'
-        Taborder: 1
+        Taborder: 0
       ]
       ResponseDefinitions:
       [
@@ -39,9 +40,10 @@
       BaseType: 'WebButton'
       Properties:
       [
+        ButtonSize: 'compact'
         Description: '鍘熸枡鏂板鍙嶇/鎺堟潈'
         Label: '鍘熸枡鏂板鍙嶇/鎺堟潈'
-        Taborder: 2
+        Taborder: 1
       ]
       ResponseDefinitions:
       [
@@ -61,16 +63,40 @@
         }
       ]
     }
-    Component btn_InitialData778
+    Component btn_OrderH_FOF
     {
-      #keys: '[414724.0.115504406]'
+      #keys: '[414724.0.165490408]'
       BaseType: 'WebButton'
       Properties:
       [
-        Description: '鍔犺浇鏁版嵁锛堝亣鐨勶紝鍚庣画闇�瑕佸鎺ユ暟鎹級'
-        Label: '鍔犺浇棰勬祴璁㈠崟鏁版嵁'
-        Taborder: 0
-        Visible: false
+        ButtonSize: 'compact'
+        Description: 'ERO璁㈠崟鍐插噺'
+        Image: 'AMMUNITION_BOX_CLOSED'
+        Label: 'ERP璁㈠崟鍐插噺'
+        Taborder: 2
+      ]
+    }
+    Component txt_QueryContent_FOF
+    {
+      #keys: '[414724.0.172390935]'
+      BaseType: 'WebEditField'
+      Properties:
+      [
+        PlaceHolder: '妯$硦鎼滅储'
+        Taborder: 3
+      ]
+    }
+    Component btn_Query_FOF
+    {
+      #keys: '[414724.0.172390951]'
+      BaseType: 'WebButton'
+      Properties:
+      [
+        ButtonSize: 'compact'
+        Description: '鏌ヨ'
+        Image: 'VIEW'
+        Label: '鏌ヨ'
+        Taborder: 4
       ]
     }
   ]

--
Gitblit v1.9.3