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_DialogCreateEditLogisticsCostEngine/Component_pnlContent.def | 76 ++++++++++++++++++++++++------------- 1 files changed, 49 insertions(+), 27 deletions(-) diff --git a/_Main/UI/MacroPlannerWebApp/Component_DialogCreateEditLogisticsCostEngine/Component_pnlContent.def b/_Main/UI/MacroPlannerWebApp/Component_DialogCreateEditLogisticsCostEngine/Component_pnlContent.def index 69737c7..b4eb73a 100644 --- a/_Main/UI/MacroPlannerWebApp/Component_DialogCreateEditLogisticsCostEngine/Component_pnlContent.def +++ b/_Main/UI/MacroPlannerWebApp/Component_DialogCreateEditLogisticsCostEngine/Component_pnlContent.def @@ -5,28 +5,6 @@ BaseType: 'WebPanel' Children: [ - Component efGeneration - { - #keys: '[413988.0.1457133350]' - BaseType: 'WebEditField' - Properties: - [ - DataBinding: 'DataHolderDialogData.Data.Generation' - Label: 'Generation' - Taborder: 1 - ] - } - Component efMLB_MQB - { - #keys: '[413988.0.1457133352]' - BaseType: 'WebEditField' - Properties: - [ - DataBinding: 'DataHolderDialogData.Data.MLB_MQB' - Label: 'MLB/MQB' - Taborder: 2 - ] - } Component npPackagingCapacity id:npPackagingCapacity_758 { #keys: '[413988.0.1457544780]' @@ -35,7 +13,7 @@ [ DataBinding: 'DataHolderDialogData.Data.PackagingCapacity' Label: '鍖呰瀹归噺 (PCS/鎵�)' - Taborder: 3 + Taborder: 5 ] } Component npWarehousingPrice @@ -46,7 +24,7 @@ [ DataBinding: 'DataHolderDialogData.Data.WarehousingPrice' Label: '鍏ュ簱鍗曚环 (RMB/鎵�)' - Taborder: 4 + Taborder: 6 ] } Component npOutboundPrice @@ -57,7 +35,7 @@ [ DataBinding: 'DataHolderDialogData.Data.OutboundPrice' Label: '鍑哄簱鍗曚环 (RMB/鎵�)' - Taborder: 5 + Taborder: 7 ] } Component npStoragePrice @@ -68,7 +46,7 @@ [ DataBinding: 'DataHolderDialogData.Data.StoragePrice' Label: '浠撳偍鍗曚环 (RMB/鎵�)' - Taborder: 6 + Taborder: 8 ] } Component npOtherPrice @@ -79,7 +57,7 @@ [ DataBinding: 'DataHolderDialogData.Data.OtherPrice' Label: '鍏朵粬鍗曚环 (RMB/鎵�)' - Taborder: 7 + Taborder: 9 ] } Component ddslFactory @@ -94,6 +72,50 @@ Taborder: 0 ] } + Component ddslGeneration + { + #keys: '[415754.0.233210686]' + BaseType: 'WebDropDownStringList' + Properties: + [ + DataBinding: 'DataHolderDialogData.Data.Generation' + Label: 'Generation' + Taborder: 1 + ] + } + Component ddslMLB_MQB + { + #keys: '[415754.0.233210698]' + BaseType: 'WebDropDownStringList' + Properties: + [ + DataBinding: 'DataHolderDialogData.Data.MLB_MQB' + Label: 'MLB/MQB' + Taborder: 2 + ] + } + Component dsStartDate + { + #keys: '[415754.0.251890757]' + BaseType: 'WebDateSelector' + Properties: + [ + DataBinding: 'DataHolderDialogData.Data.StartDate' + Label: '寮�濮嬫椂闂�' + Taborder: 3 + ] + } + Component dsEndDate + { + #keys: '[415754.0.251890826]' + BaseType: 'WebDateSelector' + Properties: + [ + DataBinding: 'DataHolderDialogData.Data.EndDate' + Label: '缁撴潫鏃堕棿' + Taborder: 4 + ] + } ] Properties: [ -- Gitblit v1.9.3