diff --git a/HJGL/.vs/HJGL/v17/.suo b/HJGL/.vs/HJGL/v17/.suo index 14c418f..f77f6c1 100644 Binary files a/HJGL/.vs/HJGL/v17/.suo and b/HJGL/.vs/HJGL/v17/.suo differ diff --git a/HJGL/FineUIPro.Web/WeldingProcess/TestPackageManage/TestPackageManageItemEdit.aspx b/HJGL/FineUIPro.Web/WeldingProcess/TestPackageManage/TestPackageManageItemEdit.aspx index 2753d98..d89ed06 100644 --- a/HJGL/FineUIPro.Web/WeldingProcess/TestPackageManage/TestPackageManageItemEdit.aspx +++ b/HJGL/FineUIPro.Web/WeldingProcess/TestPackageManage/TestPackageManageItemEdit.aspx @@ -243,14 +243,14 @@ var allCode = ""; var grid = F(grid1ClientID); var selectedCell = grid.getSelectedCell(); - var selStrCode = grid.getCellValue(selectedCell[0], "WeldJointCode"); + // var selStrCode = grid.getCellValue(selectedCell[0], "WeldJointCode"); if (values) { allCode = values["WeldJointCode"]; } - if (selStrCode && selStrCode != "全部") - { - allCode +=","+selStrCode; - } + //if (selStrCode && selStrCode != "全部") + //{ + // allCode +=","+selStrCode; + //} values["WeldJointCode"] = allCode; // cancelEdit用来取消编辑 grid.cancelEdit(); diff --git a/HJGL/FineUIPro.Web/WeldingProcess/TestPackageManage/TestPackageManageItemEdit.aspx.cs b/HJGL/FineUIPro.Web/WeldingProcess/TestPackageManage/TestPackageManageItemEdit.aspx.cs index 616e106..7a53c4a 100644 --- a/HJGL/FineUIPro.Web/WeldingProcess/TestPackageManage/TestPackageManageItemEdit.aspx.cs +++ b/HJGL/FineUIPro.Web/WeldingProcess/TestPackageManage/TestPackageManageItemEdit.aspx.cs @@ -598,7 +598,8 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage } ShowNotify("保存成功!", MessageBoxIcon.Success); PageContext.RegisterStartupScript(ActiveWindow.GetWriteBackValueReference(this.PTP_ID) - + ActiveWindow.GetHidePostBackReference()); + + ActiveWindow.GetHidePostBackReference()); + this.BindGrid(); } else { diff --git a/HJGL/FineUIPro.Web/WeldingProcess/TestPackageManage/selectJointCode.aspx b/HJGL/FineUIPro.Web/WeldingProcess/TestPackageManage/selectJointCode.aspx index 5f9faa0..11ddf4b 100644 --- a/HJGL/FineUIPro.Web/WeldingProcess/TestPackageManage/selectJointCode.aspx +++ b/HJGL/FineUIPro.Web/WeldingProcess/TestPackageManage/selectJointCode.aspx @@ -11,7 +11,7 @@
+ DataKeyNames="WeldJointCode" EnableCheckBoxSelect="true" CheckBoxSelectOnly="true" EnableMultiSelect="true" PageSize="100" AllowPaging="true" > diff --git a/HJGL/FineUIPro.Web/WeldingProcess/TestPackageManage/selectJointCode.aspx.cs b/HJGL/FineUIPro.Web/WeldingProcess/TestPackageManage/selectJointCode.aspx.cs index cedd517..7ad88e4 100644 --- a/HJGL/FineUIPro.Web/WeldingProcess/TestPackageManage/selectJointCode.aspx.cs +++ b/HJGL/FineUIPro.Web/WeldingProcess/TestPackageManage/selectJointCode.aspx.cs @@ -87,7 +87,7 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage { query = query.Where(t => !listData.Contains(t.WeldJointCode)); } - return query.ToList(); + return query.OrderBy(t=>t.WeldJointCode).ToList(); }