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_FrmMaterial/Component_Panel418.def |   16 +++++++++++++---
 1 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/_Main/UI/MacroPlannerWebApp/Component_FrmMaterial/Component_Panel418.def b/_Main/UI/MacroPlannerWebApp/Component_FrmMaterial/Component_Panel418.def
index efb0178..a9de040 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FrmMaterial/Component_Panel418.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FrmMaterial/Component_Panel418.def
@@ -24,7 +24,7 @@
       [
         NumberOfColumns: 15
         PlaceHolder: '妯$硦鎼滅储'
-        Taborder: 1
+        Taborder: 2
       ]
     }
     Component btn_Query_FM
@@ -35,7 +35,7 @@
       [
         Image: 'VIEW'
         Label: '鏌ヨ'
-        Taborder: 2
+        Taborder: 3
       ]
     }
     Component btn_Add_FM
@@ -46,7 +46,7 @@
       [
         Image: 'ADD2'
         Label: '鏂板鍙嶇/鎺堟潈'
-        Taborder: 3
+        Taborder: 4
       ]
       ResponseDefinitions:
       [
@@ -66,6 +66,16 @@
         }
       ]
     }
+    Component ds_Month_FM
+    {
+      #keys: '[414724.0.148121614]'
+      BaseType: 'WebDateSelector'
+      Properties:
+      [
+        DateFormat: 'YMM'
+        Taborder: 1
+      ]
+    }
   ]
   Properties:
   [

--
Gitblit v1.9.3