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_ApplicationMacroPlanner/Component_abgSecondDevelopmentPlan.def | 23 +++++++++++++++++------
1 files changed, 17 insertions(+), 6 deletions(-)
diff --git a/_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Component_abgSecondDevelopmentPlan.def b/_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Component_abgSecondDevelopmentPlan.def
index 2c89ac6..a33bc23 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Component_abgSecondDevelopmentPlan.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Component_abgSecondDevelopmentPlan.def
@@ -16,15 +16,13 @@
Taborder: 0
]
}
- Component bPackagingPlan
+ Component bBlank
{
#keys: '[413988.0.1291640400]'
BaseType: 'WebButton'
Properties:
[
- Image: 'SIXPACK_BEER'
- Label: 'Packaging plan'
- Taborder: 3
+ Taborder: 5
]
}
Component bOfflinePlan
@@ -50,12 +48,25 @@
Taborder: 2
]
}
- Component btnSecondDevelopmentPlan
+ Component bPackagingPlan
{
- #keys: '[413988.0.1400700646]'
+ #keys: '[413988.0.1291640400]'
BaseType: 'WebButton'
Properties:
[
+ Image: 'SIXPACK_BEER'
+ Label: 'Packaging plan'
+ Taborder: 3
+ ]
+ }
+ Component bShippingActualData
+ {
+ #keys: '[415136.0.905520117]'
+ BaseType: 'WebButton'
+ Properties:
+ [
+ Image: 'TABLE_CONNECTION'
+ Label: 'Shipping data'
Taborder: 4
]
}
--
Gitblit v1.9.3