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/Component_FormMachineLogisticsCostReport/Component_MatrixEditor912.def | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormMachineLogisticsCostReport/Component_MatrixEditor912.def b/_Main/UI/MacroPlannerWebApp/Component_FormMachineLogisticsCostReport/Component_MatrixEditor912.def
index dcc3160..9d698a5 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormMachineLogisticsCostReport/Component_MatrixEditor912.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormMachineLogisticsCostReport/Component_MatrixEditor912.def
@@ -45,6 +45,8 @@
Properties:
[
DataType: 'MacroPlan'
+ FilterArguments: 'factory:QLibMacroPlannerWebUI::ApplicationMacroPlanner.dhSelectedFactoryMCRR'
+ FixedFilter: 'object.Filter( factory )'
Source: 'MacroPlan'
Taborder: 0
Transformation: 'MachineLogisticsCostReportRow'
@@ -54,7 +56,7 @@
Properties:
[
Legend: 'Category'
- SortCriteria: 'Category'
+ SortCriteria: 'Index;Category'
Taborder: 1
]
}
@@ -79,7 +81,7 @@
]
Properties:
[
- Legend: 'StartDate'
+ Legend: 'DisplayName'
SortCriteria: 'StartDate'
Taborder: 2
]
--
Gitblit v1.9.3