From 7e31442f0e9b07764e9c6a9680d3d4aeba5fe1de Mon Sep 17 00:00:00 2001 From: admin <admin@admin.com> Date: 星期三, 22 一月 2025 12:20:44 +0800 Subject: [PATCH] Merge branch 'master' of http://47.101.211.7:10101/r/VWED into dev --- _Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Component_ActionBarGroupReport.def | 43 ++++++++++++++++++++++++------------------- 1 files changed, 24 insertions(+), 19 deletions(-) diff --git a/_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Component_ActionBarGroupReport.def b/_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Component_ActionBarGroupReport.def index 04e16d7..6e2063a 100644 --- a/_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Component_ActionBarGroupReport.def +++ b/_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Component_ActionBarGroupReport.def @@ -11,8 +11,9 @@ BaseType: 'WebButton' Properties: [ + Description: 'Financial production report' Image: 'DOCUMENT_REFRESH' - Label: 'Financial production report' + Label: '璐㈠姟浜ч噺鎶ヨ〃' Taborder: 0 ] } @@ -22,8 +23,9 @@ BaseType: 'WebButton' Properties: [ + Description: 'Financial sales report' Image: 'MONEY_COINS2' - Label: 'Financial sales report' + Label: '璐㈠姟閿�閲忔姤琛�' Taborder: 1 ] } @@ -33,8 +35,9 @@ BaseType: 'WebButton' Properties: [ + Description: 'Inventory summary report' Image: 'DOCUMENT_CHECK_EDIT' - Label: 'Inventory summary report' + Label: '搴撳瓨姹囨�绘姤琛�' Taborder: 2 ] } @@ -44,8 +47,9 @@ BaseType: 'WebButton' Properties: [ + Description: 'Financial weekly report' Image: 'DOCUMENT_DIRTY' - Label: 'Financial weekly report' + Label: '闀挎槬鍛ㄦ姤鎶ヨ〃' Taborder: 3 ] } @@ -56,7 +60,7 @@ Properties: [ Image: 'DOCUMENT_CHART' - Label: '宸ユ椂鍒舵姤琛�' + Label: '鍙樺姩浜哄姏鎴愭湰鎶ヨ〃' Taborder: 4 ] } @@ -70,8 +74,9 @@ ] Properties: [ + Description: 'Pipeline report' Image: 'DOCUMENT_CONNECTION' - Label: 'Pipeline report' + Label: '绠$嚎鎶ヨ〃' Taborder: 5 ] } @@ -86,17 +91,6 @@ Taborder: 6 ] } - Component bMachineLogisticsCostReport - { - #keys: '[413988.0.1467117990]' - BaseType: 'WebButton' - Properties: - [ - Image: 'LOCATION_PIN' - Label: 'Machine logistics cost report' - Taborder: 7 - ] - } Component ButtonScenarioComparisonDemandComparison id:ButtonScenarioComparisonDemandComparison_256 { #keys: '[412672.1.90201789]' @@ -105,7 +99,7 @@ [ Image: 'EQUALS' Label: '闇�姹傚姣�' - Taborder: 8 + Taborder: 7 ] } Component ButtonScheduleSummaryReport @@ -141,10 +135,21 @@ Properties: [ Image: 'MONEY2' - Label: 'engine logistics cost report ' + Label: '鐗╂祦鎴愭湰鎶ヨ〃' Taborder: 10 ] } + Component ButtonAnnualPlanReport + { + #keys: '[412672.1.111811769]' + BaseType: 'WebButton' + Properties: + [ + Image: 'DOCUMENT_HEART' + Label: '鍏ㄥ勾璁″垝鎶ヨ〃' + Taborder: 11 + ] + } ] Properties: [ -- Gitblit v1.9.3