From 3e22c533dd00a70f1bb7bb8575b5cb0335551626 Mon Sep 17 00:00:00 2001
From: xiaoding721 <33130084+xiaoding721@users.noreply.github.com>
Date: 星期一, 14 十月 2024 18:05:34 +0800
Subject: [PATCH] Merge branch 'dev' of http://47.101.211.7:10101/r/VWED into dev

---
 _Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Component_abgSecondDevelopmentPlan.def |   27 +++++++++++++++++++--------
 1 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Component_abgSecondDevelopmentPlan.def b/_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Component_abgSecondDevelopmentPlan.def
index 7221e9b..8a7c394 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Component_abgSecondDevelopmentPlan.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Component_abgSecondDevelopmentPlan.def
@@ -22,9 +22,7 @@
       BaseType: 'WebButton'
       Properties:
       [
-        Image: 'SIXPACK_BEER'
-        Label: 'Packaging plan'
-        Taborder: 3
+        Taborder: 6
       ]
     }
     Component bOfflinePlan
@@ -34,7 +32,7 @@
       Properties:
       [
         Image: 'LIGHTBULB'
-        Label: 'Offline plan'
+        Label: 'Output plan'
         Taborder: 1
       ]
     }
@@ -46,16 +44,18 @@
       [
         Description: 'AssemblyOnlinePlan'
         Image: 'PALM_TREE'
-        Label: 'Assembly online plan'
-        Taborder: 2
+        Label: 'Filing plan'
+        Taborder: 3
       ]
     }
-    Component btnSecondDevelopmentPlan
+    Component bPackagingPlan
     {
-      #keys: '[413988.0.1400700646]'
+      #keys: '[413988.0.1291640400]'
       BaseType: 'WebButton'
       Properties:
       [
+        Image: 'SIXPACK_BEER'
+        Label: 'Packaging plan'
         Taborder: 4
       ]
     }
@@ -70,6 +70,17 @@
         Taborder: 5
       ]
     }
+    Component bNewOfflinePlan
+    {
+      #keys: '[413988.0.1607471411]'
+      BaseType: 'WebButton'
+      Properties:
+      [
+        Image: 'LIGHTBULB'
+        Label: 'Output plan'
+        Taborder: 2
+      ]
+    }
   ]
   Properties:
   [

--
Gitblit v1.9.3