From d372b10ce24f71ae48effc5317fa006244e76e8c Mon Sep 17 00:00:00 2001 From: fly-l <1420031550@qq.com> Date: Mon, 12 Dec 2022 14:08:35 +0800 Subject: [PATCH] =?UTF-8?q?2022-12-12=20=E7=84=8A=E6=8E=A5wbs=E6=A0=91?= =?UTF-8?q?=E9=80=9F=E5=BA=A6=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .vs/SGGL_SeDin/v17/.wsuo | Bin 24064 -> 24064 bytes SGGL/BLL/Common/Funs.cs | 14 ++ .../HJGL/PreDesign/PrePipeline.aspx | 2 +- .../HJGL/PreDesign/PrePipeline.aspx.cs | 86 ++++++++++-- .../HJGL/WeldingManage/JotTwoDesign.aspx | 2 +- .../HJGL/WeldingManage/JotTwoDesign.aspx.cs | 130 ++++++++++++------ .../WeldingManage/SelectTaskWeldJoint.aspx | 7 +- .../WeldingManage/SelectTaskWeldJoint.aspx.cs | 123 ++++++++++++----- .../SelectTaskWeldJoint.aspx.designer.cs | 9 ++ 9 files changed, 279 insertions(+), 94 deletions(-) diff --git a/.vs/SGGL_SeDin/v17/.wsuo b/.vs/SGGL_SeDin/v17/.wsuo index 8828e13c0da2d96009a5b45169e48ce3df06cb18..e70d3c602a32a3a656a2c04f78a16cf14eb93c11 100644 GIT binary patch delta 347 zcmZqJ!`QHgaf1&NBhzF>CV4i4Qd^-9ypxNVF7h%mGB7Zx0r7tzm>ejkGP#6#fgmST zfD1_T0WtezRTh0lj?JMg-x+~sTx3#Y!Dj;d8V-;yu#p-ZIv|Z4d90J2)omB?u`Ci{ znk3}H!wyscvj$?X&;=e2pddF)C)hEU?a|; z%_XW+)l`g3O${s((+qUYlFco2O^i}ZbQ28|O?4A3jLi&8%uFpUjm$Rd`rKh8Ql;Nz FegJnmX`TQ8 delta 379 zcmZqJ!`QHgaf1&NBl~1UCV93A-zU^f + ///获取最大页数 + /// + /// 总数 + /// 每页条数 + /// + public static int GetEndPageNumber(int pageTotal,int pagesize ) + { + double aa = (pageTotal + pagesize - 1) / pagesize; //使用数据条数/每页显示条数，来获得最大页数，是double类型 + + return Convert.ToInt32(Math.Ceiling(aa)); //返回double类型取上限后的结果 + } + /// /// 过滤空白行 /// diff --git a/SGGL/FineUIPro.Web/HJGL/PreDesign/PrePipeline.aspx b/SGGL/FineUIPro.Web/HJGL/PreDesign/PrePipeline.aspx index b5a69da8..0762f3e5 100644 --- a/SGGL/FineUIPro.Web/HJGL/PreDesign/PrePipeline.aspx +++ b/SGGL/FineUIPro.Web/HJGL/PreDesign/PrePipeline.aspx @@ -30,7 +30,7 @@ diff --git a/SGGL/FineUIPro.Web/HJGL/PreDesign/PrePipeline.aspx.cs b/SGGL/FineUIPro.Web/HJGL/PreDesign/PrePipeline.aspx.cs index 4110d8ca..3aaea41a 100644 --- a/SGGL/FineUIPro.Web/HJGL/PreDesign/PrePipeline.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/PreDesign/PrePipeline.aspx.cs @@ -3,14 +3,18 @@ using System; using System.Collections.Generic; using System.Data; using System.Data.SqlClient; +using System.Drawing; using System.IO; using System.Linq; +using System.Runtime.InteropServices; using System.Web; namespace FineUIPro.Web.HJGL.PreDesign { public partial class PrePipeline : PageBase { + public int pageSize = 20; + protected void Page_Load(object sender, EventArgs e) { if (!IsPostBack) @@ -83,11 +87,22 @@ namespace FineUIPro.Web.HJGL.PreDesign tn1.NodeID = q.UnitWorkId; tn1.Text = q.UnitWorkName + "銆" + a.ToString() + "銆" + "绠＄嚎"; tn1.ToolTip = "鏂藉伐鍗曚綅锛" + u.UnitName; + tn1.CommandName = 1+"|"+Funs.GetEndPageNumber(a, pageSize); + tn1.EnableClickEvent = true; + tn1.EnableExpandEvent = true; rootNode1.Nodes.Add(tn1); if (a > 0) { - BindNodes(tn1); + // BindNodes(tn1); + TreeNode newNode = new TreeNode(); + newNode.Text = "鍔犺浇绠＄嚎..."; + newNode.NodeID = "鍔犺浇绠＄嚎..."; + tn1.Nodes.Add(newNode); } + //if (a > 0) + //{ + // BindNodes(tn1); + //} } } if (unitWork2.Count() > 0) @@ -104,17 +119,28 @@ namespace FineUIPro.Web.HJGL.PreDesign tn2.Expanded = true; } tn2.ToolTip = "鏂藉伐鍗曚綅锛" + u.UnitName; + tn2.CommandName = 1 + "|" + Funs.GetEndPageNumber(a, pageSize); + tn2.EnableClickEvent = true; + tn2.EnableExpandEvent = true; rootNode2.Nodes.Add(tn2); if (a > 0) { - BindNodes(tn2); + // BindNodes(tn1); + TreeNode newNode = new TreeNode(); + newNode.Text = "鍔犺浇绠＄嚎..."; + newNode.NodeID = "鍔犺浇绠＄嚎..."; + tn2.Nodes.Add(newNode); } + //if (a > 0) + //{ + // BindNodes(tn2); + //} } } } - + private void BindNodes(TreeNode node) - { + { List pipeline = new List(); var pipelines = from x in PipelineService.hJGL_Pipelines where x.PipeArea == "1" select x; pipeline = (from x in pipelines @@ -122,19 +148,46 @@ namespace FineUIPro.Web.HJGL.PreDesign && x.PipelineCode.Contains(this.txtPipelineCode.Text.Trim()) orderby x.PipelineCode select x).ToList(); - foreach (var item in pipeline) + int pageindex =int.Parse(node.CommandName.Split('|')[0]); + int pageCount= int.Parse(node.CommandName.Split('|')[1]); + if (pageindex <= pageCount) { - var comCount = (from x in Funs.DB.HJGL_Pipeline_Component where x.PipelineId == item.PipelineId select x).Count(); - TreeNode newNode = new TreeNode(); - newNode.Text = item.PipelineCode + "銆" + comCount.ToString() + " " + "缁勪欢" + "銆"; - newNode.ToolTip = "绠＄嚎鍙枫愮粍浠舵暟銆"; - newNode.NodeID = item.PipelineId; - newNode.EnableClickEvent = true; - node.Nodes.Add(newNode); + pipeline = pipeline.Skip(pageSize * (pageindex - 1)).Take(pageSize).ToList(); + foreach (var item in pipeline) + { + var comCount = (from x in Funs.DB.HJGL_Pipeline_Component where x.PipelineId == item.PipelineId select x).Count(); + TreeNode newNode = new TreeNode(); + newNode.Text = item.PipelineCode + "銆" + comCount.ToString() + " " + "缁勪欢" + "銆"; + newNode.ToolTip = "绠＄嚎鍙枫愮粍浠舵暟銆"; + newNode.NodeID = item.PipelineId; + newNode.EnableClickEvent = true; + node.Nodes.Add(newNode); + + } + if (pageindex /// 鐐瑰嚮TreeView @@ -149,6 +202,15 @@ namespace FineUIPro.Web.HJGL.PreDesign { this.hdUnitWorkId.Text = this.tvControlItem.SelectedNode.ParentNode.NodeID; } + if (e.CommandName == "鍔犺浇") + { + string CommandName = e.Node.ParentNode.CommandName; + e.Node.ParentNode.CommandName = ( int.Parse( CommandName.Split('|')[0])+1)+"|"+ int.Parse(CommandName.Split('|')[1]); + TreeNode treeNode = e.Node.ParentNode; + treeNode.Nodes.Remove(e.Node); + BindNodes(e.Node.ParentNode); + } + this.BindGrid(); } #endregion diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingManage/JotTwoDesign.aspx b/SGGL/FineUIPro.Web/HJGL/WeldingManage/JotTwoDesign.aspx index fc2f06b5..42827d42 100644 --- a/SGGL/FineUIPro.Web/HJGL/WeldingManage/JotTwoDesign.aspx +++ b/SGGL/FineUIPro.Web/HJGL/WeldingManage/JotTwoDesign.aspx @@ -31,7 +31,7 @@ diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingManage/JotTwoDesign.aspx.cs b/SGGL/FineUIPro.Web/HJGL/WeldingManage/JotTwoDesign.aspx.cs index 8e48b7fe..fa9f7b87 100644 --- a/SGGL/FineUIPro.Web/HJGL/WeldingManage/JotTwoDesign.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/WeldingManage/JotTwoDesign.aspx.cs @@ -11,6 +11,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage { public partial class JotTwoDesign : PageBase { + public int pageSize = 20; protected void Page_Load(object sender, EventArgs e) { if (!IsPostBack) @@ -87,10 +88,17 @@ namespace FineUIPro.Web.HJGL.WeldingManage tn1.NodeID = q.UnitWorkId; tn1.Text = q.UnitWorkName + "銆" + a.ToString() + "銆" + "绠＄嚎"; tn1.ToolTip = "鏂藉伐鍗曚綅锛" + u.UnitName; + tn1.CommandName = 1 + "|" + Funs.GetEndPageNumber(a, pageSize); + tn1.EnableClickEvent = true; + tn1.EnableExpandEvent = true; rootNode1.Nodes.Add(tn1); if (a > 0) { - BindNodes(tn1); + // BindNodes(tn1); + TreeNode newNode = new TreeNode(); + newNode.Text = "鍔犺浇绠＄嚎..."; + newNode.NodeID = "鍔犺浇绠＄嚎..."; + tn1.Nodes.Add(newNode); } } } @@ -108,10 +116,17 @@ namespace FineUIPro.Web.HJGL.WeldingManage tn2.Expanded = true; } tn2.ToolTip = "鏂藉伐鍗曚綅锛" + u.UnitName; + tn2.CommandName = 1 + "|" + Funs.GetEndPageNumber(a, pageSize); + tn2.EnableClickEvent = true; + tn2.EnableExpandEvent = true; rootNode2.Nodes.Add(tn2); if (a > 0) { - BindNodes(tn2); + // BindNodes(tn1); + TreeNode newNode = new TreeNode(); + newNode.Text = "鍔犺浇绠＄嚎..."; + newNode.NodeID = "鍔犺浇绠＄嚎..."; + tn2.Nodes.Add(newNode); } } } @@ -125,51 +140,67 @@ namespace FineUIPro.Web.HJGL.WeldingManage && x.PipelineCode.Contains(this.txtPipelineCode.Text.Trim()) orderby x.PipelineCode select x).ToList(); - foreach (var item in pipeline) + int pageindex = int.Parse(node.CommandName.Split('|')[0]); + int pageCount = int.Parse(node.CommandName.Split('|')[1]); + if (pageindex <= pageCount) { - //var jotCount = (from x in Funs.DB.HJGL_WeldJoint where x.PipelineId == item.PipelineId && x.IsTwoJoint == true select x).Count(); - //var weldJotCount = (from x in Funs.DB.HJGL_WeldJoint where x.PipelineId == item.PipelineId && x.IsTwoJoint == true && x.WeldingDailyId != null select x).Count(); - //TreeNode newNode = new TreeNode(); - //if (jotCount > weldJotCount) - //{ - // newNode.Text = "" + item.PipelineCode + "銆" + jotCount.ToString() + " " + "鐒婂彛" + "銆" + ""; - //} - //else - //{ - // newNode.Text = item.PipelineCode + "銆" + jotCount.ToString() + " " + "鐒婂彛" + "銆"; - //} - - var jotCount = (from x in WeldJointService.hJGL_WeldJoints where x.PipelineId == item.PipelineId && x.IsTwoJoint == true select x).Count(); - var AuditCount= (from x in WeldJointService.hJGL_WeldJoints where x.PipelineId == item.PipelineId && x.IsTwoJoint == true && x.AuditDate !=null select x).Count(); - TreeNode newNode = new TreeNode(); - - if (jotCount== AuditCount) //鍏ㄩ儴瀹℃牳 + pipeline = pipeline.Skip(pageSize * (pageindex - 1)).Take(pageSize).ToList(); + foreach (var item in pipeline) { - newNode.Text = "" + item.PipelineCode + "銆" + jotCount.ToString() + " " + "鐒婂彛" + "銆" + ""; + //var jotCount = (from x in Funs.DB.HJGL_WeldJoint where x.PipelineId == item.PipelineId && x.IsTwoJoint == true select x).Count(); + //var weldJotCount = (from x in Funs.DB.HJGL_WeldJoint where x.PipelineId == item.PipelineId && x.IsTwoJoint == true && x.WeldingDailyId != null select x).Count(); + //TreeNode newNode = new TreeNode(); + //if (jotCount > weldJotCount) + //{ + // newNode.Text = "" + item.PipelineCode + "銆" + jotCount.ToString() + " " + "鐒婂彛" + "銆" + ""; + //} + //else + //{ + // newNode.Text = item.PipelineCode + "銆" + jotCount.ToString() + " " + "鐒婂彛" + "銆"; + //} + var jotCount = (from x in WeldJointService.hJGL_WeldJoints where x.PipelineId == item.PipelineId && x.IsTwoJoint == true select x).Count(); + var AuditCount = (from x in WeldJointService.hJGL_WeldJoints where x.PipelineId == item.PipelineId && x.IsTwoJoint == true && x.AuditDate != null select x).Count(); + TreeNode newNode = new TreeNode(); + + if (jotCount == AuditCount) //鍏ㄩ儴瀹℃牳 + { + newNode.Text = "" + item.PipelineCode + "銆" + jotCount.ToString() + " " + "鐒婂彛" + "銆" + ""; + + } + else if (AuditCount == 0) //鍏ㄩ儴鏈鏍 + { + newNode.Text = "" + item.PipelineCode + "銆" + jotCount.ToString() + " " + "鐒婂彛" + "銆" + ""; + + } + else //閮ㄥ垎瀹℃牳 + { + newNode.Text = "" + item.PipelineCode + "銆" + jotCount.ToString() + " " + "鐒婂彛" + "銆" + ""; + + } + //if (jotCount > weldJotCount) + //{ + // newNode.Text = "" + item.PipelineCode + "銆" + jotCount.ToString() + " " + "鐒婂彛" + "銆" + ""; + //} + //else + //{ + // newNode.Text = item.PipelineCode + "銆" + jotCount.ToString() + " " + "鐒婂彛" + "銆"; + //} + newNode.ToolTip = "绠＄嚎鍙枫愮剨鍙ｆ暟銆"; + newNode.NodeID = item.PipelineId; + newNode.EnableClickEvent = true; + node.Nodes.Add(newNode); } - else if ( AuditCount==0) //鍏ㄩ儴鏈鏍 + if (pageindex < pageCount) { - newNode.Text = "" + item.PipelineCode + "銆" + jotCount.ToString() + " " + "鐒婂彛" + "銆" + ""; - + TreeNode newNode = new TreeNode(); + newNode.Text = "鍔犺浇"; + newNode.NodeID = SQLHelper.GetNewID(); + newNode.CommandName = "鍔犺浇"; + newNode.Icon = Icon.ArrowDown; + newNode.EnableClickEvent = true; + node.Nodes.Add(newNode); } - else //閮ㄥ垎瀹℃牳 - { - newNode.Text = "" + item.PipelineCode + "銆" + jotCount.ToString() + " " + "鐒婂彛" + "銆" + ""; - - } - //if (jotCount > weldJotCount) - //{ - // newNode.Text = "" + item.PipelineCode + "銆" + jotCount.ToString() + " " + "鐒婂彛" + "銆" + ""; - //} - //else - //{ - // newNode.Text = item.PipelineCode + "銆" + jotCount.ToString() + " " + "鐒婂彛" + "銆"; - //} - newNode.ToolTip = "绠＄嚎鍙枫愮剨鍙ｆ暟銆"; - newNode.NodeID = item.PipelineId; - newNode.EnableClickEvent = true; - node.Nodes.Add(newNode); } } @@ -187,8 +218,25 @@ namespace FineUIPro.Web.HJGL.WeldingManage { this.hdUnitWorkId.Text = this.tvControlItem.SelectedNode.ParentNode.NodeID; } + if (e.CommandName == "鍔犺浇") + { + string CommandName = e.Node.ParentNode.CommandName; + e.Node.ParentNode.CommandName = (int.Parse(CommandName.Split('|')[0]) + 1) + "|" + int.Parse(CommandName.Split('|')[1]); + TreeNode treeNode = e.Node.ParentNode; + treeNode.Nodes.Remove(e.Node); + BindNodes(e.Node.ParentNode); + } this.BindGrid(); } + protected void tvControlItem_TreeNodeExpanded(object sender, TreeNodeEventArgs e) + { + if (e.Node.Nodes[0].NodeID == "鍔犺浇绠＄嚎...") + { + e.Node.Nodes.Clear(); + BindNodes(e.Node); + } + + } #endregion #region 鏁版嵁缁戝畾 diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingManage/SelectTaskWeldJoint.aspx b/SGGL/FineUIPro.Web/HJGL/WeldingManage/SelectTaskWeldJoint.aspx index 84795544..d4c2b6e8 100644 --- a/SGGL/FineUIPro.Web/HJGL/WeldingManage/SelectTaskWeldJoint.aspx +++ b/SGGL/FineUIPro.Web/HJGL/WeldingManage/SelectTaskWeldJoint.aspx @@ -37,7 +37,7 @@ + EnableTextSelection="true" > @@ -86,7 +86,10 @@ - + + diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingManage/SelectTaskWeldJoint.aspx.cs b/SGGL/FineUIPro.Web/HJGL/WeldingManage/SelectTaskWeldJoint.aspx.cs index 22b337b3..cad78702 100644 --- a/SGGL/FineUIPro.Web/HJGL/WeldingManage/SelectTaskWeldJoint.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/WeldingManage/SelectTaskWeldJoint.aspx.cs @@ -87,7 +87,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage public List Tree_hJGL_Pipelines; public int pageindex=1; public int pageindex_2=1; - public int page; + public int pageSize=20; #endregion #region 鍔犺浇椤甸潰 @@ -232,39 +232,40 @@ namespace FineUIPro.Web.HJGL.WeldingManage } var Count = iso.Count(); - if (pagenum <= Count) + if (pagenum <= Funs.GetEndPageNumber(Count,pageSize)) { - iso = iso.Skip(30 * (pagenum - 1)).Take(30).ToList(); ; - - } - var joints = from x in WeldJointService.hJGL_WeldJoints select x; - foreach (var item in iso) - { - TreeNode newNode = new TreeNode(); - int totalJointNum = joints.Count(x => x.PipelineId == item.PipelineId); - int weldJointNum = joints.Count(x => x.PipelineId == item.PipelineId && x.WeldingDailyId != null); - bool istrue = BLL.HJGL_MaterialService.isInStockByPipeline(item.PipelineId, this.CurrUser.LoginProjectId); - if (istrue) + iso = iso.Skip(pageSize * (pagenum - 1)).Take(pageSize).ToList(); ; + var joints = from x in WeldJointService.hJGL_WeldJoints select x; + foreach (var item in iso) { - newNode.CssClass = "tn-color-green"; + TreeNode newNode = new TreeNode(); + int totalJointNum = joints.Count(x => x.PipelineId == item.PipelineId); + int weldJointNum = joints.Count(x => x.PipelineId == item.PipelineId && x.WeldingDailyId != null); + bool istrue = BLL.HJGL_MaterialService.isInStockByPipeline(item.PipelineId, this.CurrUser.LoginProjectId); + if (istrue) + { + newNode.CssClass = "tn-color-green"; + } + newNode.Text = item.PipelineCode + "(" + (totalJointNum - weldJointNum).ToString() + ")"; + newNode.NodeID = item.PipelineId; + newNode.ToolTip = item.PipelineCode; + newNode.EnableClickEvent = true; + node.Nodes.Add(newNode); + + } + if (pagenum < Count) + { + TreeNode newNode = new TreeNode(); + newNode.Text = "鍔犺浇"; + newNode.NodeID = SQLHelper.GetNewID(); + newNode.Icon = Icon.ArrowDown; + newNode.CommandName = PipeArea; + newNode.EnableClickEvent = true; + node.Nodes.Add(newNode); } - newNode.Text = item.PipelineCode + "(" + (totalJointNum - weldJointNum).ToString() + ")"; - newNode.NodeID = item.PipelineId; - newNode.ToolTip = item.PipelineCode; - newNode.EnableClickEvent = true; - node.Nodes.Add(newNode); - - } - if (pagenum < Count) - { - TreeNode newNode = new TreeNode(); - newNode.Text = "鍔犺浇"; - newNode.NodeID = "鍔犺浇"; - newNode.Icon = Icon.ArrowDown; - newNode.CommandName = PipeArea; - newNode.EnableClickEvent = true; - node.Nodes.Add(newNode); } + + } protected void tvControlItem_TreeNodeExpanded(object sender, TreeNodeEventArgs e) { @@ -360,7 +361,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage /// protected void tvControlItem_NodeCommand(object sender, TreeCommandEventArgs e) { - if (e.NodeID == "鍔犺浇") + if (e.Node.Text == "鍔犺浇") { if (e.Node.CommandName == "1") @@ -407,6 +408,46 @@ namespace FineUIPro.Web.HJGL.WeldingManage /// /// protected void btnAccept_Click(object sender, EventArgs e) + { + PageContext.RegisterStartupScript(ActiveWindow.GetWriteBackValueReference(txtTaskDate.Text) + ActiveWindow.GetHidePostBackReference()); + + //if (string.IsNullOrEmpty(this.txtTaskCode.Text.Trim())) + //{ + // ShowNotify("璇疯緭鍏ョ剨鎺ヤ换鍔″崟缂栧彿", MessageBoxIcon.Warning); + // return; + //} + //if (!string.IsNullOrEmpty(txtTaskDate.Text)) + //{ + // if (!string.IsNullOrEmpty(TaskDate)) + // { + // SaveTask(true); + // } + // else + // { + // var task = from x in Funs.DB.HJGL_WeldTask + // where x.UnitWorkId == UnitWorkId + // && x.TaskDate.Value.Date.ToString() == Convert.ToDateTime(txtTaskDate.Text.Trim()).ToString("yyyy-MM-dd") + // select x; + // if (task.Count() > 0) + // { + // ShowNotify("鎵閫夐璁＄剨鎺ユ棩鏈熷凡瀛樺湪,璇烽噸鏂伴夋嫨锛", MessageBoxIcon.Warning); + // return; + // } + // else + // { + // SaveTask(true); + // } + // } + //} + + //else + //{ + // ShowNotify("璇烽夋嫨棰勮鐒婃帴鏃ユ湡", MessageBoxIcon.Warning); + // return; + //} + } + + protected void btnSave_Click(object sender, EventArgs e) { if (string.IsNullOrEmpty(this.txtTaskCode.Text.Trim())) { @@ -417,7 +458,8 @@ namespace FineUIPro.Web.HJGL.WeldingManage { if (!string.IsNullOrEmpty(TaskDate)) { - SaveTask(); + SaveTask(false); + BindGrid(); } else { @@ -432,7 +474,9 @@ namespace FineUIPro.Web.HJGL.WeldingManage } else { - SaveTask(); + SaveTask(false); + TaskDate = txtTaskDate.Text; + BindGrid(); } } } @@ -442,10 +486,9 @@ namespace FineUIPro.Web.HJGL.WeldingManage ShowNotify("璇烽夋嫨棰勮鐒婃帴鏃ユ湡", MessageBoxIcon.Warning); return; } + } - - - private void SaveTask() + private void SaveTask(bool IsCloseForm) { var weldingRods = from x in Funs.DB.Base_Consumables where x.ConsumablesType == "2" select x; var weldingWires = from x in Funs.DB.Base_Consumables where x.ConsumablesType == "1" select x; @@ -535,7 +578,11 @@ namespace FineUIPro.Web.HJGL.WeldingManage //model.State = 1; //PipelineService.UpdatePipeline(model); ShowNotify("淇濆瓨鎴愬姛锛", MessageBoxIcon.Success); - PageContext.RegisterStartupScript(ActiveWindow.GetWriteBackValueReference(txtTaskDate.Text) + ActiveWindow.GetHidePostBackReference()); + if (IsCloseForm) + { + PageContext.RegisterStartupScript(ActiveWindow.GetWriteBackValueReference(txtTaskDate.Text) + ActiveWindow.GetHidePostBackReference()); + + } //PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference()); } @@ -594,5 +641,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage }; } + + } } \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingManage/SelectTaskWeldJoint.aspx.designer.cs b/SGGL/FineUIPro.Web/HJGL/WeldingManage/SelectTaskWeldJoint.aspx.designer.cs index d55dfc73..4c925058 100644 --- a/SGGL/FineUIPro.Web/HJGL/WeldingManage/SelectTaskWeldJoint.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/HJGL/WeldingManage/SelectTaskWeldJoint.aspx.designer.cs @@ -194,6 +194,15 @@ namespace FineUIPro.Web.HJGL.WeldingManage /// protected global::FineUIPro.ToolbarFill ToolbarFill1; + /// + /// btnSave 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.Button btnSave; + /// /// btnAccept 鎺т欢銆 ///