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

Compare commits

base: shecs:b22eb421ec79e7d3f547e6228d9697cd5edc7036
Branches Tags
shecs:master
shecs:Feature_20240510
..
compare: shecs:8dc175f1e71d8f101947198942e43a49b40e001f
Branches Tags
shecs:master
shecs:Feature_20240510

No commits in common. "b22eb421ec79e7d3f547e6228d9697cd5edc7036" and "8dc175f1e71d8f101947198942e43a49b40e001f" have entirely different histories.
b22eb421ec ... 8dc175f1e7

4 changed files with 15 additions and 13 deletions
Show Stats 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,18 +240,20 @@
} }
function updateGridRow(rowId, values) { function updateGridRow(rowId, values) {
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"];
} // console.log('allCode=' + allCode)
if (selStrCode && selStrCode != "全部") //}
{ //if (selStrCode && selStrCode != "全部")
allCode +=","+selStrCode; //{
} // allCode +=","+selStrCode;
values["WeldJointCode"] = allCode; //}
//// allCode = allCode.substring(0, allCode.length - 1);
//values["WeldJointCode"] = allCode;
// cancelEdit用来取消编辑 // cancelEdit用来取消编辑
grid.cancelEdit(); grid.cancelEdit();

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

@ -43,7 +43,7 @@
} }
function onGridRowSelect() { function onGridRowSelect() {
console.log(1);
// 返回当前活动Window对象（浏览器窗口对象通过F.getActiveWindow().window获取） // 返回当前活动Window对象（浏览器窗口对象通过F.getActiveWindow().window获取）
var activeWindow = F.getActiveWindow(); 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) var query = Funs.DB.Pipeline_WeldJoint.Where(t => t.PipelineId == PipelineID)
.OrderBy(t => t.WeldJointCode).AsQueryable(); .OrderBy(t => t.WeldJointCode).AsQueryable();
if (listData.Count>0) if (listData.Count>0 && string.IsNullOrEmpty(this.ptpId))
{ {
query = query.Where(t => !listData.Contains(t.WeldJointCode)); query = query.Where(t => !listData.Contains(t.WeldJointCode));
} }