zhanghj/ChengDa_English
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

合并最新

Browse Source
This commit is contained in:
李超
2022-12-20 09:32:32 +08:00
parent 844e9f1488
commit 1abdaa9476
654 changed files with 73563 additions and 9746 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/FineUIPro.Web/JDGL/WBSCompleteAndReal/WBSCompleteAudit.aspx.cs
+7 -6
View File
@@ -249,6 +249,7 @@ namespace FineUIPro.Web.JDGL.WBSCompleteAndReal
emptyNode.Text = "";
emptyNode.NodeID = "";
newNode.Nodes.Add(emptyNode);
e.Node.Expanded = true;
}
}
}
@@ -343,7 +344,7 @@ namespace FineUIPro.Web.JDGL.WBSCompleteAndReal
}
else //不存在子单位工程，加载分部工程
{
var wbsSet1s = from x in Funs.DB.Wbs_WbsSet where x.Flag == 1 && x.UnitProjectId == e.Node.NodeID && x.IsApprove == true && x.NoShow == null orderby x.SortIndex, x.WbsSetCode select x;
var wbsSet1s = from x in Funs.DB.Wbs_WbsSet where x.SuperWbsSetId == null && x.UnitProjectId == e.Node.NodeID && x.IsApprove == true && x.NoShow == null orderby x.SortIndex, x.WbsSetCode select x;
if (wbsSet1s.Count() > 0)
{
foreach (var wbsSet1 in wbsSet1s)
@@ -376,7 +377,7 @@ namespace FineUIPro.Web.JDGL.WBSCompleteAndReal
}
else //单位工程下直接是分项内容，如质量行为
{
var wbsSet3s = from x in Funs.DB.Wbs_WbsSet where x.Flag == 3 && x.UnitProjectId == e.Node.NodeID && x.IsApprove == true && x.NoShow == null orderby x.SortIndex, x.WbsSetCode select x;
var wbsSet3s = from x in Funs.DB.Wbs_WbsSet where x.SuperWbsSetId == null && x.UnitProjectId == e.Node.NodeID && x.IsApprove == true && x.NoShow == null orderby x.SortIndex, x.WbsSetCode select x;
if (wbsSet3s.Count() > 0)
{
foreach (var wbsSet3 in wbsSet3s)
@@ -412,7 +413,7 @@ namespace FineUIPro.Web.JDGL.WBSCompleteAndReal
}
else if (e.Node.CommandName == "childUnitProject") //展开子单位工程节点
{
var wbsSet1s = from x in Funs.DB.Wbs_WbsSet where x.Flag == 1 && x.UnitProjectId == e.Node.NodeID && x.IsApprove == true && x.NoShow == null orderby x.SortIndex, x.WbsSetCode select x;
var wbsSet1s = from x in Funs.DB.Wbs_WbsSet where x.SuperWbsSetId == null && x.UnitProjectId == e.Node.NodeID && x.IsApprove == true && x.NoShow == null orderby x.SortIndex, x.WbsSetCode select x;
foreach (var wbsSet1 in wbsSet1s)
{
TreeNode newNode = new TreeNode();
@@ -1437,7 +1438,7 @@ namespace FineUIPro.Web.JDGL.WBSCompleteAndReal
item.SVValue = item.CompleteValueTotal - item.PlanValueTotal;
item.CVValue = item.CompleteValueTotal - item.RealValueTotal;
items.Add(item);
var childWbsSets = from x in Funs.DB.Wbs_WbsSet where x.Flag == 1 && x.UnitProjectId == this.trWBS.SelectedNode.NodeID && x.IsApprove == true orderby x.WbsSetCode select x;
var childWbsSets = from x in Funs.DB.Wbs_WbsSet where x.SuperWbsSetId == null && x.UnitProjectId == this.trWBS.SelectedNode.NodeID && x.IsApprove == true orderby x.WbsSetCode select x;
foreach (var childWbsSet in childWbsSets)
{
Model.WbsDetail childDetail = BLL.WbsDetailService.GetWbsDetailByWbsFlagYearMonth(childWbsSet.WbsSetId, 4, month);
@@ -1540,7 +1541,7 @@ namespace FineUIPro.Web.JDGL.WBSCompleteAndReal
this.btnSave1.Hidden = false;
}
}
var childWbsSets = from x in Funs.DB.Wbs_WbsSet where x.Flag == 3 && x.UnitProjectId == this.trWBS.SelectedNode.NodeID && x.IsApprove == true orderby x.SortIndex, x.WbsSetCode select x;
var childWbsSets = from x in Funs.DB.Wbs_WbsSet where x.SuperWbsSetId == null && x.UnitProjectId == this.trWBS.SelectedNode.NodeID && x.IsApprove == true orderby x.SortIndex, x.WbsSetCode select x;
RenderField columnCompleteValue = Grid1.FindColumn("CompleteValue") as RenderField;
RenderField columnCompleteValueRate = Grid1.FindColumn("CompleteValueRate") as RenderField;
RenderField columnRealValue = Grid1.FindColumn("RealValue") as RenderField;
@@ -1644,7 +1645,7 @@ namespace FineUIPro.Web.JDGL.WBSCompleteAndReal
else //不存在子单位工程
{
this.Grid1.Columns[1].HeaderText = "分部工程";
var childWbsSets = from x in Funs.DB.Wbs_WbsSet where x.Flag == 1 && x.UnitProjectId == this.trWBS.SelectedNode.NodeID && x.IsApprove == true orderby x.WbsSetCode select x;
var childWbsSets = from x in Funs.DB.Wbs_WbsSet where x.SuperWbsSetId == null && x.UnitProjectId == this.trWBS.SelectedNode.NodeID && x.IsApprove == true orderby x.WbsSetCode select x;
foreach (var childWbsSet in childWbsSets)
{
Model.WbsDetail childDetail = BLL.WbsDetailService.GetWbsDetailByWbsFlagYearMonth(childWbsSet.WbsSetId, 4, month);