From cbf2cc895f1d1e7dcf522a462e77709d92667747 Mon Sep 17 00:00:00 2001
From: lazhen <17772815105@139.com>
Date: 星期五, 11 十月 2024 18:10:13 +0800
Subject: [PATCH] Merge branch 'dev' of http://47.101.211.7:10101/r/VWED into dev-zlg
---
_Main/UI/MacroPlannerWebApp/Component_FormProductionLineBatchSetShiftPattern/Component_PanelRight.def | 164 +++++++++++++++++++++++++++++++++---------------------
1 files changed, 99 insertions(+), 65 deletions(-)
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormProductionLineBatchSetShiftPattern/Component_PanelRight.def b/_Main/UI/MacroPlannerWebApp/Component_FormProductionLineBatchSetShiftPattern/Component_PanelRight.def
index 8538493..3731f86 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormProductionLineBatchSetShiftPattern/Component_PanelRight.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormProductionLineBatchSetShiftPattern/Component_PanelRight.def
@@ -5,69 +5,6 @@
BaseType: 'WebPanel'
Children:
[
- Component cbMonday
- {
- #keys: '[414996.1.116589495]'
- BaseType: 'WebCheckbox'
- Properties:
- [
- Taborder: 3
- ]
- }
- Component cbTuesday
- {
- #keys: '[414996.1.116589517]'
- BaseType: 'WebCheckbox'
- Properties:
- [
- Taborder: 4
- ]
- }
- Component cbWednesday
- {
- #keys: '[414996.1.116589519]'
- BaseType: 'WebCheckbox'
- Properties:
- [
- Taborder: 5
- ]
- }
- Component cbThursday
- {
- #keys: '[414996.1.116589521]'
- BaseType: 'WebCheckbox'
- Properties:
- [
- Taborder: 6
- ]
- }
- Component cbFriday
- {
- #keys: '[414996.1.116589523]'
- BaseType: 'WebCheckbox'
- Properties:
- [
- Taborder: 7
- ]
- }
- Component cbSaturday
- {
- #keys: '[414996.1.116589525]'
- BaseType: 'WebCheckbox'
- Properties:
- [
- Taborder: 8
- ]
- }
- Component cbSunday
- {
- #keys: '[414996.1.116589527]'
- BaseType: 'WebCheckbox'
- Properties:
- [
- Taborder: 9
- ]
- }
Component dsStartDate
{
#keys: '[414996.1.116589712]'
@@ -75,7 +12,7 @@
Properties:
[
Label: 'Start'
- Taborder: 1
+ Taborder: 2
]
}
Component dsEndDate
@@ -85,7 +22,7 @@
Properties:
[
Label: 'End'
- Taborder: 2
+ Taborder: 3
]
}
Component LabelSelectUnit
@@ -105,6 +42,103 @@
Properties:
[
Label: 'Apply'
+ Taborder: 11
+ ]
+ }
+ Component ddlShiftPattern
+ {
+ #keys: '[414996.1.116430349]'
+ BaseType: 'WebDropDownList'
+ Databinding: 'ShiftPattern'
+ Children:
+ [
+ Component deContent710 id:deContent710_593
+ {
+ #keys: '[414996.1.116430350]'
+ BaseType: 'WebDataExtractor'
+ Properties:
+ [
+ DataType: 'MacroPlan'
+ Source: 'MacroPlan'
+ Taborder: 0
+ Transformation: 'ShiftPattern'
+ ]
+ }
+ ]
+ Properties:
+ [
+ DisplayField: 'Name'
+ Label: 'Shift pattern 1'
+ Taborder: 1
+ ]
+ }
+ Component cbMonday
+ {
+ #keys: '[414996.1.117120493]'
+ BaseType: 'WebCheckbox'
+ Properties:
+ [
+ Label: 'Monday'
+ Taborder: 4
+ ]
+ }
+ Component cbTuesday
+ {
+ #keys: '[414996.1.117120516]'
+ BaseType: 'WebCheckbox'
+ Properties:
+ [
+ Label: 'Tuesday'
+ Taborder: 5
+ ]
+ }
+ Component cbWednesday
+ {
+ #keys: '[414996.1.117120539]'
+ BaseType: 'WebCheckbox'
+ Properties:
+ [
+ Label: 'Wednesday'
+ Taborder: 6
+ ]
+ }
+ Component cbThursday
+ {
+ #keys: '[414996.1.117120576]'
+ BaseType: 'WebCheckbox'
+ Properties:
+ [
+ Label: 'Thursday'
+ Taborder: 7
+ ]
+ }
+ Component cbFriday
+ {
+ #keys: '[414996.1.117120599]'
+ BaseType: 'WebCheckbox'
+ Properties:
+ [
+ Label: 'Friday'
+ Taborder: 8
+ ]
+ }
+ Component cbSaturday id:cbSaturday_682
+ {
+ #keys: '[414996.1.117120636]'
+ BaseType: 'WebCheckbox'
+ Properties:
+ [
+ Label: 'Saturday'
+ Taborder: 9
+ ]
+ }
+ Component cbSunday
+ {
+ #keys: '[414996.1.117120659]'
+ BaseType: 'WebCheckbox'
+ Properties:
+ [
+ Label: 'Sunday'
Taborder: 10
]
}
--
Gitblit v1.9.3