From d901b1ab0ee0b690f5ac211b9cdb1db3a58bca86 Mon Sep 17 00:00:00 2001
From: yanweiyuan3 <yanweiyuan3@gmail.com>
Date: 星期二, 10 十月 2023 17:45:58 +0800
Subject: [PATCH] Merge branch 'dev' into dev_yy

---
 _Main/UI/MacroPlannerWebApp/Component_FormCapacityAndSaleBudgeChart/_ROOT_Component_FormCapacityAndSaleBudgeChart.def |   25 +++++++++++++++----------
 1 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormCapacityAndSaleBudgeChart/_ROOT_Component_FormCapacityAndSaleBudgeChart.def b/_Main/UI/MacroPlannerWebApp/Component_FormCapacityAndSaleBudgeChart/_ROOT_Component_FormCapacityAndSaleBudgeChart.def
index 456fb75..237e0c6 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormCapacityAndSaleBudgeChart/_ROOT_Component_FormCapacityAndSaleBudgeChart.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormCapacityAndSaleBudgeChart/_ROOT_Component_FormCapacityAndSaleBudgeChart.def
@@ -26,6 +26,7 @@
       [
         Label: '骞翠唤'
         Taborder: 2
+        Visible: false
       ]
     }
     Component DropDownBusinessTypes
@@ -37,6 +38,7 @@
         AllowEmpty: true
         Label: '浜嬩笟閮�'
         Taborder: 3
+        Visible: false
       ]
     }
     Component DropDownPlaceOfProductionOfArrays
@@ -48,16 +50,7 @@
         AllowEmpty: true
         Label: '闈㈡澘鍩哄湴'
         Taborder: 4
-      ]
-    }
-    Component CheckboxIsCapacity
-    {
-      #keys: '[414384.0.857770765]'
-      BaseType: 'WebCheckbox'
-      Properties:
-      [
-        Label: '浜ц兘'
-        Taborder: 5
+        Visible: false
       ]
     }
     Component DropDownTimeGroup
@@ -84,6 +77,18 @@
         Taborder: 0
       ]
     }
+    Component DropDownSaleOrCapacity
+    {
+      #keys: '[414384.0.886240556]'
+      BaseType: 'WebDropDownStringList'
+      Properties:
+      [
+        InitialValue: '閿�鍞'
+        Label: '閿�鍞/浜ц兘'
+        Strings: '閿�鍞;浜ц兘'
+        Taborder: 5
+      ]
+    }
   ]
   Properties:
   [

--
Gitblit v1.9.3