diff --git a/BWP.B3_YunKen.Web/Pages/B3YunKen/Overlays/ProductNoticeEdit_Ext.cs b/BWP.B3_YunKen.Web/Pages/B3YunKen/Overlays/ProductNoticeEdit_Ext.cs index bf57e6e..e3a12c9 100644 --- a/BWP.B3_YunKen.Web/Pages/B3YunKen/Overlays/ProductNoticeEdit_Ext.cs +++ b/BWP.B3_YunKen.Web/Pages/B3YunKen/Overlays/ProductNoticeEdit_Ext.cs @@ -20,9 +20,10 @@ namespace BWP.Web.Pages.B3YunKen.Overlays } _detailGrid.Columns.Add(new DFEditGridColumn("Detail_Customer_ID")); } + protected override DFCollectionEditor AddGridByOrderByID() { - return new DFCollectionEditor(() => Dmo.Details.OrderBy(x => x.OrderByID).ToList()); + return new DFCollectionEditor(() => new DFEditGridPhonyData(Dmo.Details.OrderBy(x => x.OrderByID), Dmo.Details)); } } } diff --git a/BWP.B3_YunKen.Web/Pages/Utils/Second_ConvertRatioRowManager.cs b/BWP.B3_YunKen.Web/Pages/Utils/Second_ConvertRatioRowManager.cs index fbe4536..66dfc6a 100644 --- a/BWP.B3_YunKen.Web/Pages/Utils/Second_ConvertRatioRowManager.cs +++ b/BWP.B3_YunKen.Web/Pages/Utils/Second_ConvertRatioRowManager.cs @@ -62,8 +62,8 @@ namespace BWP.Web.Pages.Utils if (_unitNumInput != null) { - builder.Append(@"if({convertDirection}=='双向转换'||{convertDirection}=='由辅至主'){alert(1); if({ratioRight}>0 && {ratioLeft}>0 && {unitRatioLeft} > 0 && {unitRatioRight}>0) - {alert('1');{setUnitNum}}}" + builder.Append(@"if({convertDirection}=='双向转换'||{convertDirection}=='由辅至主'){if({ratioRight}>0 && {ratioLeft}>0 && {unitRatioLeft} > 0 && {unitRatioRight}>0) + {{setUnitNum}}}" .Replace("{convertDirection}", ConvertDirection) .Replace("{ratioRight}", SecondUnitRatio) .Replace("{ratioLeft}", MainUnitRatio)