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

1121212

This commit is contained in:
jackchenyang 2024-05-23 13:56:30 +08:00
parent 2b85402218
commit 8f88fd59a6
4 changed files with 13 additions and 15 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.

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

@ -240,20 +240,18 @@
}
function updateGridRow(rowId, values) {
// var allCode = "";
var allCode = "";
var grid = F(grid1ClientID);
//var selectedCell = grid.getSelectedCell();
//var selStrCode = grid.getCellValue(selectedCell[0], "WeldJointCode");
//if (values) {
// allCode = values["WeldJointCode"];
// console.log('allCode=' + allCode)
//}
//if (selStrCode && selStrCode != "全部")
//{
// allCode +=","+selStrCode;
//}
//// allCode = allCode.substring(0, allCode.length - 1);
//values["WeldJointCode"] = allCode;
var selectedCell = grid.getSelectedCell();
var selStrCode = grid.getCellValue(selectedCell[0], "WeldJointCode");
if (values) {
allCode = values["WeldJointCode"];
}
if (selStrCode && selStrCode != "全部")
{
allCode +=","+selStrCode;
}
values["WeldJointCode"] = allCode;
// cancelEdit用来取消编辑
grid.cancelEdit();

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

@ -43,7 +43,7 @@
}
function onGridRowSelect() {
console.log(1);
// 返回当前活动Window对象（浏览器窗口对象通过F.getActiveWindow().window获取）
var activeWindow = F.getActiveWindow();
// 选中行数据

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

@ -78,7 +78,7 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage
}
var query = Funs.DB.Pipeline_WeldJoint.Where(t => t.PipelineId == PipelineID)
.OrderBy(t => t.WeldJointCode).AsQueryable();
if (listData.Count>0 && string.IsNullOrEmpty(this.ptpId))
if (listData.Count>0)
{
query = query.Where(t => !listData.Contains(t.WeldJointCode));
}