提交代码

2023-11-30 12:05:13 +08:00
parent 4f6bd5c96e
commit 4ad9007adb
5 changed files with 73 additions and 43 deletions
@@ -94,7 +94,7 @@
                                            <f:TextBox ID="txtWelderCode" runat="server" Label="焊工号" EmptyText="输入查询条件"  LabelAlign="Right" AutoPostBack="true" OnTextChanged="txtTextBox_TextChanged"></f:TextBox>
                                         <f:ToolbarFill ID="ToolbarFill1" runat="server">
                                        </f:ToolbarFill>
-                                           
+                                           <f:HiddenField runat="server" ID="hdWeldingDailyCode"></f:HiddenField>
                                        </Items>
                                    </f:Toolbar>
                                </Toolbars>
@@ -318,7 +318,9 @@ namespace FineUIPro.Web.HJGL.WeldingManage
                var unitWork = BLL.UnitWorkService.getUnitWorkByUnitWorkId(tvControlItem.SelectedNodeID);
                if (!string.IsNullOrEmpty(tvControlItem.SelectedNodeID) && unitWork != null)
                {
-                    PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("WeldReportEdit.aspx?unitWorkId={0}", tvControlItem.SelectedNodeID, "新增 - ")));
+                    //PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("WeldReportEdit.aspx?unitWorkId={0}", tvControlItem.SelectedNodeID, "新增 - ")));
+                    string window = String.Format("WeldReportEdit.aspx?unitWorkId={0}", tvControlItem.SelectedNodeID, "编辑 - ");
+                    PageContext.RegisterStartupScript(Window1.GetSaveStateReference(hdWeldingDailyCode.ClientID) + Window1.GetShowReference(window));
                }
                else
                {
@@ -465,7 +467,21 @@ namespace FineUIPro.Web.HJGL.WeldingManage
        /// <param name="e"></param>
        protected void Window1_Close(object sender, WindowCloseEventArgs e)
        {
+            string weldingDailyCode = hdWeldingDailyCode.Text;
            this.InitTreeMenu();//加载树
+            tvControlItem.SelectedNode.Expanded = true;
+            if (tvControlItem.SelectedNode.CommandName == "UnitWork")
+            {
+                tvControlItem.SelectedNode.Nodes.Clear();
+                BindNodes(tvControlItem.SelectedNode);
+                foreach (var item in tvControlItem.SelectedNode.Nodes)
+                {
+                    if (item.Text.Contains(weldingDailyCode))
+                    {
+                        tvControlItem.SelectedNodeID = item.NodeID;
+                    }
+                }
+            }
            this.BindGrid();
        }

@@ -7,12 +7,10 @@
 // </自动生成>
 //------------------------------------------------------------------------------

-namespace FineUIPro.Web.HJGL.WeldingManage
-{
+namespace FineUIPro.Web.HJGL.WeldingManage {
    
    
-    public partial class WeldReport
-    {
+    public partial class WeldReport {
        
        /// <summary>
        /// form1 控件。
@@ -212,6 +210,15 @@ namespace FineUIPro.Web.HJGL.WeldingManage
        /// </remarks>
        protected global::FineUIPro.ToolbarFill ToolbarFill1;
        
+        /// <summary>
+        /// hdWeldingDailyCode 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.HiddenField hdWeldingDailyCode;
+        
        /// <summary>
        /// ToolbarSeparator1 控件。
        /// </summary>
@@ -702,8 +702,8 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage

        protected void btnAccept_Click(object sender, EventArgs e)
        {
-            PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference());
-
+            //PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference());
+            PageContext.RegisterStartupScript(ActiveWindow.GetWriteBackValueReference(txtWeldingDailyCode.Text) + ActiveWindow.GetHidePostBackReference());
        }

        #endregion
@@ -964,6 +964,13 @@ namespace FineUIPro.Web.HJGL.WeldingManage
            {
                tvControlItem.SelectedNode.Nodes.Clear();
                BindNodes(tvControlItem.SelectedNode);
+                foreach (var item in tvControlItem.SelectedNode.Nodes)
+                {
+                    if (item.NodeID.Contains(hdTaskWeldJoint.Text.Trim()))
+                    {
+                        tvControlItem.SelectedNodeID = item.NodeID;
+                    }
+                }
            }
            var unit = BLL.UnitWorkService.GetUnitWorkByUnitWorkId(tvControlItem.SelectedNodeID);
            List<Model.View_HJGL_WeldingTask> GetWeldingTaskList = null;