提交代码

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

@@ -209,7 +209,8 @@ namespace FineUIPro.Web.HJGL.WeldingManage
                             && x.UnitWorkId == this.UnitWorkId
                             && x.PipeArea == PipeArea
                             && x.PipelineCode.Contains(this.txtPipelineCode.Text.Trim())
-                       orderby x.PipelineCode select x).ToList();
+                            orderby x.PipelineCode
+                            select x).ToList();
             if (!string.IsNullOrEmpty(drpFlowingSection.SelectedValue) && drpFlowingSection.SelectedValue != Const._Null)
             {
                 pipeline = pipeline.Where(x => x.FlowingSection == drpFlowingSection.SelectedValue).ToList();

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

@@ -304,13 +304,13 @@ namespace FineUIPro.Web.HJGL.WeldingManage
             }
             else
             {
-                SaveData();
+                SaveData(true);
             }
         }
         /// <summary>
         /// 提交数据
         /// </summary>
-        private void SaveData()
+        private void SaveData(bool isClosed)
         {
             // if (string.IsNullOrEmpty(this.txtWeldJointCode.Text.Trim()) || this.drpPipingClass.SelectedValue == BLL.Const._Null || this.drpMaterial1.SelectedValue == BLL.Const._Null || this.drpMaterial2.SelectedValue == BLL.Const._Null || this.drpWeldTypeCode.SelectedValue == BLL.Const._Null || string.IsNullOrEmpty(this.hdWeldingMethodId.Text) || string.IsNullOrEmpty(this.txtWpqId.Text.Trim()))
             if (string.IsNullOrEmpty(this.txtWeldJointCode.Text.Trim()) || this.drpPipingClass.SelectedValue == BLL.Const._Null || this.drpMaterial1.SelectedValue == BLL.Const._Null || this.drpMaterial2.SelectedValue == BLL.Const._Null || this.drpWeldTypeCode.SelectedValue == BLL.Const._Null)
@@ -457,9 +457,12 @@ namespace FineUIPro.Web.HJGL.WeldingManage
 
                 BLL.WeldJointService.AddWeldJoint(joint);
             }
+            if (isClosed)
+            {
                 ShowNotify("提交成功！", MessageBoxIcon.Success);
                 PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference());
             }
+        }
 
         /// <summary>
         /// 根据焊缝类型获取探伤类型
@@ -871,7 +874,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
         {
             if (string.IsNullOrEmpty(this.WeldJointId))
             {
-                SaveData();
+                SaveData(false);
             }
             PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("~/AttachFile/webuploader.aspx?toKeyId={0}&path=FileUpload/WeldJoint&menuId={1}", WeldJointId, BLL.Const.HJGL_WeldJointMenuId)));
         }

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

@@ -959,6 +959,12 @@ namespace FineUIPro.Web.HJGL.WeldingManage
             string str1 = hdItemsString.Text;
             string str2 = hdTaskWeldJoint.Text;
             this.InitTreeMenu();
+            tvControlItem.SelectedNode.Expanded = true;
+            if (tvControlItem.SelectedNode.CommandName == "单位工程")
+            {
+                tvControlItem.SelectedNode.Nodes.Clear();
+                BindNodes(tvControlItem.SelectedNode);
+            }
             var unit = BLL.UnitWorkService.GetUnitWorkByUnitWorkId(tvControlItem.SelectedNodeID);
             List<Model.View_HJGL_WeldingTask> GetWeldingTaskList = null;
             if (unit == null)