From 97615b518ccdf965a5692a8c26491b822c5e6961 Mon Sep 17 00:00:00 2001 From: duanluohua Date: Mon, 8 Jan 2018 10:39:01 +0800 Subject: [PATCH] =?UTF-8?q?=E9=94=99=E8=AF=AF=E6=8F=90=E4=BA=A4=E5=8D=95No?= =?UTF-8?q?.45478=20=E3=80=90=E8=AE=A2=E5=8D=95=E8=BD=AC=E7=94=9F=E4=BA=A7?= =?UTF-8?q?=E3=80=91=E7=95=8C=E9=9D=A2=E8=BE=93=E5=85=A5=E8=BE=85=E6=95=B0?= =?UTF-8?q?=E9=87=8F=EF=BC=8C=E4=B8=BB=E6=95=B0=E9=87=8F=E4=B8=8D=E4=BC=9A?= =?UTF-8?q?=E8=87=AA=E5=8A=A8=E5=8F=98=E5=8C=96=20=E3=80=90=E7=94=9F?= =?UTF-8?q?=E4=BA=A7=E9=80=9A=E7=9F=A5=E5=8D=95=E3=80=91=E6=98=8E=E7=BB=86?= =?UTF-8?q?=E7=9A=84=E5=88=A0=E9=99=A4=E6=8C=89=E9=92=AE=E4=B8=8D=E8=B5=B7?= =?UTF-8?q?=E4=BD=9C=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Pages/B3YunKen/Overlays/ProductNoticeEdit_Ext.cs | 3 ++- .../Pages/Utils/Second_ConvertRatioRowManager.cs | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) 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)