From be10d38e5c56c0070d6acfd344ebfae30ee5b0ac Mon Sep 17 00:00:00 2001 From: lazhen <17772815105@139.com> Date: 星期五, 16 八月 2024 17:56:36 +0800 Subject: [PATCH] Merge branch 'dev' of http://47.101.211.7:10101/r/VWED into dev-zlg --- _Main/UI/MacroPlannerWebApp/Component_Form701/Component_MatrixEditor.def | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/_Main/UI/MacroPlannerWebApp/Component_Form701/Component_MatrixEditor.def b/_Main/UI/MacroPlannerWebApp/Component_Form701/Component_MatrixEditor.def index 20b8c8e..6d90515 100644 --- a/_Main/UI/MacroPlannerWebApp/Component_Form701/Component_MatrixEditor.def +++ b/_Main/UI/MacroPlannerWebApp/Component_Form701/Component_MatrixEditor.def @@ -45,7 +45,7 @@ Properties: [ DataType: 'LocalTable' - FilterArguments: 'checkedProduct:QMacroPlanner::FormOfflinePlanComparison701.dhFinelProduct' + FilterArguments: 'checkedProduct:QMacroPlanner::FormOfflinePlanChanges.dhFinelProduct' FixedFilter: 'exists( checkedProduct,Elements,product,product.ID() = object.Name() )' Source: 'dhComparisonData' Taborder: 0 @@ -73,7 +73,7 @@ Properties: [ DataType: 'LocalTable' - FilterArguments: 'startDate:QMacroPlanner::FormOfflinePlanComparison701.dhStartDate;endDate:QMacroPlanner::FormOfflinePlanComparison701.dhEndDate' + FilterArguments: 'startDate:QMacroPlanner::FormOfflinePlanChanges.dhStartDate;endDate:QMacroPlanner::FormOfflinePlanChanges.dhEndDate' FixedFilter: 'not object.IsAttrbuteColumn() and startDate <= object.Date() and endDate > object.Date() ' Source: 'dhComparisonData' Taborder: 0 -- Gitblit v1.9.3