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/LogisticsCostParameterSetting.vw | 173 +++++++++++++++++++++++++++++++++++++++------------------
1 files changed, 118 insertions(+), 55 deletions(-)
diff --git a/_Main/UI/MacroPlannerWebApp/Views/LogisticsCostParameterSetting.vw b/_Main/UI/MacroPlannerWebApp/Views/LogisticsCostParameterSetting.vw
index e12a02c..1a8959f 100644
--- a/_Main/UI/MacroPlannerWebApp/Views/LogisticsCostParameterSetting.vw
+++ b/_Main/UI/MacroPlannerWebApp/Views/LogisticsCostParameterSetting.vw
@@ -43,30 +43,39 @@
subtotals: ''
width: 82
}
- column_Product
- {
- columnId: 'Product'
- dataPath: 'Product'
- dataType: 'string'
- index: 2
- subtotals: ''
- width: 63
- }
column_Factory
{
columnId: 'Factory'
dataPath: 'Factory'
dataType: 'string'
- index: 3
+ index: 2
subtotals: ''
width: 60
+ }
+ column_StartDate
+ {
+ columnId: 'StartDate'
+ dataPath: 'StartDate'
+ dataType: 'date'
+ index: 3
+ subtotals: ''
+ width: 80
+ }
+ column_EndDate
+ {
+ columnId: 'EndDate'
+ dataPath: 'EndDate'
+ dataType: 'date'
+ index: 4
+ subtotals: ''
+ width: 78
}
column_PackagingCapacity
{
columnId: 'PackagingCapacity'
dataPath: 'PackagingCapacity'
- dataType: 'number'
- index: 4
+ dataType: 'real'
+ index: 5
subtotals: ''
width: 86
}
@@ -74,8 +83,8 @@
{
columnId: 'WarehousingPrice'
dataPath: 'WarehousingPrice'
- dataType: 'number'
- index: 5
+ dataType: 'real'
+ index: 6
subtotals: ''
width: 126
}
@@ -83,8 +92,8 @@
{
columnId: 'OutboundPrice'
dataPath: 'OutboundPrice'
- dataType: 'number'
- index: 6
+ dataType: 'real'
+ index: 7
subtotals: ''
width: 126
}
@@ -92,8 +101,8 @@
{
columnId: 'StoragePrice'
dataPath: 'StoragePrice'
- dataType: 'number'
- index: 7
+ dataType: 'real'
+ index: 8
subtotals: ''
width: 124
}
@@ -101,8 +110,8 @@
{
columnId: 'OtherPrice'
dataPath: 'OtherPrice'
- dataType: 'number'
- index: 8
+ dataType: 'real'
+ index: 9
subtotals: ''
width: 127
}
@@ -137,7 +146,7 @@
dataType: 'string'
index: 0
subtotals: ''
- width: 52
+ width: 121
}
column_Origin
{
@@ -146,7 +155,7 @@
dataType: 'string'
index: 1
subtotals: ''
- width: 66
+ width: 75
}
column_Destination
{
@@ -155,23 +164,41 @@
dataType: 'string'
index: 2
subtotals: ''
- width: 67
+ width: 86
+ }
+ column_StartDate
+ {
+ columnId: 'StartDate'
+ dataPath: 'StartDate'
+ dataType: 'date'
+ index: 3
+ subtotals: ''
+ width: 78
+ }
+ column_EndDate
+ {
+ columnId: 'EndDate'
+ dataPath: 'EndDate'
+ dataType: 'date'
+ index: 4
+ subtotals: ''
+ width: 78
}
column_LoadingCapacity
{
columnId: 'LoadingCapacity'
dataPath: 'LoadingCapacity'
- dataType: 'number'
- index: 3
+ dataType: 'real'
+ index: 5
subtotals: ''
- width: 81
+ width: 109
}
column_TransportPrice
{
columnId: 'TransportPrice'
dataPath: 'TransportPrice'
- dataType: 'number'
- index: 4
+ dataType: 'real'
+ index: 6
subtotals: ''
width: 150
}
@@ -206,14 +233,32 @@
dataType: 'string'
index: 0
subtotals: ''
- width: 51
+ width: 64
+ }
+ column_StartDate
+ {
+ columnId: 'StartDate'
+ dataPath: 'StartDate'
+ dataType: 'date'
+ index: 1
+ subtotals: ''
+ width: 77
+ }
+ column_EndDate
+ {
+ columnId: 'EndDate'
+ dataPath: 'EndDate'
+ dataType: 'date'
+ index: 2
+ subtotals: ''
+ width: 80
}
column_WarehousingPrice
{
columnId: 'WarehousingPrice'
dataPath: 'WarehousingPrice'
- dataType: 'number'
- index: 1
+ dataType: 'real'
+ index: 3
subtotals: ''
width: 123
}
@@ -221,8 +266,8 @@
{
columnId: 'OutboundPrice'
dataPath: 'OutboundPrice'
- dataType: 'number'
- index: 2
+ dataType: 'real'
+ index: 4
subtotals: ''
width: 124
}
@@ -230,8 +275,8 @@
{
columnId: 'StoragePrice'
dataPath: 'StoragePrice'
- dataType: 'number'
- index: 3
+ dataType: 'real'
+ index: 5
subtotals: ''
width: 126
}
@@ -239,8 +284,8 @@
{
columnId: 'CleanPrice'
dataPath: 'CleanPrice'
- dataType: 'number'
- index: 4
+ dataType: 'real'
+ index: 6
subtotals: ''
width: 128
}
@@ -284,14 +329,32 @@
dataType: 'string'
index: 1
subtotals: ''
- width: 54
+ width: 65
+ }
+ column_StartDate
+ {
+ columnId: 'StartDate'
+ dataPath: 'StartDate'
+ dataType: 'date'
+ index: 2
+ subtotals: ''
+ width: 79
+ }
+ column_EndDate
+ {
+ columnId: 'EndDate'
+ dataPath: 'EndDate'
+ dataType: 'date'
+ index: 3
+ subtotals: ''
+ width: 78
}
column_PackagingCapacity
{
columnId: 'PackagingCapacity'
dataPath: 'PackagingCapacity'
- dataType: 'number'
- index: 2
+ dataType: 'real'
+ index: 4
subtotals: ''
width: 73
}
@@ -299,8 +362,8 @@
{
columnId: 'WarehousingPrice'
dataPath: 'WarehousingPrice'
- dataType: 'number'
- index: 3
+ dataType: 'real'
+ index: 5
subtotals: ''
width: 126
}
@@ -308,8 +371,8 @@
{
columnId: 'OutboundPrice'
dataPath: 'OutboundPrice'
- dataType: 'number'
- index: 4
+ dataType: 'real'
+ index: 6
subtotals: ''
width: 130
}
@@ -317,8 +380,8 @@
{
columnId: 'PackagePrice'
dataPath: 'PackagePrice'
- dataType: 'number'
- index: 5
+ dataType: 'real'
+ index: 7
subtotals: ''
width: 131
}
@@ -326,8 +389,8 @@
{
columnId: 'UnpackingPrice'
dataPath: 'UnpackingPrice'
- dataType: 'number'
- index: 6
+ dataType: 'real'
+ index: 8
subtotals: ''
width: 133
}
@@ -335,17 +398,17 @@
{
columnId: 'BufferPaperPrice'
dataPath: 'BufferPaperPrice'
- dataType: 'number'
- index: 7
+ dataType: 'real'
+ index: 9
subtotals: ''
- width: 135
+ width: 146
}
column_StoragePrice
{
columnId: 'StoragePrice'
dataPath: 'StoragePrice'
- dataType: 'number'
- index: 8
+ dataType: 'real'
+ index: 10
subtotals: ''
width: 126
}
@@ -353,8 +416,8 @@
{
columnId: 'WoodenCratePrice'
dataPath: 'WoodenCratePrice'
- dataType: 'number'
- index: 9
+ dataType: 'real'
+ index: 11
subtotals: ''
width: 79
}
--
Gitblit v1.9.3