From 1ba69c3cf5c9e88d36db217bcc84ec8cda5d29b7 Mon Sep 17 00:00:00 2001 From: lazhen <17772815105@139.com> Date: 星期三, 27 十一月 2024 12:10:01 +0800 Subject: [PATCH] 添加确认对话框 --- _Main/UI/MacroPlannerWebApp/Component_FormFinancialSalesReport/Response_PanelExport_ButtonSearch_OnClick.def | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-) diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormFinancialSalesReport/Response_PanelExport_ButtonSearch_OnClick.def b/_Main/UI/MacroPlannerWebApp/Component_FormFinancialSalesReport/Response_PanelExport_ButtonSearch_OnClick.def index 39f0daa..43c2742 100644 --- a/_Main/UI/MacroPlannerWebApp/Component_FormFinancialSalesReport/Response_PanelExport_ButtonSearch_OnClick.def +++ b/_Main/UI/MacroPlannerWebApp/Component_FormFinancialSalesReport/Response_PanelExport_ButtonSearch_OnClick.def @@ -10,10 +10,9 @@ Body: [* if( not isnull( DataHolderTable.Data() ) ){ - productids := selectuniquevalues( DataHolderProduct.Data(), Elements, product, exists( dhGenerations.Data(), Elements, e, e.Generation() = product.Generation() ) - and exists( dhMQBMLBs.Data(), Elements, e, e.MLBMQB() = product.MQBMLB() ) - and exists( dhPowers.Data(), Elements, e, e.Power() = product.Power() ), product.ID() ); - + productids := selectuniquevalues( DataHolderProduct.Data(), Elements, product, ( dhGenerations.Data().Size() = 0 or exists( dhGenerations.Data(), Elements, e, e.Generation() = product.Generation() ) ) + and ( dhMQBMLBs.Data().Size() = 0 or exists( dhMQBMLBs.Data(), Elements, e, e.MLBMQB() = product.MQBMLB() ) ) + and ( dhPowers.Data().Size() = 0 or exists( dhPowers.Data(), Elements, e, e.Power() = product.Power() ) ), product.ID() ); DataHolderTable.Data().Generate( dhSearch.Data(), dhFactorys.Data(), productids ); } *] -- Gitblit v1.9.3