From 5ae534ab606e6f2ba5ea60914224d665b0447d5a Mon Sep 17 00:00:00 2001
From: Kevin Kok Khah Whey <khahwhey.kok@3ds.com>
Date: 星期二, 07 十一月 2023 22:48:31 +0800
Subject: [PATCH] Merge branch 'dev' of http://47.101.211.7:10101/r/TIANMA_JITUAN into dev_Kevin

---
 _Main/UI/MacroPlannerWebApp/Component_FormCapacityAndSaleBudgeCompare/_ROOT_Component_FormCapacityAndSaleBudgeCompare.def |   33 +++++++++++++++++++--------------
 1 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormCapacityAndSaleBudgeCompare/_ROOT_Component_FormCapacityAndSaleBudgeCompare.def b/_Main/UI/MacroPlannerWebApp/Component_FormCapacityAndSaleBudgeCompare/_ROOT_Component_FormCapacityAndSaleBudgeCompare.def
index d44643f..fd88e20 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormCapacityAndSaleBudgeCompare/_ROOT_Component_FormCapacityAndSaleBudgeCompare.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormCapacityAndSaleBudgeCompare/_ROOT_Component_FormCapacityAndSaleBudgeCompare.def
@@ -8,25 +8,30 @@
   Children:
   [
     #child: MatrixEditorCapacityAndSaleBudgeCompare
-    Component ButtonCapacityAndSaleBudgeCompare
+    #child: pButton
+    Component dhStatus
     {
-      #keys: '[414384.0.818241675]'
-      BaseType: 'WebButton'
-      Properties:
+      #keys: '[414702.1.386200525]'
+      BaseType: 'WebDataHolder'
+      Databinding: 'CapacityAndSaleBudgeRunStatus'
+      Children:
       [
-        Label: '鍒锋柊'
-        Taborder: 0
+        Component deStatus
+        {
+          #keys: '[414702.1.386200546]'
+          BaseType: 'WebDataExtractor'
+          Properties:
+          [
+            DataType: 'GlobalOTDSOP'
+            Source: 'GlobalOTDSOP'
+            Taborder: 0
+            Transformation: 'CapacityAndSaleBudgeRunStatus'
+          ]
+        }
       ]
-    }
-    Component ButtonExportCompare
-    {
-      #keys: '[414384.0.881345277]'
-      BaseType: 'WebButton'
       Properties:
       [
-        Image: 'EXPORT1'
-        Label: '瀵煎嚭'
-        Taborder: 1
+        Taborder: 2
       ]
     }
   ]

--
Gitblit v1.9.3