From 30c02e0c981b16be0918483543f4b812956c45d4 Mon Sep 17 00:00:00 2001
From: Lai,Risheng <risheng.lai@capgemini.com>
Date: 星期四, 02 十一月 2023 10:50:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'refs/remotes/origin/dev'
---
_Main/UI/MacroPlannerWebApp/Component_DialogFillingCustomerAndForecast/Component_pnlContent.def | 25 ++++++++++++++++++-------
1 files changed, 18 insertions(+), 7 deletions(-)
diff --git a/_Main/UI/MacroPlannerWebApp/Component_DialogFillingCustomerAndForecast/Component_pnlContent.def b/_Main/UI/MacroPlannerWebApp/Component_DialogFillingCustomerAndForecast/Component_pnlContent.def
index 99073e6..71af1e8 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_DialogFillingCustomerAndForecast/Component_pnlContent.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_DialogFillingCustomerAndForecast/Component_pnlContent.def
@@ -12,7 +12,8 @@
Properties:
[
DataBinding: 'DataHolderFilling.Data.VerNo'
- Label: 'VerNo'
+ Enabled: false
+ Label: '鐗堟湰鍙�'
Taborder: 0
]
}
@@ -24,7 +25,7 @@
[
DataBinding: 'DataHolderFilling.Data.BusinessType'
Enabled: false
- Label: 'BusinessType'
+ Label: '浜嬩笟閮�'
ReadOnly: true
Taborder: 1
]
@@ -37,7 +38,7 @@
[
DataBinding: 'DataHolderFilling.Data.Customer'
Enabled: false
- Label: 'Customer'
+ Label: '瀹㈡埛鍚嶇О'
ReadOnly: true
Taborder: 2
]
@@ -49,7 +50,7 @@
Properties:
[
DataBinding: 'DataHolderFilling.Data.SalesAmount'
- Label: 'SalesAmount'
+ Label: '濉骇鏁伴噺'
Taborder: 3
]
}
@@ -60,8 +61,7 @@
Properties:
[
DataBinding: 'DataHolderFilling.Data.DemandDate'
- Enabled: false
- Label: 'Demand Date'
+ Label: '闇�姹傛椂闂�'
ReadOnly: true
Taborder: 4
]
@@ -73,10 +73,21 @@
Properties:
[
DataBinding: 'DataHolderFilling.Data.ForecastDemandDate'
- Label: 'Forecast Demand Date'
+ Label: '闇�姹傞娴嬫椂闂�'
Taborder: 5
]
}
+ Component ddslOrderType id:ddslOrderType_944
+ {
+ #keys: '[414702.1.71083523]'
+ BaseType: 'WebDropDownStringList'
+ Properties:
+ [
+ Label: '璁㈠崟绫诲瀷'
+ Strings: '鍙嶇;鎺堟潈'
+ Taborder: 6
+ ]
+ }
]
Properties:
[
--
Gitblit v1.9.3