From 7e31442f0e9b07764e9c6a9680d3d4aeba5fe1de Mon Sep 17 00:00:00 2001
From: admin <admin@admin.com>
Date: 星期三, 22 一月 2025 12:20:44 +0800
Subject: [PATCH] Merge branch 'master' of http://47.101.211.7:10101/r/VWED into dev
---
_Main/UI/MacroPlannerWebApp/Views/Time_Capacities.vw | 72 ++++++++++++++++++++++++++++++++++--
1 files changed, 68 insertions(+), 4 deletions(-)
diff --git a/_Main/UI/MacroPlannerWebApp/Views/Time_Capacities.vw b/_Main/UI/MacroPlannerWebApp/Views/Time_Capacities.vw
index d39df36..2362951 100644
--- a/_Main/UI/MacroPlannerWebApp/Views/Time_Capacities.vw
+++ b/_Main/UI/MacroPlannerWebApp/Views/Time_Capacities.vw
@@ -87,7 +87,7 @@
rowPosition: 26
rowSpan: 9
columnPosition: 1
- columnSpan: 8
+ columnSpan: 12
}
components
{
@@ -101,21 +101,85 @@
FormProductionLineBatchData_DataSetLevelProductionLineBatchData
{
groupDepth: -1
+ sort: 'DESC:Unit3.Name'
+ column_ImageIsEnable
+ {
+ columnId: 'ImageIsEnable'
+ dataPath: 'ImageIsEnable'
+ dataType: 'string'
+ index: 0
+ subtotals: ''
+ width: 37
+ }
column_StartDate
{
columnId: 'StartDate'
dataPath: 'StartDate'
dataType: 'date'
- index: 0
+ index: 1
subtotals: ''
- width: 150
+ width: 102
}
column_EndDate
{
columnId: 'EndDate'
dataPath: 'EndDate'
dataType: 'date'
- index: 1
+ index: 2
+ subtotals: ''
+ width: 102
+ }
+ column_Unit1_Name
+ {
+ columnId: 'Unit1.Name'
+ dataPath: 'Unit1.Name'
+ dataType: 'string'
+ index: 3
+ subtotals: ''
+ width: 150
+ }
+ column_Unit2_Name
+ {
+ columnId: 'Unit2.Name'
+ dataPath: 'Unit2.Name'
+ dataType: 'string'
+ index: 4
+ subtotals: ''
+ width: 150
+ }
+ column_Unit3_Name
+ {
+ columnId: 'Unit3.Name'
+ dataPath: 'Unit3.Name'
+ dataType: 'string'
+ index: 5
+ subtotals: ''
+ width: 150
+ }
+ column_ShiftPattern1_Name
+ {
+ columnId: 'ShiftPattern1.Name'
+ dataPath: 'ShiftPattern1.Name'
+ dataType: 'string'
+ index: 6
+ subtotals: ''
+ width: 112
+ }
+ column_ShiftPattern2_Name
+ {
+ columnId: 'ShiftPattern2.Name'
+ dataPath: 'ShiftPattern2.Name'
+ dataType: 'string'
+ index: 7
+ subtotals: ''
+ width: 112
+ }
+ column_ShiftPattern3_Name
+ {
+ columnId: 'ShiftPattern3.Name'
+ dataPath: 'ShiftPattern3.Name'
+ dataType: 'string'
+ index: 8
subtotals: ''
width: 150
}
--
Gitblit v1.9.3