11

HJGL/.vs/HJGL/config/applicationhost.config

@@ -250,7 +250,7 @@
             </site>
             <site name="FineUIPro.Web(10)" id="13">
                 <application path="/" applicationPool="Clr4IntegratedAppPool">
-                    <virtualDirectory path="/" physicalPath="E:\MyProject\ZJ_BSF\Basf_TCC7\HJGL\FineUIPro.Web" />
+                    <virtualDirectory path="/" physicalPath="E:\湛江巴斯夫\Basf_TCC7\HJGL\FineUIPro.Web" />
                 </application>
                 <bindings>
                     <binding protocol="http" bindingInformation="*:13960:localhost" />

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);
             }
         }
         

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();

HJGL/FineUIPro.Web/WeldingProcess/TestPackageManage/selectJointCode.aspx

@@ -11,7 +11,7 @@
     <form id="form1" runat="server">
           <f:PageManager ID="PageManager1" AutoSizePanelID="Grid1" runat="server" />
         <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"   EnableMultiSelect="true" PageSize="100" AllowPaging="true" >
             <Columns>
                 <f:RowNumberField />
                 <f:RenderField  ColumnID="WeldJointCode" MinWidth="200px" DataField="WeldJointCode" HeaderText="焊口编号" />
@@ -42,7 +42,8 @@
             return value == 1 ? '男' : '女';
         }
         
-        function onGridRowSelect() {
+         function onGridRowSelect() {
+             console.log(1);
             // 返回当前活动Window对象（浏览器窗口对象通过F.getActiveWindow().window获取）
             var activeWindow = F.getActiveWindow();
             // 选中行数据

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));
             }