From aefafd2142478d4fb07d6b8b45c3047e247389e0 Mon Sep 17 00:00:00 2001 From: hongji.li <hongji.a.li@capgemini.com> Date: 星期五, 03 十一月 2023 16:31:17 +0800 Subject: [PATCH] Merge branch 'dev' of http://47.101.211.7:10101/r/TIANMA_JITUAN into dev_lhj --- _Main/UI/MacroPlannerWebApp/Component_FormCapacityAndSaleBudgeChart/_ROOT_Component_FormCapacityAndSaleBudgeChart.def | 53 ++++------------------------------------------------- 1 files changed, 4 insertions(+), 49 deletions(-) diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormCapacityAndSaleBudgeChart/_ROOT_Component_FormCapacityAndSaleBudgeChart.def b/_Main/UI/MacroPlannerWebApp/Component_FormCapacityAndSaleBudgeChart/_ROOT_Component_FormCapacityAndSaleBudgeChart.def index 237e0c6..56d70aa 100644 --- a/_Main/UI/MacroPlannerWebApp/Component_FormCapacityAndSaleBudgeChart/_ROOT_Component_FormCapacityAndSaleBudgeChart.def +++ b/_Main/UI/MacroPlannerWebApp/Component_FormCapacityAndSaleBudgeChart/_ROOT_Component_FormCapacityAndSaleBudgeChart.def @@ -8,16 +8,6 @@ Children: [ #child: ChartCapacityAndSaleBudgeChart - Component ButtonCapacityAndSaleBudgeChartTest - { - #keys: '[414384.0.857443217]' - BaseType: 'WebButton' - Properties: - [ - Label: '鐢熸垚' - Taborder: 6 - ] - } Component DropDownYears { #keys: '[414384.0.857740648]' @@ -25,7 +15,7 @@ Properties: [ Label: '骞翠唤' - Taborder: 2 + Taborder: 0 Visible: false ] } @@ -37,7 +27,7 @@ [ AllowEmpty: true Label: '浜嬩笟閮�' - Taborder: 3 + Taborder: 1 Visible: false ] } @@ -49,46 +39,11 @@ [ AllowEmpty: true Label: '闈㈡澘鍩哄湴' - Taborder: 4 + Taborder: 2 Visible: false ] } - Component DropDownTimeGroup - { - #keys: '[414384.0.857771238]' - BaseType: 'WebDropDownStringList' - Properties: - [ - InitialValue: '鏈�' - Label: '鏃堕棿鍒嗙粍' - Strings: '鏈�;瀛e害;鍗婂勾;骞�' - Taborder: 1 - ] - } - Component DropDownByBusinessTypeOrByOrgCode - { - #keys: '[414384.0.857702904]' - BaseType: 'WebDropDownStringList' - Properties: - [ - InitialValue: '浜嬩笟閮�' - Label: '鏍规嵁闈㈡澘鍩哄湴/浜嬩笟閮ㄥ垎缁�' - Strings: '闈㈡澘鍩哄湴;浜嬩笟閮�' - Taborder: 0 - ] - } - Component DropDownSaleOrCapacity - { - #keys: '[414384.0.886240556]' - BaseType: 'WebDropDownStringList' - Properties: - [ - InitialValue: '閿�鍞' - Label: '閿�鍞/浜ц兘' - Strings: '閿�鍞;浜ц兘' - Taborder: 5 - ] - } + #child: pFilterCriteria ] Properties: [ -- Gitblit v1.9.3