lpf
/
SGGL_SHJ
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

提交代码

This commit is contained in:
高飞 2023-11-30 12:55:12 +08:00
parent 4ad9007adb
commit 2948ad0a94
2 changed files with 31 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldReport.aspx.cs
View File

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

33
SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldTask.aspx.cs
View File

@ -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,16 +959,31 @@ namespace FineUIPro.Web.HJGL.WeldingManage
string str1 = hdItemsString.Text;
string str2 = hdTaskWeldJoint.Text;
this.InitTreeMenu();
tvControlItem.SelectedNode.Expanded = true;
if (tvControlItem.SelectedNode.CommandName == "单位工程")
if (tvControlItem.SelectedNode != null)
{
tvControlItem.SelectedNode.Nodes.Clear();
BindNodes(tvControlItem.SelectedNode);
foreach (var item in tvControlItem.SelectedNode.Nodes)
tvControlItem.SelectedNode.Expanded = true;
if (tvControlItem.SelectedNode.CommandName == "单位工程")
{
if (item.NodeID.Contains(hdTaskWeldJoint.Text.Trim()))
tvControlItem.SelectedNode.Nodes.Clear();
BindNodes(tvControlItem.SelectedNode);
foreach (var item in tvControlItem.SelectedNode.Nodes)
{
tvControlItem.SelectedNodeID = item.NodeID;
if (item.NodeID.Contains(hdTaskWeldJoint.Text.Trim()))
{
tvControlItem.SelectedNodeID = item.NodeID;
}
}
}
}
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);
}
}
}
@ -976,7 +991,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
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
{