shecs
/
Basf_TCC7
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

111

This commit is contained in:
jackchenyang 2024-05-31 20:08:20 +08:00
parent 91d4a9f1e5
commit aefddc88f3
5 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
HJGL/.vs/HJGL/v17/.suo
View File

Binary file not shown.

10
HJGL/FineUIPro.Web/WeldingProcess/TestPackageManage/TestPackageManageItemEdit.aspx
View File

@ -243,14 +243,14 @@
var allCode = ""; var allCode = "";
var grid = F(grid1ClientID); var grid = F(grid1ClientID);
var selectedCell = grid.getSelectedCell(); var selectedCell = grid.getSelectedCell();
var selStrCode = grid.getCellValue(selectedCell[0], "WeldJointCode"); // var selStrCode = grid.getCellValue(selectedCell[0], "WeldJointCode");
if (values) { if (values) {
allCode = values["WeldJointCode"]; allCode = values["WeldJointCode"];
} }
if (selStrCode && selStrCode != "全部") //if (selStrCode && selStrCode != "全部")
{ //{
allCode +=","+selStrCode; // allCode +=","+selStrCode;
} //}
values["WeldJointCode"] = allCode; values["WeldJointCode"] = allCode;
// cancelEdit用来取消编辑 // cancelEdit用来取消编辑
grid.cancelEdit(); grid.cancelEdit();

3
HJGL/FineUIPro.Web/WeldingProcess/TestPackageManage/TestPackageManageItemEdit.aspx.cs
View File

@ -598,7 +598,8 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage
} }
ShowNotify("保存成功！", MessageBoxIcon.Success); ShowNotify("保存成功！", MessageBoxIcon.Success);
PageContext.RegisterStartupScript(ActiveWindow.GetWriteBackValueReference(this.PTP_ID) PageContext.RegisterStartupScript(ActiveWindow.GetWriteBackValueReference(this.PTP_ID)
+ ActiveWindow.GetHidePostBackReference()); + ActiveWindow.GetHidePostBackReference());
this.BindGrid();
} }
else else
{ {

2
HJGL/FineUIPro.Web/WeldingProcess/TestPackageManage/selectJointCode.aspx
View File

@ -11,7 +11,7 @@
<form id="form1" runat="server"> <form id="form1" runat="server">
<f:PageManager ID="PageManager1" AutoSizePanelID="Grid1" runat="server" /> <f:PageManager ID="PageManager1" AutoSizePanelID="Grid1" runat="server" />
<f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="焊口信息列表" runat="server" EnableCollapse="false" <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="焊口信息列表" runat="server" EnableCollapse="false"
DataKeyNames="WeldJointCode" EnableCheckBoxSelect="true" EnableMultiSelect="true" PageSize="100" AllowPaging="true" > DataKeyNames="WeldJointCode" EnableCheckBoxSelect="true" CheckBoxSelectOnly="true" EnableMultiSelect="true" PageSize="100" AllowPaging="true" >
<Columns> <Columns>
<f:RowNumberField /> <f:RowNumberField />
<f:RenderField ColumnID="WeldJointCode" MinWidth="200px" DataField="WeldJointCode" HeaderText="焊口编号" /> <f:RenderField ColumnID="WeldJointCode" MinWidth="200px" DataField="WeldJointCode" HeaderText="焊口编号" />

2
HJGL/FineUIPro.Web/WeldingProcess/TestPackageManage/selectJointCode.aspx.cs
View File

@ -87,7 +87,7 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage
{ {
query = query.Where(t => !listData.Contains(t.WeldJointCode)); query = query.Where(t => !listData.Contains(t.WeldJointCode));
} }
return query.ToList(); return query.OrderBy(t=>t.WeldJointCode).ToList();
} }