From 14c69c3b49acf986861a70ea5fdff90d01e92bf6 Mon Sep 17 00:00:00 2001
From: rislai <risheng.lai@capgemini.com>
Date: 星期五, 19 七月 2024 17:41:42 +0800
Subject: [PATCH] Merge branch 'dev' of http://47.101.211.7:10101/r/VWED into dev

---
 _Main/UI/MacroPlannerWebApp/Views/Time_Capacities.vw |   64 +++++++++++++++++++++++++++++++
 1 files changed, 63 insertions(+), 1 deletions(-)

diff --git a/_Main/UI/MacroPlannerWebApp/Views/Time_Capacities.vw b/_Main/UI/MacroPlannerWebApp/Views/Time_Capacities.vw
index 819a968..e91d249 100644
--- a/_Main/UI/MacroPlannerWebApp/Views/Time_Capacities.vw
+++ b/_Main/UI/MacroPlannerWebApp/Views/Time_Capacities.vw
@@ -13,6 +13,17 @@
             totalHeaderWidth: 293
           }
         }
+        layout
+        {
+          rowPosition: 16
+        }
+      }
+      form_FormShiftPattern
+      {
+        layout
+        {
+          rowSpan: 15
+        }
       }
       form_FormProductionLineBatchData
       {
@@ -22,7 +33,7 @@
         layout
         {
           mode: 'open'
-          rowPosition: 18
+          rowPosition: 26
           rowSpan: 9
           columnPosition: 1
           columnSpan: 8
@@ -60,6 +71,57 @@
           }
         }
       }
+      form_FormShiftDayTime
+      {
+        title: 'QMacroPlanner::FormShiftDayTime'
+        shown: true
+        componentID: 'QMacroPlanner::FormShiftDayTime'
+        layout
+        {
+          mode: 'open'
+          rowPosition: 8
+          rowSpan: 8
+          columnPosition: 9
+          columnSpan: 4
+        }
+        components
+        {
+          FormShiftDayTime_ListShiftDayTime
+          {
+          }
+          FormShiftDayTime_DataSetLevelShiftDayTime
+          {
+            groupDepth: -1
+            column_Start
+            {
+              columnId: 'Start'
+              dataPath: 'Start'
+              dataType: 'string'
+              index: 0
+              subtotals: ''
+              width: 150
+            }
+            column_End
+            {
+              columnId: 'End'
+              dataPath: 'End'
+              dataType: 'string'
+              index: 1
+              subtotals: ''
+              width: 150
+            }
+            column_Name
+            {
+              columnId: 'Name'
+              dataPath: 'Name'
+              dataType: 'string'
+              index: 2
+              subtotals: ''
+              width: 150
+            }
+          }
+        }
+      }
     }
   }
   formatversion: 2

--
Gitblit v1.9.3