From 5cbda986bdf5af9eef9c4d52f48fb6ad41362bab Mon Sep 17 00:00:00 2001 From: hongji.li <hongji.a.li@capgemini.com> Date: 星期四, 21 九月 2023 23:59:46 +0800 Subject: [PATCH] Merge branch 'dev' of http://47.101.211.7:10101/r/TIANMA_JITUAN into dev_lhj --- _Main/UI/MacroPlannerWebApp/Component_FormOrderLock/Response_PanelOrderLockHeader_545_RadioButtonGroupOrderLockHeader_OnChanged.def | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormOrderLock/Response_PanelOrderLockHeader_545_RadioButtonGroupOrderLockHeader_OnChanged.def b/_Main/UI/MacroPlannerWebApp/Component_FormOrderLock/Response_PanelOrderLockHeader_545_RadioButtonGroupOrderLockHeader_OnChanged.def index 5e6da38..c393843 100644 --- a/_Main/UI/MacroPlannerWebApp/Component_FormOrderLock/Response_PanelOrderLockHeader_545_RadioButtonGroupOrderLockHeader_OnChanged.def +++ b/_Main/UI/MacroPlannerWebApp/Component_FormOrderLock/Response_PanelOrderLockHeader_545_RadioButtonGroupOrderLockHeader_OnChanged.def @@ -19,18 +19,18 @@ newfilter := ""; findcount := 0; traverse( existfilterlist, Elements, filter ){ - if( filter.FindString( "IsFirmed()", 0 ) >= 0 ){ + if( filter.FindString( "IsLocked()", 0 ) >= 0 ){ if( this.BoundValue() = "locked" ){ if( newfilter = "" ){ - newfilter := "( object.IsFirmed() = true )"; + newfilter := "( object.IsLocked() = true )"; }else{ - newfilter := newfilter + " and " + "( object.IsFirmed() = true )"; + newfilter := newfilter + " and " + "( object.IsLocked() = true )"; } }else if( this.BoundValue() = "unlocked" ){ if( newfilter = "" ){ - newfilter := "( object.IsFirmed() = false )"; + newfilter := "( object.IsLocked() = false )"; }else{ - newfilter := newfilter + " and " + "( object.IsFirmed() = false )"; + newfilter := newfilter + " and " + "( object.IsLocked() = false )"; } }else if( this.BoundValue() = "all" ){ newfilter := newfilter + ""; @@ -48,15 +48,15 @@ if( findcount = 0 ){ if( this.BoundValue() = "locked" ){ if( newfilter = "" ){ - newfilter := "( object.IsFirmed() = true )"; + newfilter := "( object.IsLocked() = true )"; }else{ - newfilter := newfilter + " and " + "( object.IsFirmed() = true )"; + newfilter := newfilter + " and " + "( object.IsLocked() = true )"; } }else if( this.BoundValue() = "unlocked" ){ if( newfilter = "" ){ - newfilter := "( object.IsFirmed() = false )"; + newfilter := "( object.IsLocked() = false )"; }else{ - newfilter := newfilter + " and " + "( object.IsFirmed() = false )"; + newfilter := newfilter + " and " + "( object.IsLocked() = false )"; } }else if( this.BoundValue() = "all" ){ newfilter := newfilter + ""; -- Gitblit v1.9.3