From e5482b36218c8af85e83c0d6a068b24351836e51 Mon Sep 17 00:00:00 2001
From: lihongji <3117313295@qq.com>
Date: 星期二, 03 十二月 2024 16:12:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
_Main/UI/MacroPlannerWebApp/Component_FormDispatchShiftSchedulingInformation/Component_PanelDispatchShiftSchedulingInformation.def | 33 ++++++++++++++++++++++++++++++++-
1 files changed, 32 insertions(+), 1 deletions(-)
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormDispatchShiftSchedulingInformation/Component_PanelDispatchShiftSchedulingInformation.def b/_Main/UI/MacroPlannerWebApp/Component_FormDispatchShiftSchedulingInformation/Component_PanelDispatchShiftSchedulingInformation.def
index 45600a3..08039c7 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormDispatchShiftSchedulingInformation/Component_PanelDispatchShiftSchedulingInformation.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormDispatchShiftSchedulingInformation/Component_PanelDispatchShiftSchedulingInformation.def
@@ -5,7 +5,7 @@
BaseType: 'WebPanel'
Children:
[
- Component ButtonDispatch id:ButtonDispatch_715
+ Component bGenerateDispatchData
{
#keys: '[414996.1.100510694]'
BaseType: 'WebButton'
@@ -31,10 +31,41 @@
BaseType: 'WebDateSelector'
Properties:
[
+ Date: 9999-12-31
Label: 'EndDate'
Taborder: 1
]
}
+ Component cbCC
+ {
+ #keys: '[414996.1.172950712]'
+ BaseType: 'WebCheckbox'
+ Properties:
+ [
+ Label: '闀挎槬宸ュ巶'
+ Taborder: 3
+ ]
+ }
+ Component cbDL
+ {
+ #keys: '[414996.1.172950725]'
+ BaseType: 'WebCheckbox'
+ Properties:
+ [
+ Label: '澶ц繛宸ュ巶'
+ Taborder: 4
+ ]
+ }
+ Component bDispatch
+ {
+ #keys: '[414996.1.172950741]'
+ BaseType: 'WebButton'
+ Properties:
+ [
+ Label: '涓嬪彂'
+ Taborder: 5
+ ]
+ }
]
Properties:
[
--
Gitblit v1.9.3