diff --git a/HJGL/.vs/HJGL/config/applicationhost.config b/HJGL/.vs/HJGL/config/applicationhost.config index ada02a4..e47cfd0 100644 --- a/HJGL/.vs/HJGL/config/applicationhost.config +++ b/HJGL/.vs/HJGL/config/applicationhost.config @@ -250,7 +250,7 @@ - + diff --git a/HJGL/FineUIPro.Web/WeldingProcess/TestPackageManage/TestPackageManageItemEdit.aspx b/HJGL/FineUIPro.Web/WeldingProcess/TestPackageManage/TestPackageManageItemEdit.aspx index 7c7e8a3..66011c4 100644 --- a/HJGL/FineUIPro.Web/WeldingProcess/TestPackageManage/TestPackageManageItemEdit.aspx +++ b/HJGL/FineUIPro.Web/WeldingProcess/TestPackageManage/TestPackageManageItemEdit.aspx @@ -229,6 +229,7 @@ var menuID = '<%= Menu1.ClientID %>'; var grid1ClientID = '<%=Grid1.ClientID%>' var window1ClientID = '<%= Window1.ClientID %>'; + var ptpId = '<%=this.PTP_ID%>'; // 返回false,来阻止浏览器右键菜单 function onRowContextMenu(event, rowId) { F(menuID).show(); //showAt(event.pageX, event.pageY); @@ -238,9 +239,21 @@ __doPostBack(null, 'reloadGrid'); } function updateGridRow(rowId, values) { - + + // 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; // cancelEdit用来取消编辑 grid.cancelEdit(); @@ -254,7 +267,7 @@ if (selectedCell) { var wnd = F(window1ClientID); // 由于需要在顶层页面中弹出,所以不能设置 ./grideditor_selectfromwindow_clientscript_iframe.aspx,必须通过 baseUrl 来绝对定位 - wnd.show(F.baseUrl + "WeldingProcess/TestPackageManage/selectJointCode.aspx?rowId=" + selectedCell[0] + "&jointcode=" + selStrCode); + wnd.show(F.baseUrl + "WeldingProcess/TestPackageManage/selectJointCode.aspx?rowId=" + selectedCell[0] + "&jointcode=" + selStrCode + "&ptpId=" + ptpId); } } diff --git a/HJGL/FineUIPro.Web/WeldingProcess/TestPackageManage/TestPackageManageItemEdit.aspx.cs b/HJGL/FineUIPro.Web/WeldingProcess/TestPackageManage/TestPackageManageItemEdit.aspx.cs index 2bdb381..c05e947 100644 --- a/HJGL/FineUIPro.Web/WeldingProcess/TestPackageManage/TestPackageManageItemEdit.aspx.cs +++ b/HJGL/FineUIPro.Web/WeldingProcess/TestPackageManage/TestPackageManageItemEdit.aspx.cs @@ -536,7 +536,10 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage BLL.Sys_LogService.AddLog(BLL.Const.System_3, this.CurrUser.LoginProjectId, this.CurrUser.UserId, Const.TestPackageManageEditMenuId, Const.BtnAdd, this.PTP_ID); } JArray teamGroupData = Grid1.GetMergedData(); - + if (listSelects.Count > 0) + { + BLL.TestPackageManageEditService.DeletePipelineListByPTP_ID(testPackage.PTP_ID); + } foreach (JObject teamGroupRow in teamGroupData) { string PipelineId = teamGroupRow["id"].ToString(); diff --git a/HJGL/FineUIPro.Web/WeldingProcess/TestPackageManage/selectJointCode.aspx b/HJGL/FineUIPro.Web/WeldingProcess/TestPackageManage/selectJointCode.aspx index 671d63e..2df554e 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" EnableMultiSelect="true" PageSize="100" AllowPaging="true" > @@ -42,7 +42,8 @@ return value == 1 ? '男' : '女'; } - function onGridRowSelect() { + function onGridRowSelect() { + console.log(1); // 返回当前活动Window对象(浏览器窗口对象通过F.getActiveWindow().window获取) var activeWindow = F.getActiveWindow(); // 选中行数据 diff --git a/HJGL/FineUIPro.Web/WeldingProcess/TestPackageManage/selectJointCode.aspx.cs b/HJGL/FineUIPro.Web/WeldingProcess/TestPackageManage/selectJointCode.aspx.cs index 5080d63..df49f0c 100644 --- a/HJGL/FineUIPro.Web/WeldingProcess/TestPackageManage/selectJointCode.aspx.cs +++ b/HJGL/FineUIPro.Web/WeldingProcess/TestPackageManage/selectJointCode.aspx.cs @@ -14,11 +14,13 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage { private string rowId=string.Empty; private string jointcode=string.Empty; + private string ptpId=string.Empty; protected void Page_Load(object sender, EventArgs e) { this.rowId = Request.Params["rowId"]; this.jointcode = Request.Params["jointcode"]; + this.ptpId = Request.Params["ptpId"]; if (string.IsNullOrEmpty(this.rowId)) { ShowNotify("请先选择某条管线信息!", MessageBoxIcon.Warning); @@ -76,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) + if (listData.Count>0 && string.IsNullOrEmpty(this.ptpId)) { query = query.Where(t => !listData.Contains(t.WeldJointCode)); }