lpf/CNCEC_SUBQHSE_WUHUAN
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改WBS基础库内容

Browse Source
This commit is contained in:
高飞
2023-04-24 17:18:08 +08:00
parent e2076852e6
commit dbfd7086e1
29 changed files with 557 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/FineUIPro.Web/CQMS/WBS/ControlPoint.aspx.cs
+40 -17
View File
@@ -55,8 +55,8 @@ namespace FineUIPro.Web.CQMS.WBS
this.trWBS.EnableSingleClickExpand = true;
TreeNode newNode1 = new TreeNode();
newNode1.Text = "建筑工程";
newNode1.NodeID = Const.CNProfessionalConstructId;
newNode1.CommandName = "CNProfessional";
newNode1.NodeID = "1";
newNode1.CommandName = "ProjectType";
newNode1.EnableExpandEvent = true;
newNode1.EnableClickEvent = true;
trWBS.Nodes.Add(newNode1);
@@ -93,22 +93,45 @@ namespace FineUIPro.Web.CQMS.WBS
e.Node.Nodes.Clear();
if (e.Node.CommandName == "ProjectType") //展开工程类型
{
var cNProfessional = (from x in BLL.Funs.DB.Base_CNProfessional where x.CNProfessionalId != Const.CNProfessionalConstructId && x.CNProfessionalId != Const.CNProfessionalCVId orderby x.SortIndex select x).ToList();
foreach (var c in cNProfessional)
if (e.NodeID == "1")
{
TreeNode newCNProfessionalNode = new TreeNode();
newCNProfessionalNode.Text = c.ProfessionalName;
newCNProfessionalNode.NodeID = c.CNProfessionalId;
newCNProfessionalNode.CommandName = "CNProfessional";
newCNProfessionalNode.EnableExpandEvent = true;
newCNProfessionalNode.EnableClickEvent = true;
e.Node.Nodes.Add(newCNProfessionalNode);
TreeNode tempNode = new TreeNode();
tempNode.NodeID = "";
tempNode.Text = "";
tempNode.EnableExpandEvent = true;
tempNode.EnableClickEvent = true;
newCNProfessionalNode.Nodes.Add(tempNode);
var cNProfessional = (from x in BLL.Funs.DB.Base_CNProfessional where x.CNProfessionalId == Const.CNProfessionalCVId orderby x.SortIndex select x).ToList();
foreach (var c in cNProfessional)
{
TreeNode newCNProfessionalNode = new TreeNode();
newCNProfessionalNode.Text = c.ProfessionalName;
newCNProfessionalNode.NodeID = c.CNProfessionalId;
newCNProfessionalNode.CommandName = "CNProfessional";
newCNProfessionalNode.EnableExpandEvent = true;
newCNProfessionalNode.EnableClickEvent = true;
e.Node.Nodes.Add(newCNProfessionalNode);
TreeNode tempNode = new TreeNode();
tempNode.NodeID = "";
tempNode.Text = "";
tempNode.EnableExpandEvent = true;
tempNode.EnableClickEvent = true;
newCNProfessionalNode.Nodes.Add(tempNode);
}
}
else
{
var cNProfessional = (from x in BLL.Funs.DB.Base_CNProfessional where x.CNProfessionalId != Const.CNProfessionalConstructId && x.CNProfessionalId != Const.CNProfessionalCVId orderby x.SortIndex select x).ToList();
foreach (var c in cNProfessional)
{
TreeNode newCNProfessionalNode = new TreeNode();
newCNProfessionalNode.Text = c.ProfessionalName;
newCNProfessionalNode.NodeID = c.CNProfessionalId;
newCNProfessionalNode.CommandName = "CNProfessional";
newCNProfessionalNode.EnableExpandEvent = true;
newCNProfessionalNode.EnableClickEvent = true;
e.Node.Nodes.Add(newCNProfessionalNode);
TreeNode tempNode = new TreeNode();
tempNode.NodeID = "";
tempNode.Text = "";
tempNode.EnableExpandEvent = true;
tempNode.EnableClickEvent = true;
newCNProfessionalNode.Nodes.Add(tempNode);
}
}
}
else if (e.Node.CommandName == "CNProfessional") //展开专业
SGGL/FineUIPro.Web/CQMS/WBS/EditBreakdown.aspx
+11
View File
@@ -42,6 +42,17 @@
<Items>
<f:TextBox ID="txtClass" runat="server" Label="控制等级" LabelWidth="180px"></f:TextBox>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:DropDownList runat="server" ID="drpCheckAcceptType" Label="验收类型" LabelWidth="180px">
<f:ListItem Value="1" Text="关键工序验收" />
<f:ListItem Value="2" Text="特殊过程验收" />
<f:ListItem Value="3" Text="隐蔽工程验收" />
<f:ListItem Value="4" Text="单位工程一次验收" />
<f:ListItem Value="5" Text="材料进场复验" />
</f:DropDownList>
</Items>
</f:FormRow>
<f:FormRow runat="server" ID="tr1">
<Items>
SGGL/FineUIPro.Web/CQMS/WBS/EditBreakdown.aspx.cs
+9
View File
@@ -33,6 +33,7 @@ namespace FineUIPro.Web.CQMS.WBS
{
string divisionId = Request.Params["divisionId"];
BreakdownId = Request.Params["breakdownId"];
Funs.FineUIPleaseSelect(this.drpCheckAcceptType);
Model.WBS_Breakdown breakdown = BLL.BreakdownService.GetBreakdownById(BreakdownId);
var division = BLL.DivisionService.GetDivisionById(divisionId);
if (division != null)
@@ -77,6 +78,10 @@ namespace FineUIPro.Web.CQMS.WBS
{
this.txtSortIndex.Text = breakdown.SortIndex.ToString();
}
if (!string.IsNullOrEmpty(breakdown.CheckAcceptType))
{
this.drpCheckAcceptType.SelectedValue = breakdown.CheckAcceptType;
}
this.txtRemark.Text = breakdown.Remark;
}
}
@@ -103,6 +108,10 @@ namespace FineUIPro.Web.CQMS.WBS
newBreakdown.WuHuan = this.WuHuan.Text.Trim();
newBreakdown.JianLi = this.JianLi.Text.Trim();
newBreakdown.YeZhu = this.YeZhu.Text.Trim();
if (this.drpCheckAcceptType.SelectedValue != BLL.Const._Null)
{
newBreakdown.CheckAcceptType = this.drpCheckAcceptType.SelectedValue;
}
if (!string.IsNullOrEmpty(this.txtSortIndex.Text.Trim()))
{
try
SGGL/FineUIPro.Web/CQMS/WBS/EditBreakdown.aspx.designer.cs
Generated
+9
View File
@@ -93,6 +93,15 @@ namespace FineUIPro.Web.CQMS.WBS {
/// </remarks>
protected global::FineUIPro.TextBox txtClass;
/// <summary>
/// drpCheckAcceptType 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpCheckAcceptType;
/// <summary>
/// tr1 控件。
/// </summary>
SGGL/FineUIPro.Web/CQMS/WBS/EditBreakdownProject.aspx
+11
View File
@@ -42,6 +42,17 @@
<Items>
<f:TextBox ID="txtClass" runat="server" Label="控制等级" LabelWidth="180px"></f:TextBox>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:DropDownList runat="server" ID="drpCheckAcceptType" Label="验收类型" LabelWidth="180px">
<f:ListItem Value="1" Text="关键工序验收" />
<f:ListItem Value="2" Text="特殊过程验收" />
<f:ListItem Value="3" Text="隐蔽工程验收" />
<f:ListItem Value="4" Text="单位工程一次验收" />
<f:ListItem Value="5" Text="材料进场复验" />
</f:DropDownList>
</Items>
</f:FormRow>
<f:FormRow runat="server" ID="tr1">
<Items>
SGGL/FineUIPro.Web/CQMS/WBS/EditBreakdownProject.aspx.cs
+9
View File
@@ -33,6 +33,7 @@ namespace FineUIPro.Web.CQMS.WBS
{
string divisionProjectId = Request.Params["divisionProjectId"];
BreakdownProjectId = Request.Params["breakdownProjectId"];
Funs.FineUIPleaseSelect(this.drpCheckAcceptType);
Model.WBS_BreakdownProject breakdownProject = BLL.BreakdownProjectService.GetBreakdownProjectById(BreakdownProjectId);
var division = BLL.DivisionProjectService.GetDivisionProjectById(divisionProjectId);
if (division != null)
@@ -73,6 +74,10 @@ namespace FineUIPro.Web.CQMS.WBS
this.JianLi.Text = breakdownProject.JianLi;
this.WuHuan.Text = breakdownProject.WuHuan;
this.FenBao.Text = breakdownProject.FenBao;
if (!string.IsNullOrEmpty(breakdownProject.CheckAcceptType))
{
this.drpCheckAcceptType.SelectedValue = breakdownProject.CheckAcceptType;
}
if (breakdownProject.SortIndex != null)
{
this.txtSortIndex.Text = breakdownProject.SortIndex.ToString();
@@ -103,6 +108,10 @@ namespace FineUIPro.Web.CQMS.WBS
newBreakdown.WuHuan = this.WuHuan.Text.Trim();
newBreakdown.JianLi = this.JianLi.Text.Trim();
newBreakdown.YeZhu = this.YeZhu.Text.Trim();
if (this.drpCheckAcceptType.SelectedValue != BLL.Const._Null)
{
newBreakdown.CheckAcceptType = this.drpCheckAcceptType.SelectedValue;
}
if (!string.IsNullOrEmpty(this.txtSortIndex.Text.Trim()))
{
try
SGGL/FineUIPro.Web/CQMS/WBS/EditBreakdownProject.aspx.designer.cs
Generated
+9
View File
@@ -93,6 +93,15 @@ namespace FineUIPro.Web.CQMS.WBS {
/// </remarks>
protected global::FineUIPro.TextBox txtClass;
/// <summary>
/// drpCheckAcceptType 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpCheckAcceptType;
/// <summary>
/// tr1 控件。
/// </summary>
SGGL/FineUIPro.Web/CQMS/WBS/EditDivision.aspx
+10
View File
@@ -23,6 +23,16 @@
<f:TextBox ID="txtDivisionCode" runat="server" Label="序号" LabelWidth="130px" ></f:TextBox>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:DropDownList runat="server" ID="drpSubItemType" Label="分部分项类型" LabelWidth="130px">
<f:ListItem Value="1" Text="分部" />
<f:ListItem Value="2" Text="子分部" />
<f:ListItem Value="3" Text="分项" />
<f:ListItem Value="4" Text="子分项" />
</f:DropDownList>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:NumberBox ID="txtSortIndex" runat="server" Label="排序" LabelWidth="130px" NoDecimal="true" NoNegative="true"></f:NumberBox>
SGGL/FineUIPro.Web/CQMS/WBS/EditDivision.aspx.cs
+12
View File
@@ -30,6 +30,7 @@ namespace FineUIPro.Web.CQMS.WBS
if (!IsPostBack)
{
string selectedCode = Request.Params["selectedCode"];
Funs.FineUIPleaseSelect(this.drpSubItemType);
if (Request.Params["type"] == "add")
{
Model.Base_CNProfessional cNProfessional = BLL.CNProfessionalService.GetCNProfessional(selectedCode);
@@ -50,6 +51,10 @@ namespace FineUIPro.Web.CQMS.WBS
Model.WBS_Division divisionProject = BLL.DivisionService.GetDivisionById(selectedCode);
this.txtDivisionCode.Text = divisionProject.DivisionCode;
this.txtDivisionName.Text = divisionProject.DivisionName;
if (!string.IsNullOrEmpty(divisionProject.SubItemType))
{
this.drpSubItemType.SelectedValue = divisionProject.SubItemType;
}
if (divisionProject.SortIndex != null)
{
this.txtSortIndex.Text = divisionProject.SortIndex.ToString();
@@ -65,6 +70,11 @@ namespace FineUIPro.Web.CQMS.WBS
/// <param name="e"></param>
protected void btnSave_Click(object sender, EventArgs e)
{
if (this.drpSubItemType.SelectedValue == BLL.Const._Null)
{
ShowNotify("请选择分部分项类型！", MessageBoxIcon.Warning);
return;
}
if (!string.IsNullOrEmpty(this.txtDivisionName.Text.Trim()))
{
string selectedCode = Request.Params["selectedCode"];
@@ -75,6 +85,7 @@ namespace FineUIPro.Web.CQMS.WBS
Model.WBS_Division newDivision = new Model.WBS_Division();
newDivision.DivisionCode = this.txtDivisionCode.Text.Trim();
newDivision.DivisionName = this.txtDivisionName.Text.Trim();
newDivision.SubItemType = this.drpSubItemType.SelectedValue;
if (!string.IsNullOrEmpty(this.txtSortIndex.Text.Trim()))
{
try
@@ -109,6 +120,7 @@ namespace FineUIPro.Web.CQMS.WBS
{
divisionProject.DivisionCode = this.txtDivisionCode.Text.Trim();
divisionProject.DivisionName = this.txtDivisionName.Text.Trim();
divisionProject.SubItemType = this.drpSubItemType.SelectedValue;
if (!string.IsNullOrEmpty(this.txtSortIndex.Text.Trim()))
{
divisionProject.SortIndex = Convert.ToInt32(this.txtSortIndex.Text.Trim());
SGGL/FineUIPro.Web/CQMS/WBS/EditDivision.aspx.designer.cs
Generated
+9
View File
@@ -57,6 +57,15 @@ namespace FineUIPro.Web.CQMS.WBS {
/// </remarks>
protected global::FineUIPro.TextBox txtDivisionCode;
/// <summary>
/// drpSubItemType 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpSubItemType;
/// <summary>
/// txtSortIndex 控件。
/// </summary>
SGGL/FineUIPro.Web/CQMS/WBS/EditDivisionProject.aspx
+10
View File
@@ -23,6 +23,16 @@
<f:TextBox ID="txtDivisionCode" runat="server" Label="序号" LabelWidth="130px" ></f:TextBox>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:DropDownList runat="server" ID="drpSubItemType" Label="分部分项类型" LabelWidth="130px">
<f:ListItem Value="1" Text="分部" />
<f:ListItem Value="2" Text="子分部" />
<f:ListItem Value="3" Text="分项" />
<f:ListItem Value="4" Text="子分项" />
</f:DropDownList>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:NumberBox ID="txtSortIndex" runat="server" Label="排序" LabelWidth="130px" NoDecimal="true" NoNegative="true"></f:NumberBox>
SGGL/FineUIPro.Web/CQMS/WBS/EditDivisionProject.aspx.cs
+12
View File
@@ -30,6 +30,7 @@ namespace FineUIPro.Web.CQMS.WBS
if (!IsPostBack)
{
string selectedCode = Request.Params["selectedCode"];
Funs.FineUIPleaseSelect(this.drpSubItemType);
if (Request.Params["type"] == "add")
{
Model.Base_CNProfessional cNProfessional = BLL.CNProfessionalService.GetCNProfessional(selectedCode);
@@ -51,6 +52,10 @@ namespace FineUIPro.Web.CQMS.WBS
Model.WBS_DivisionProject divisionProject = BLL.DivisionProjectService.GetDivisionProjectById(selectedCode);
this.txtDivisionCode.Text = divisionProject.DivisionCode;
this.txtDivisionName.Text = divisionProject.DivisionName;
if (!string.IsNullOrEmpty(divisionProject.SubItemType))
{
this.drpSubItemType.SelectedValue = divisionProject.SubItemType;
}
if (divisionProject.SortIndex != null)
{
this.txtSortIndex.Text = divisionProject.SortIndex.ToString();
@@ -66,6 +71,11 @@ namespace FineUIPro.Web.CQMS.WBS
/// <param name="e"></param>
protected void btnSave_Click(object sender, EventArgs e)
{
if (this.drpSubItemType.SelectedValue == BLL.Const._Null)
{
ShowNotify("请选择分部分项类型！", MessageBoxIcon.Warning);
return;
}
if (!string.IsNullOrEmpty(this.txtDivisionName.Text.Trim()))
{
string selectedCode = Request.Params["selectedCode"];
@@ -77,6 +87,7 @@ namespace FineUIPro.Web.CQMS.WBS
newDivisionProject.DivisionCode = this.txtDivisionCode.Text.Trim();
newDivisionProject.DivisionName = this.txtDivisionName.Text.Trim();
newDivisionProject.UnitWorkId = Request.Params["unitWorkId"];
newDivisionProject.SubItemType = this.drpSubItemType.SelectedValue;
if (!string.IsNullOrEmpty(this.txtSortIndex.Text.Trim()))
{
try
@@ -112,6 +123,7 @@ namespace FineUIPro.Web.CQMS.WBS
{
divisionProject.DivisionCode = this.txtDivisionCode.Text.Trim();
divisionProject.DivisionName = this.txtDivisionName.Text.Trim();
divisionProject.SubItemType = this.drpSubItemType.SelectedValue;
if (!string.IsNullOrEmpty(this.txtSortIndex.Text.Trim()))
{
divisionProject.SortIndex = Convert.ToInt32(this.txtSortIndex.Text.Trim());
SGGL/FineUIPro.Web/CQMS/WBS/EditDivisionProject.aspx.designer.cs
Generated
+9
View File
@@ -57,6 +57,15 @@ namespace FineUIPro.Web.CQMS.WBS {
/// </remarks>
protected global::FineUIPro.TextBox txtDivisionCode;
/// <summary>
/// drpSubItemType 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpSubItemType;
/// <summary>
/// txtSortIndex 控件。
/// </summary>
SGGL/FineUIPro.Web/CQMS/WBS/ProjectControlPoint.aspx.cs
+40 -17
View File
@@ -115,8 +115,8 @@ namespace FineUIPro.Web.CQMS.WBS
{
TreeNode newNode1 = new TreeNode();
newNode1.Text = "建筑工程";
newNode1.NodeID = e.NodeID + "|" + Const.CNProfessionalConstructId;
newNode1.CommandName = "CNProfessional";
newNode1.NodeID = e.NodeID + "|" + "1";
newNode1.CommandName = "ProjectType";
newNode1.EnableExpandEvent = true;
newNode1.EnableClickEvent = true;
e.Node.Nodes.Add(newNode1);
@@ -142,22 +142,45 @@ namespace FineUIPro.Web.CQMS.WBS
}
else if (e.Node.CommandName == "ProjectType") //展开工程类型
{
var cNProfessional = (from x in BLL.Funs.DB.Base_CNProfessional where x.CNProfessionalId != Const.CNProfessionalConstructId && x.CNProfessionalId != Const.CNProfessionalCVId orderby x.SortIndex select x).ToList();
foreach (var c in cNProfessional)
if (e.NodeID.Split('|')[1] == "1")
{
TreeNode newCNProfessionalNode = new TreeNode();
newCNProfessionalNode.Text = c.ProfessionalName;
newCNProfessionalNode.NodeID = e.NodeID.Split('|')[0] + "|" + c.CNProfessionalId;
newCNProfessionalNode.CommandName = "CNProfessional";
newCNProfessionalNode.EnableExpandEvent = true;
newCNProfessionalNode.EnableClickEvent = true;
e.Node.Nodes.Add(newCNProfessionalNode);
TreeNode tempNode = new TreeNode();
tempNode.NodeID = "";
tempNode.Text = "";
tempNode.EnableExpandEvent = true;
tempNode.EnableClickEvent = true;
newCNProfessionalNode.Nodes.Add(tempNode);
var cNProfessional = (from x in BLL.Funs.DB.Base_CNProfessional where x.CNProfessionalId == Const.CNProfessionalCVId orderby x.SortIndex select x).ToList();
foreach (var c in cNProfessional)
{
TreeNode newCNProfessionalNode = new TreeNode();
newCNProfessionalNode.Text = c.ProfessionalName;
newCNProfessionalNode.NodeID = e.NodeID.Split('|')[0] + "|" + c.CNProfessionalId;
newCNProfessionalNode.CommandName = "CNProfessional";
newCNProfessionalNode.EnableExpandEvent = true;
newCNProfessionalNode.EnableClickEvent = true;
e.Node.Nodes.Add(newCNProfessionalNode);
TreeNode tempNode = new TreeNode();
tempNode.NodeID = "";
tempNode.Text = "";
tempNode.EnableExpandEvent = true;
tempNode.EnableClickEvent = true;
newCNProfessionalNode.Nodes.Add(tempNode);
}
}
else
{
var cNProfessional = (from x in BLL.Funs.DB.Base_CNProfessional where x.CNProfessionalId != Const.CNProfessionalConstructId && x.CNProfessionalId != Const.CNProfessionalCVId orderby x.SortIndex select x).ToList();
foreach (var c in cNProfessional)
{
TreeNode newCNProfessionalNode = new TreeNode();
newCNProfessionalNode.Text = c.ProfessionalName;
newCNProfessionalNode.NodeID = e.NodeID.Split('|')[0] + "|" + c.CNProfessionalId;
newCNProfessionalNode.CommandName = "CNProfessional";
newCNProfessionalNode.EnableExpandEvent = true;
newCNProfessionalNode.EnableClickEvent = true;
e.Node.Nodes.Add(newCNProfessionalNode);
TreeNode tempNode = new TreeNode();
tempNode.NodeID = "";
tempNode.Text = "";
tempNode.EnableExpandEvent = true;
tempNode.EnableClickEvent = true;
newCNProfessionalNode.Nodes.Add(tempNode);
}
}
}
else if (e.Node.CommandName == "CNProfessional") //展开专业