From 7dcc1a44431ff8f08a28359c1bc62a29229e87b4 Mon Sep 17 00:00:00 2001
From: xiaoding721 <33130084+xiaoding721@users.noreply.github.com>
Date: 星期三, 11 九月 2024 12:08:31 +0800
Subject: [PATCH] Merge branch 'dev' of http://47.101.211.7:10101/r/VWED into dev
---
_Main/UI/MacroPlannerWebApp/Views/Labor_Costs.vw | 24 +++---------------------
1 files changed, 3 insertions(+), 21 deletions(-)
diff --git a/_Main/UI/MacroPlannerWebApp/Views/Labor_Costs.vw b/_Main/UI/MacroPlannerWebApp/Views/Labor_Costs.vw
index 4fc1f6f..a637501 100644
--- a/_Main/UI/MacroPlannerWebApp/Views/Labor_Costs.vw
+++ b/_Main/UI/MacroPlannerWebApp/Views/Labor_Costs.vw
@@ -13,7 +13,7 @@
{
mode: 'open'
rowPosition: 1
- rowSpan: 25
+ rowSpan: 21
columnPosition: 1
columnSpan: 10
}
@@ -64,30 +64,12 @@
subtotals: ''
width: 150
}
- column_StartDate
- {
- columnId: 'StartDate'
- dataPath: 'StartDate'
- dataType: 'date'
- index: 3
- subtotals: ''
- width: 150
- }
- column_TimeUnit
- {
- columnId: 'TimeUnit'
- dataPath: 'TimeUnit'
- dataType: 'string'
- index: 4
- subtotals: ''
- width: 150
- }
column_BaseSalary
{
columnId: 'BaseSalary'
dataPath: 'BaseSalary'
dataType: 'real'
- index: 5
+ index: 3
subtotals: ''
width: 150
}
@@ -175,10 +157,10 @@
userconfigurableinformation
{
}
+ image: 'MONEY_BILL_FIRE'
page: ''
group: ''
index: 0
- image: 'MONEY_BILL_FIRE'
description: ''
}
formatversion: 2
--
Gitblit v1.9.3