提交代码

SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldReport.aspx.cs

@@ -355,7 +355,9 @@ namespace FineUIPro.Web.HJGL.WeldingManage
                     //    Alert.ShowInTop("该日报已点口，不能编辑！", MessageBoxIcon.Warning);
                     //    return;
                     //}
-                    PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("WeldReportEdit.aspx?WeldingDailyId={0}", tvControlItem.SelectedNodeID, "维护 - ")));
+                    //PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("WeldReportEdit.aspx?WeldingDailyId={0}", tvControlItem.SelectedNodeID, "维护 - ")));
+                    string window = String.Format("WeldReportEdit.aspx?WeldingDailyId={0}", tvControlItem.SelectedNodeID, "编辑 - ");
+                    PageContext.RegisterStartupScript(Window1.GetSaveStateReference(hdWeldingDailyCode.ClientID) + Window1.GetShowReference(window));
                 }
                 else
                 {
@@ -482,6 +484,10 @@ namespace FineUIPro.Web.HJGL.WeldingManage
                     }
                 }
             }
+            else
+            {
+                tvControlItem.SelectedNode.ParentNode.Expanded = true;
+            }
             this.BindGrid();
         }
 

SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldTask.aspx.cs

@@ -307,7 +307,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
                     hasAdd = true;
                 }
             }
-            if (this.tvControlItem.SelectedNode.CommandName == "Date" && !hasAdd)
+            if (this.tvControlItem.SelectedNodeID.Contains("|") && !hasAdd)
             {
                 this.Grid1.Columns[12].Hidden = true;
                 this.btnSave.Hidden = true;
@@ -959,6 +959,8 @@ namespace FineUIPro.Web.HJGL.WeldingManage
             string str1 = hdItemsString.Text;
             string str2 = hdTaskWeldJoint.Text;
             this.InitTreeMenu();
+            if (tvControlItem.SelectedNode != null)
+            {
                 tvControlItem.SelectedNode.Expanded = true;
                 if (tvControlItem.SelectedNode.CommandName == "单位工程")
                 {
@@ -972,11 +974,24 @@ namespace FineUIPro.Web.HJGL.WeldingManage
                         }
                     }
                 }
+            }
+            else
+            {
+                foreach (var item in tvControlItem.Nodes[1].Nodes)
+                {
+                    if (item.NodeID.Contains(tvControlItem.SelectedNodeID.Split('|')[0]))
+                    {
+                        item.Nodes.Clear();
+                        item.Expanded = true;
+                        BindNodes(item);
+                    }
+                }
+            }
             var unit = BLL.UnitWorkService.GetUnitWorkByUnitWorkId(tvControlItem.SelectedNodeID);
             List<Model.View_HJGL_WeldingTask> GetWeldingTaskList = null;
             if (unit == null)
             {
-                GetWeldingTaskList = BLL.WeldTaskService.GetWeldingTaskList(this.CurrUser.LoginProjectId, tvControlItem.SelectedNode.ParentNode.NodeID, Convert.ToDateTime(hdTaskWeldJoint.Text.Trim()));
+                GetWeldingTaskList = BLL.WeldTaskService.GetWeldingTaskList(this.CurrUser.LoginProjectId, tvControlItem.SelectedNodeID.Split('|')[0], Convert.ToDateTime(hdTaskWeldJoint.Text.Trim()));
             }
             else
             {