From 6e9d3bb8c53722fa978fa4462c31616f7bbc3492 Mon Sep 17 00:00:00 2001
From: rislai <risheng.lai@capgemini.com>
Date: 星期一, 10 六月 2024 23:35:37 +0800
Subject: [PATCH] Merge branch 'dev' of http://47.101.211.7:10101/r/VWED into dev

---
 _Main/UI/MacroPlannerWebApp/Component_DialogCreateEditChangeLossSetting/Component_pnlContent.def |   10 ++++++++--
 1 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/_Main/UI/MacroPlannerWebApp/Component_DialogCreateEditChangeLossSetting/Component_pnlContent.def b/_Main/UI/MacroPlannerWebApp/Component_DialogCreateEditChangeLossSetting/Component_pnlContent.def
index c499774..44c4b7d 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,6 +84,7 @@
       Properties:
       [
         DataBinding: 'dhDialogData.Data.ProductSecond'
+        DisplayField: 'Name'
         Label: 'Product2'
         Taborder: 2
       ]
@@ -92,6 +97,7 @@
       [
         DataBinding: 'dhDialogData.Data.ChangeLossNr'
         Label: 'Change loss number'
+        Min: '0'
         Taborder: 3
       ]
     }

--
Gitblit v1.9.3