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_DialogCreateEditChangeLossSetting/Component_pnlContent.def | 41 ++++++++++++++++++++++++++++++++++-------
1 files changed, 34 insertions(+), 7 deletions(-)
diff --git a/_Main/UI/MacroPlannerWebApp/Component_DialogCreateEditChangeLossSetting/Component_pnlContent.def b/_Main/UI/MacroPlannerWebApp/Component_DialogCreateEditChangeLossSetting/Component_pnlContent.def
index c499774..5aec729 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_DialogCreateEditChangeLossSetting/Component_pnlContent.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_DialogCreateEditChangeLossSetting/Component_pnlContent.def
@@ -9,6 +9,7 @@
{
#keys: '[415136.0.735612418]'
BaseType: 'WebDropDownList'
+ Databinding: 'Unit'
Children:
[
Component deUnit
@@ -18,7 +19,6 @@
Properties:
[
DataType: 'MacroPlan'
- FixedFilter: "object.CapacityType() = 'Time'"
Source: 'MacroPlan'
Taborder: 0
Transformation: 'Unit'
@@ -28,7 +28,8 @@
Properties:
[
DataBinding: 'dhDialogData.Data.Unit'
- Label: 'Line'
+ DisplayField: 'Name'
+ Label: 'Unit'
Taborder: 0
]
}
@@ -36,6 +37,7 @@
{
#keys: '[415136.0.738250065]'
BaseType: 'WebDropDownList'
+ Databinding: 'Product_MP'
Children:
[
Component deProductFirst
@@ -54,6 +56,7 @@
Properties:
[
DataBinding: 'dhDialogData.Data.ProductFirst'
+ DisplayField: 'Name'
Label: 'Product1'
Taborder: 1
]
@@ -62,6 +65,7 @@
{
#keys: '[415136.0.738250142]'
BaseType: 'WebDropDownList'
+ Databinding: 'Product_MP'
Children:
[
Component deProductSecond
@@ -80,21 +84,44 @@
Properties:
[
DataBinding: 'dhDialogData.Data.ProductSecond'
+ DisplayField: 'Name'
Label: 'Product2'
Taborder: 2
]
}
- Component npChangeLossNr
+ Component dsStartDate
{
- #keys: '[415136.0.738250237]'
- BaseType: 'WebNumberPicker'
+ #keys: '[415136.0.1132411785]'
+ BaseType: 'WebDateSelector'
Properties:
[
- DataBinding: 'dhDialogData.Data.ChangeLossNr'
- Label: 'Change loss number'
+ DataBinding: 'dhDialogData.Data.StartDate'
+ Label: 'Start date'
Taborder: 3
]
}
+ Component dsEndDate
+ {
+ #keys: '[415136.0.1132411840]'
+ BaseType: 'WebDateSelector'
+ Properties:
+ [
+ DataBinding: 'dhDialogData.Data.EndDate'
+ Label: 'End date'
+ Taborder: 4
+ ]
+ }
+ Component efChangeLossNr
+ {
+ #keys: '[415136.0.1176801957]'
+ BaseType: 'WebEditField'
+ Properties:
+ [
+ DataBinding: 'dhDialogData.Data.ChangeLossNumber'
+ Label: 'Change loss number'
+ Taborder: 5
+ ]
+ }
]
Properties:
[
--
Gitblit v1.9.3