From 5ae534ab606e6f2ba5ea60914224d665b0447d5a Mon Sep 17 00:00:00 2001
From: Kevin Kok Khah Whey <khahwhey.kok@3ds.com>
Date: 星期二, 07 十一月 2023 22:48:31 +0800
Subject: [PATCH] Merge branch 'dev' of http://47.101.211.7:10101/r/TIANMA_JITUAN into dev_Kevin
---
_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Component_cmTestAttempt.def | 93 +++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 90 insertions(+), 3 deletions(-)
diff --git a/_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Component_cmTestAttempt.def b/_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Component_cmTestAttempt.def
index 884eba9..a5d6f33 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Component_cmTestAttempt.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Component_cmTestAttempt.def
@@ -13,7 +13,7 @@
[
Image: 'WATER_FISH'
Taborder: 0
- Title: '浜ц兘鍒嗛厤&濉骇'
+ Title: '浜ц兘鍒嗛厤'
]
}
Component mnAnnualProductionAndSalesReview
@@ -22,11 +22,98 @@
BaseType: 'WebMenu'
Properties:
[
- Image: 'PIG'
- Taborder: 1
+ Image: 'LEMONADE_GLASS'
+ Taborder: 6
Title: '骞村害浜ч攢澶嶇洏'
]
}
+ Component mnPanelPullingMaterialOperationsOfEachBusinessUnit
+ {
+ #keys: '[414702.1.5481991]'
+ BaseType: 'WebMenu'
+ Properties:
+ [
+ Image: 'BANANA'
+ Taborder: 1
+ Title: '闈㈡澘鎷夋枡_浜嬩笟閮ㄦ搷浣�'
+ ]
+ }
+ Component mnPanelPullingMaterialGroupOperations
+ {
+ #keys: '[414702.1.5522564]'
+ BaseType: 'WebMenu'
+ Properties:
+ [
+ Image: 'CLIENT_NETWORK'
+ Taborder: 2
+ Title: '闈㈡澘鎷夋枡_闆嗗洟鎿嶄綔'
+ ]
+ }
+ Component mn222
+ {
+ #keys: '[414702.1.5593849]'
+ BaseType: 'WebMenu'
+ Properties:
+ [
+ Separator: true
+ Taborder: 5
+ ]
+ }
+ Component mnDockingERPForPRRelease
+ {
+ #keys: '[414702.1.5920760]'
+ BaseType: 'WebMenu'
+ Properties:
+ [
+ Image: 'BEER_GLASS'
+ Taborder: 3
+ Title: '瀵规帴ERP杩涜PR閲婃斁'
+ ]
+ }
+ Component mnDataDistribution
+ {
+ #keys: '[414702.1.155392180]'
+ BaseType: 'WebMenu'
+ Properties:
+ [
+ Image: 'PALM_TREE'
+ Taborder: 4
+ Title: '鏁版嵁鍒嗗彂'
+ ]
+ }
+ Component mn666
+ {
+ #keys: '[414702.1.293023106]'
+ BaseType: 'WebMenu'
+ Properties:
+ [
+ Separator: true
+ Taborder: 7
+ ]
+ }
+ Component mnPeggingAnalyse
+ {
+ #keys: '[414702.1.293023171]'
+ BaseType: 'WebMenu'
+ Properties:
+ [
+ Description: 'Pegging鍒嗘瀽'
+ Image: 'COCKTAIL'
+ Taborder: 8
+ Title: 'Pegging鍒嗘瀽'
+ ]
+ }
+ Component mnModulePanelCorrespondence
+ {
+ #keys: '[414702.1.378230928]'
+ BaseType: 'WebMenu'
+ Properties:
+ [
+ Image: 'APPLE'
+ Taborder: 9
+ Title: '妯$粍&闈㈡澘鍏崇郴'
+ ]
+ }
]
Properties:
[
--
Gitblit v1.9.3