From 42e52dd7a48775cd83be92cc46ea42aa124cb15c Mon Sep 17 00:00:00 2001
From: lazhen <17772815105@139.com>
Date: 星期五, 14 六月 2024 13:06:19 +0800
Subject: [PATCH] Merge branch 'dev' of http://47.101.211.7:10101/r/VWED into dev-zlg

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

diff --git a/_Main/UI/MacroPlannerWebApp/Component_DialogCreateEditChangeLossSetting/Component_pnlContent.def b/_Main/UI/MacroPlannerWebApp/Component_DialogCreateEditChangeLossSetting/Component_pnlContent.def
index 935fb73..44c4b7d 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_DialogCreateEditChangeLossSetting/Component_pnlContent.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_DialogCreateEditChangeLossSetting/Component_pnlContent.def
@@ -19,7 +19,6 @@
           Properties:
           [
             DataType: 'MacroPlan'
-            FixedFilter: "object.CapacityType() = 'Time'"
             Source: 'MacroPlan'
             Taborder: 0
             Transformation: 'Unit'
@@ -29,7 +28,8 @@
       Properties:
       [
         DataBinding: 'dhDialogData.Data.Unit'
-        Label: 'Line'
+        DisplayField: 'Name'
+        Label: 'Unit'
         Taborder: 0
       ]
     }
@@ -56,6 +56,7 @@
       Properties:
       [
         DataBinding: 'dhDialogData.Data.ProductFirst'
+        DisplayField: 'Name'
         Label: 'Product1'
         Taborder: 1
       ]
@@ -83,6 +84,7 @@
       Properties:
       [
         DataBinding: 'dhDialogData.Data.ProductSecond'
+        DisplayField: 'Name'
         Label: 'Product2'
         Taborder: 2
       ]
@@ -95,6 +97,7 @@
       [
         DataBinding: 'dhDialogData.Data.ChangeLossNr'
         Label: 'Change loss number'
+        Min: '0'
         Taborder: 3
       ]
     }

--
Gitblit v1.9.3