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);
SGGL/FineUIPro.Web/JDGL/WBSCompleteAndReal/WBSReport.aspx
+35 -34
View File
@@ -58,39 +58,40 @@
</f:SimpleForm>
</PopPanel>
</f:DropDownBox>
</Items>
</f:Toolbar>
<f:Toolbar ID="Toolbar1" Position="Top" runat="server">
<Items>
<f:CheckBoxList ID="CheckBoxList1" runat="server" OnSelectedIndexChanged="CheckBoxList1_SelectedIndexChanged"
AutoPostBack="true">
<f:CheckItem Text="单位工程" Value="1" />
</f:CheckBoxList>
<f:CheckBoxList ID="CheckBoxList2" runat="server" OnSelectedIndexChanged="CheckBoxList2_SelectedIndexChanged"
AutoPostBack="true">
<f:CheckItem Text="子单位工程" Value="2" />
</f:CheckBoxList>
<f:CheckBoxList ID="CheckBoxList3" runat="server" OnSelectedIndexChanged="CheckBoxList3_SelectedIndexChanged"
AutoPostBack="true">
<f:CheckItem Text="分部工程" Value="3" />
</f:CheckBoxList>
<f:CheckBoxList ID="CheckBoxList4" runat="server" OnSelectedIndexChanged="CheckBoxList4_SelectedIndexChanged"
AutoPostBack="true">
<f:CheckItem Text="子分部工程" Value="4" />
</f:CheckBoxList>
<f:CheckBoxList ID="CheckBoxList5" runat="server" OnSelectedIndexChanged="CheckBoxList5_SelectedIndexChanged"
AutoPostBack="true">
<f:CheckItem Text="分项工程" Value="5" />
</f:CheckBoxList>
<f:CheckBoxList ID="CheckBoxList6" runat="server" OnSelectedIndexChanged="CheckBoxList6_SelectedIndexChanged"
AutoPostBack="true">
<f:CheckItem Text="子分项工程" Value="6" />
</f:CheckBoxList>
<f:Button ID="Button1" Text="查询" MarginLeft="40px" EnablePostBack="true" runat="server"
OnClick="btnNew_Click">
</f:Button>
</Items>
</f:Toolbar>
<f:Toolbar ID="Toolbar1" Position="Top" runat="server" Hidden="true">
<Items>
<f:CheckBoxList ID="CheckBoxList1" runat="server" OnSelectedIndexChanged="CheckBoxList1_SelectedIndexChanged" Hidden="true"
AutoPostBack="true">
<f:CheckItem Text="单位工程" Value="1" />
</f:CheckBoxList>
<f:CheckBoxList ID="CheckBoxList2" runat="server" OnSelectedIndexChanged="CheckBoxList2_SelectedIndexChanged" Hidden="true"
AutoPostBack="true">
<f:CheckItem Text="子单位工程" Value="2" />
</f:CheckBoxList>
<f:CheckBoxList ID="CheckBoxList3" runat="server" OnSelectedIndexChanged="CheckBoxList3_SelectedIndexChanged" Hidden="true"
AutoPostBack="true">
<f:CheckItem Text="分部工程" Value="3" />
</f:CheckBoxList>
<f:CheckBoxList ID="CheckBoxList4" runat="server" OnSelectedIndexChanged="CheckBoxList4_SelectedIndexChanged" Hidden="true"
AutoPostBack="true">
<f:CheckItem Text="子分部工程" Value="4" />
</f:CheckBoxList>
<f:CheckBoxList ID="CheckBoxList5" runat="server" OnSelectedIndexChanged="CheckBoxList5_SelectedIndexChanged" Hidden="true"
AutoPostBack="true">
<f:CheckItem Text="分项工程" Value="5" />
</f:CheckBoxList>
<f:CheckBoxList ID="CheckBoxList6" runat="server" OnSelectedIndexChanged="CheckBoxList6_SelectedIndexChanged" Hidden="true"
AutoPostBack="true">
<f:CheckItem Text="子分项工程" Value="6" />
</f:CheckBoxList>
</Items>
</f:Toolbar>
</Toolbars>
<Columns>
<f:RowNumberField />
@@ -103,10 +104,10 @@
<f:GroupField EnableLock="true" HeaderText="测量标志（权重）" TextAlign="Center">
<Columns>
<f:BoundField Width="100px" DataField="Weights" HeaderText="占比" TextAlign="Center" />
<f:BoundField Width="100px" DataField="WeightsMoneyTotal" HeaderText="费用（万元）" TextAlign="Center" />
<f:BoundField Width="100px" DataField="WeightsMoneyTotal" HeaderText="费用（元）" TextAlign="Center" />
</Columns>
</f:GroupField>
<f:GroupField EnableLock="true" HeaderText="完成值（万元）（BCWP）" TextAlign="Center">
<f:GroupField EnableLock="true" HeaderText="完成值（元）（BCWP）" TextAlign="Center">
<Columns>
<f:BoundField Width="100px" DataField="CompleteValue" HeaderText="月费用" TextAlign="Center" />
<f:BoundField Width="100px" DataField="CompleteValueTotal" HeaderText="累计费用" TextAlign="Center" />
@@ -114,7 +115,7 @@
TextAlign="Center" />
</Columns>
</f:GroupField>
<f:GroupField EnableLock="true" HeaderText="实耗值（万元）（ACWP）" TextAlign="Center">
<f:GroupField EnableLock="true" HeaderText="实耗值（元）（ACWP）" TextAlign="Center">
<Columns>
<f:BoundField Width="100px" DataField="RealValue" HeaderText="月实耗" TextAlign="Center" />
<f:BoundField Width="100px" DataField="RealValueTotal" HeaderText="累计实耗" TextAlign="Center" />
@@ -124,12 +125,12 @@
<Columns>
<f:GroupField EnableLock="true" HeaderText="进度（SV）" TextAlign="Center">
<Columns>
<f:BoundField Width="100px" DataField="SVCost" HeaderText="费用（万元）" TextAlign="Center" />
<f:BoundField Width="100px" DataField="SVCost" HeaderText="费用（元）" TextAlign="Center" />
</Columns>
</f:GroupField>
<f:GroupField EnableLock="true" HeaderText="费用（CV）" TextAlign="Center">
<Columns>
<f:BoundField Width="100px" DataField="CVCost" HeaderText="费用（万元）" TextAlign="Center" />
<f:BoundField Width="100px" DataField="CVCost" HeaderText="费用（元）" TextAlign="Center" />
</Columns>
</f:GroupField>
</Columns>
@@ -140,7 +141,7 @@
<f:BoundField Width="100px" DataField="EndDate" HeaderText="结束日期" TextAlign="Center" />
</Columns>
</f:GroupField>
<f:GroupField EnableLock="true" HeaderText="计划值（BCWS）（万元）" TextAlign="Center">
<f:GroupField EnableLock="true" HeaderText="计划值（BCWS）（元）" TextAlign="Center">
<Columns>
<f:BoundField Width="100px" DataField="PlanValue" HeaderText="月计划" TextAlign="Center" />
<f:BoundField Width="100px" DataField="PlanValueTotal" HeaderText="累计计划" TextAlign="Center" />
SGGL/FineUIPro.Web/JDGL/WBSCompleteAndReal/WBSReport.aspx.designer.cs
Generated
+9 -9
View File
@@ -156,6 +156,15 @@ namespace FineUIPro.Web.JDGL.WBSCompleteAndReal {
/// </remarks>
protected global::FineUIPro.CheckBoxList drpCnProfession;
/// <summary>
/// Button1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button Button1;
/// <summary>
/// Toolbar1 控件。
/// </summary>
@@ -218,14 +227,5 @@ namespace FineUIPro.Web.JDGL.WBSCompleteAndReal {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.CheckBoxList CheckBoxList6;
/// <summary>
/// Button1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button Button1;
}
}