From 56578f002ef75c99dfb9bb9810352d83ab8885ee Mon Sep 17 00:00:00 2001
From: lazhen <17772815105@139.com>
Date: 星期一, 02 九月 2024 16:21:18 +0800
Subject: [PATCH] Merge branch 'dev' of http://47.101.211.7:10101/r/VWED into dev-zlg
---
_Main/UI/MacroPlannerWebApp/Component_FormProductionLineBatchData/Component_ListProductionLineBatchData.def | 2 +-
_Main/Sys/ImgAttr/ProductionLineBatchData.dme | 27 +++++++++++++++++++++++++++
_Main/UI/MacroPlannerWebApp/Component_StandardHoursReport/Response_pOperaction_bExport_OnClick.def | 2 +-
3 files changed, 29 insertions(+), 2 deletions(-)
diff --git a/_Main/Sys/ImgAttr/ProductionLineBatchData.dme b/_Main/Sys/ImgAttr/ProductionLineBatchData.dme
new file mode 100644
index 0000000..8d24045
--- /dev/null
+++ b/_Main/Sys/ImgAttr/ProductionLineBatchData.dme
@@ -0,0 +1,27 @@
+Quintiq file version 2.0
+#parent: #root
+TypeDataInterface ProductionLineBatchData
+{
+ TypeKey: '[412672.0.998406956]'
+ ImageDataMember ImageIsEnable
+ {
+ #keys: '1[414996.1.47042956]'
+ ImageSpecifications:
+ [
+ ImageDataMemberImageSpecification
+ {
+ Description: 'Enable'
+ Image: 'CHECKEDCHECKBOX'
+ Quill: 'object.IsEnable()'
+ Value: 'Enable'
+ }
+ ImageDataMemberImageSpecification
+ {
+ Description: 'Disable'
+ Image: 'EMPTYCHECKBOX'
+ Quill: 'not object.IsEnable()'
+ Value: 'Disable'
+ }
+ ]
+ }
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormProductionLineBatchData/Component_ListProductionLineBatchData.def b/_Main/UI/MacroPlannerWebApp/Component_FormProductionLineBatchData/Component_ListProductionLineBatchData.def
index ed4224a..d7fd926 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormProductionLineBatchData/Component_ListProductionLineBatchData.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormProductionLineBatchData/Component_ListProductionLineBatchData.def
@@ -28,7 +28,7 @@
]
Properties:
[
- Columns: '[{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"Unit1.Name","title":"Unit1","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"Unit1.Name"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"Unit2.Name","title":"Unit2","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"Unit2.Name"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"ShiftPattern1.Name","title":"Shift pattern 1","subtotals":"","tooltip":"","width":-1,"display":"shown","attribute":"ShiftPattern1.Name"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"ShiftPattern2.Name","title":"Shift pattern 2","subtotals":"","tooltip":"","width":-1,"display":"shown","attribute":"ShiftPattern2.Name"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"StartDate","title":"Start date","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"StartDate"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"EndDate","title":"End date","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"EndDate"}}]'
+ Columns: '[{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"ImageIsEnable","title":"ImageIsEnable","subtotals":"","tooltip":"","width":-1,"display":"shown","attribute":"ImageIsEnable"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"Unit1.Name","title":"Unit1","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"Unit1.Name"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"Unit2.Name","title":"Unit2","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"Unit2.Name"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"ShiftPattern1.Name","title":"Shift pattern 1","subtotals":"","tooltip":"","width":-1,"display":"shown","attribute":"ShiftPattern1.Name"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"ShiftPattern2.Name","title":"Shift pattern 2","subtotals":"","tooltip":"","width":-1,"display":"shown","attribute":"ShiftPattern2.Name"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"StartDate","title":"Start date","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"StartDate"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"EndDate","title":"End date","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"EndDate"}}]'
ContextMenu: 'listContextMenuProductionLineBatchData'
Taborder: 2
]
diff --git a/_Main/UI/MacroPlannerWebApp/Component_StandardHoursReport/Response_pOperaction_bExport_OnClick.def b/_Main/UI/MacroPlannerWebApp/Component_StandardHoursReport/Response_pOperaction_bExport_OnClick.def
index 2fee64b..0a3e46d 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_StandardHoursReport/Response_pOperaction_bExport_OnClick.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_StandardHoursReport/Response_pOperaction_bExport_OnClick.def
@@ -10,7 +10,7 @@
{
Body:
[*
- rows := selectset( dhTable.Data(),LocalRow,row,true );
+ rows := selectset( dhTable.Data(),LocalRow,row,exists( dhFinelEntity.Data(),Elements,entity,entity.DisplayName() = row.Name()) );
columns := selectset( dhTable.Data( ),LocalColumn,column,true );
LocalCell_Default::AsyncExport( RecycleBin, rows, columns );
*]
--
Gitblit v1.9.3