From 63de54ec601c2b1c6c62b011442458d963ef9036 Mon Sep 17 00:00:00 2001
From: lazhen <17772815105@139.com>
Date: 星期五, 30 八月 2024 10:20:53 +0800
Subject: [PATCH] Merge branch 'dev' of http://47.101.211.7:10101/r/VWED into dev-zlg
---
_Main/UI/MacroPlannerWebApp/Component_FormScheduleSummaryReport/Response_PanelRibbon322_88_bExport_OnClick.def | 15 ++++++++++++++-
1 files changed, 14 insertions(+), 1 deletions(-)
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormScheduleSummaryReport/Response_PanelRibbon322_88_bExport_OnClick.def b/_Main/UI/MacroPlannerWebApp/Component_FormScheduleSummaryReport/Response_PanelRibbon322_88_bExport_OnClick.def
index 71cef3e..954011e 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormScheduleSummaryReport/Response_PanelRibbon322_88_bExport_OnClick.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormScheduleSummaryReport/Response_PanelRibbon322_88_bExport_OnClick.def
@@ -11,7 +11,20 @@
[*
rows := selectset( dhComparisonData854.Data(),LocalRow,row,exists( dhFinelEntity.Data(),Elements,entity,entity.DisplayName() = row.Name() ));
columns := selectset( dhComparisonData854.Data(),LocalColumn,column,dhStartDate.Data() <= column.Date() and dhEndDate.Data() > column.Date() );
- LocalCell_ScheduleSummary::AsyncExport( RecycleBin,rows,columns );
+ attrbutes := construct( Strings );
+ if( cbShiftPlan.Checked() ){
+ attrbutes.Add( "ShiftPattern" );
+ }
+ if( cbWorkday.Checked() ){
+ attrbutes.Add( "WorkingDay" );
+ }
+ if( cbCapacity.Checked() ){
+ attrbutes.Add( "Capacity" );
+ }
+ if( cbOutput.Checked() ){
+ attrbutes.Add( "Output" );
+ }
+ LocalCell_ScheduleSummary::AsyncExport( RecycleBin,rows,columns ,attrbutes );
//Application.Download( "浜у嚭瀵煎叆妯℃澘.xlsx",data.AsBinaryData() );
*]
GroupServerCalls: false
--
Gitblit v1.9.3