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

修改质量验收穿透数据统计

Browse Source
This commit is contained in:
高飞
2023-07-21 14:51:05 +08:00
parent 500cb73a84
commit df904cd642
41 changed files with 774 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/FineUIPro.Web/CQMS/WBS/ControlItemAndCycle.aspx
+14 -1
View File
@@ -87,8 +87,21 @@
</f:DropDownList>
</Editor>
</f:RenderField>
<f:RenderField HeaderText="验收类型" ColumnID="CheckAcceptType" DataField="CheckAcceptType"
SortField="CheckAcceptType" HeaderTextAlign="Center" TextAlign="Center" Width="100px"
FieldType="String">
<Editor>
<f:DropDownList ID="drpCheckAcceptType" TopSpaceFirst="true" runat="server" EmptyText="--请选择--" AutoSelectFirstItem="false" ShowRedStar="true" Required="true">
<f:ListItem Value="关键工序验收" Text="关键工序验收" />
<f:ListItem Value="特殊过程验收" Text="特殊过程验收" />
<f:ListItem Value="隐蔽工程验收" Text="隐蔽工程验收" />
<f:ListItem Value="单位工程一次验收" Text="单位工程一次验收" />
<f:ListItem Value="材料进场复验" Text="材料进场复验" />
</f:DropDownList>
</Editor>
</f:RenderField>
<f:RenderField HeaderText="控制点内容描述" ColumnID="ControlItemDef" DataField="ControlItemDef" SortField="ControlItemDef"
HeaderTextAlign="Center" TextAlign="Center" Width="300px" FieldType="String" >
HeaderTextAlign="Center" TextAlign="Center" Width="200px" FieldType="String" >
<Editor>
<f:TextArea runat="server" ID="txtControlItemDef" AutoGrowHeight="true" Height="70px">
</f:TextArea>
SGGL/FineUIPro.Web/CQMS/WBS/ControlItemAndCycle.aspx.cs
+2 -1
View File
@@ -572,6 +572,7 @@ namespace FineUIPro.Web.CQMS.WBS
Model.WBS_ControlItemAndCycle controlItemAndCycle = BLL.ControlItemAndCycleService.GetControlItemAndCycleById(controlItemAndCycleId);
controlItemAndCycle.ControlPoint = values.Value<string>("ControlPoint");
controlItemAndCycle.ControlItemDef = values.Value<string>("ControlItemDef");
controlItemAndCycle.CheckAcceptType = GetCheckAcceptTypeId(values.Value<string>("CheckAcceptType"));
controlItemAndCycle.Standard = values.Value<string>("Standard");
controlItemAndCycle.ClauseNo = values.Value<string>("ClauseNo");
try
@@ -792,7 +793,7 @@ namespace FineUIPro.Web.CQMS.WBS
/// </summary>
private void BindGrid()
{
string strSql = @"SELECT ControlItemAndCycleId,ControlItemAndCycleCode,InitControlItemCode,ControlItemContent,ControlPoint,ControlItemDef,HGForms,SHForms,Standard,ClauseNo,CheckNum"
string strSql = @"SELECT ControlItemAndCycleId,ControlItemAndCycleCode,InitControlItemCode,ControlItemContent,ControlPoint,ControlItemDef,HGForms,SHForms,Standard,ClauseNo,CheckNum,case CheckAcceptType when '1' then '关键工序验收' when '2' then '特殊过程验收' when '3' then '隐蔽工程验收' when '4' then '单位工程一次验收' when '5' then '材料进场复验' else '' end as CheckAcceptType "
+ @" FROM WBS_ControlItemAndCycle ";
List<SqlParameter> listStr = new List<SqlParameter>();
strSql += " where WorkPackageId = @WorkPackageId and IsApprove=1 ";
SGGL/FineUIPro.Web/CQMS/WBS/ControlItemAndCycle.aspx.designer.cs
Generated
+9
View File
@@ -147,6 +147,15 @@ namespace FineUIPro.Web.CQMS.WBS {
/// </remarks>
protected global::FineUIPro.DropDownList drpControlPoint;
/// <summary>
/// drpCheckAcceptType 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpCheckAcceptType;
/// <summary>
/// txtControlItemDef 控件。
/// </summary>
SGGL/FineUIPro.Web/CQMS/WBS/ControlItemAndCycleEdit.aspx
+11
View File
@@ -36,6 +36,17 @@
</f:DropDownList>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:DropDownList runat="server" ID="drpCheckAcceptType" Label="验收类型" LabelWidth="160px">
<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>
<Items>
<f:TextArea ID="txtControlItemDef" runat="server" Label="控制点内容描述" LabelWidth="160px" Height="80px" Required="true" ShowRedStar="true"></f:TextArea>
SGGL/FineUIPro.Web/CQMS/WBS/ControlItemAndCycleEdit.aspx.cs
+9
View File
@@ -42,6 +42,7 @@ namespace FineUIPro.Web.CQMS.WBS
{
//Funs.FineUIPleaseSelect(this.drpControlPoint);
WorkPackageId = Request.Params["WorkPackageId"];
Funs.FineUIPleaseSelect(this.drpCheckAcceptType);
var workPackage = BLL.WorkPackageService.GetWorkPackageByWorkPackageId(WorkPackageId);
if (workPackage.ProjectType == "1") //建筑工程
{
@@ -93,6 +94,10 @@ namespace FineUIPro.Web.CQMS.WBS
{
this.txtWeights.Text = controlItemAndCycle.Weights.ToString();
}
if (!string.IsNullOrEmpty(controlItemAndCycle.CheckAcceptType))
{
this.drpCheckAcceptType.SelectedValue = controlItemAndCycle.CheckAcceptType;
}
this.txtHGForms.Text = controlItemAndCycle.HGForms;
this.txtSHForms.Text = controlItemAndCycle.SHForms;
this.txtStandard.Text = controlItemAndCycle.Standard;
@@ -127,6 +132,10 @@ namespace FineUIPro.Web.CQMS.WBS
{
newControlItemAndCycle.Weights = Convert.ToDecimal(this.txtWeights.Text.Trim());
}
if (this.drpCheckAcceptType.SelectedValue != BLL.Const._Null)
{
newControlItemAndCycle.CheckAcceptType = this.drpCheckAcceptType.SelectedValue;
}
newControlItemAndCycle.HGForms = this.txtHGForms.Text.Trim();
newControlItemAndCycle.SHForms = this.txtSHForms.Text.Trim();
newControlItemAndCycle.Standard = this.txtStandard.Text.Trim();
SGGL/FineUIPro.Web/CQMS/WBS/ControlItemAndCycleEdit.aspx.designer.cs
Generated
+9
View File
@@ -66,6 +66,15 @@ namespace FineUIPro.Web.CQMS.WBS {
/// </remarks>
protected global::FineUIPro.DropDownList drpControlPoint;
/// <summary>
/// drpCheckAcceptType 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpCheckAcceptType;
/// <summary>
/// txtControlItemDef 控件。
/// </summary>
SGGL/FineUIPro.Web/CQMS/WBS/ControlItemInitEdit.aspx
+11
View File
@@ -36,6 +36,17 @@
</f:DropDownList>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:DropDownList runat="server" ID="drpCheckAcceptType" Label="验收类型" LabelWidth="160px">
<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>
<Items>
<f:TextArea ID="txtControlItemDef" runat="server" Label="控制点内容描述" LabelWidth="160px" Height="80px" Required="true" ShowRedStar="true"></f:TextArea>
SGGL/FineUIPro.Web/CQMS/WBS/ControlItemInitEdit.aspx.cs
+9
View File
@@ -41,6 +41,7 @@ namespace FineUIPro.Web.CQMS.WBS
if (!IsPostBack)
{
Funs.FineUIPleaseSelect(this.drpControlPoint);
Funs.FineUIPleaseSelect(this.drpCheckAcceptType);
WorkPackageCode = Request.Params["WorkPackageCode"];
var workPackage = BLL.WorkPackageInitService.GetWorkPackageInitByWorkPackageCode(WorkPackageCode);
if (workPackage.ProjectType == "1") //建筑工程
@@ -93,6 +94,10 @@ namespace FineUIPro.Web.CQMS.WBS
{
this.txtWeights.Text = controlItem.Weights.ToString();
}
if (!string.IsNullOrEmpty(controlItem.CheckAcceptType))
{
this.drpCheckAcceptType.SelectedValue = controlItem.CheckAcceptType;
}
this.txtHGForms.Text = controlItem.HGForms;
this.txtSHForms.Text = controlItem.SHForms;
this.txtStandard.Text = controlItem.Standard;
@@ -117,6 +122,10 @@ namespace FineUIPro.Web.CQMS.WBS
{
newControlItem.Weights = Convert.ToDecimal(this.txtWeights.Text.Trim());
}
if (this.drpCheckAcceptType.SelectedValue != BLL.Const._Null)
{
newControlItem.CheckAcceptType = this.drpCheckAcceptType.SelectedValue;
}
newControlItem.HGForms = this.txtHGForms.Text.Trim();
newControlItem.SHForms = this.txtSHForms.Text.Trim();
newControlItem.Standard = this.txtStandard.Text.Trim();
SGGL/FineUIPro.Web/CQMS/WBS/ControlItemInitEdit.aspx.designer.cs
Generated
+9
View File
@@ -66,6 +66,15 @@ namespace FineUIPro.Web.CQMS.WBS {
/// </remarks>
protected global::FineUIPro.DropDownList drpControlPoint;
/// <summary>
/// drpCheckAcceptType 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpCheckAcceptType;
/// <summary>
/// txtControlItemDef 控件。
/// </summary>
SGGL/FineUIPro.Web/CQMS/WBS/ControlItemProjectEdit.aspx
+11
View File
@@ -36,6 +36,17 @@
</f:DropDownList>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:DropDownList runat="server" ID="drpCheckAcceptType" Label="验收类型" LabelWidth="160px">
<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>
<Items>
<f:TextArea ID="txtControlItemDef" runat="server" Label="控制点内容描述" LabelWidth="160px" Height="80px" Required="true" ShowRedStar="true"></f:TextArea>
SGGL/FineUIPro.Web/CQMS/WBS/ControlItemProjectEdit.aspx.cs
+9
View File
@@ -41,6 +41,7 @@ namespace FineUIPro.Web.CQMS.WBS
if (!IsPostBack)
{
Funs.FineUIPleaseSelect(this.drpControlPoint);
Funs.FineUIPleaseSelect(this.drpCheckAcceptType);
WorkPackageCode = Request.Params["WorkPackageCode"];
var workPackage = BLL.WorkPackageProjectService.GetWorkPackageProjectByWorkPackageCode(WorkPackageCode, this.CurrUser.LoginProjectId);
if (workPackage.ProjectType == "1") //建筑工程
@@ -93,6 +94,10 @@ namespace FineUIPro.Web.CQMS.WBS
{
this.txtWeights.Text = controlItem.Weights.ToString();
}
if (!string.IsNullOrEmpty(controlItem.CheckAcceptType))
{
this.drpCheckAcceptType.SelectedValue = controlItem.CheckAcceptType;
}
this.txtHGForms.Text = controlItem.HGForms;
this.txtSHForms.Text = controlItem.SHForms;
this.txtStandard.Text = controlItem.Standard;
@@ -122,6 +127,10 @@ namespace FineUIPro.Web.CQMS.WBS
{
newControlItemProject.Weights = Convert.ToDecimal(this.txtWeights.Text.Trim());
}
if (this.drpCheckAcceptType.SelectedValue != BLL.Const._Null)
{
newControlItemProject.CheckAcceptType = this.drpCheckAcceptType.SelectedValue;
}
newControlItemProject.HGForms = this.txtHGForms.Text.Trim();
newControlItemProject.SHForms = this.txtSHForms.Text.Trim();
newControlItemProject.Standard = this.txtStandard.Text.Trim();
SGGL/FineUIPro.Web/CQMS/WBS/ControlItemProjectEdit.aspx.designer.cs
Generated
+9
View File
@@ -66,6 +66,15 @@ namespace FineUIPro.Web.CQMS.WBS {
/// </remarks>
protected global::FineUIPro.DropDownList drpControlPoint;
/// <summary>
/// drpCheckAcceptType 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpCheckAcceptType;
/// <summary>
/// txtControlItemDef 控件。
/// </summary>
SGGL/FineUIPro.Web/CQMS/WBS/ProjectControlItemInitSet.aspx
+15 -2
View File
@@ -28,7 +28,7 @@
RegionPercent="20%" Title="项目WBS基础数据库" TitleToolTip="项目WBS基础数据库" ShowBorder="true" ShowHeader="true"
BodyPadding="10px">
<Items>
<f:Tree ID="trWBS" EnableCollapse="true" ShowHeader="true"
<f:Tree ID="trWBS" EnableCollapse="true" ShowHeader="true"
OnNodeCommand="trWBS_NodeCommand" OnNodeExpand="trWBS_NodeExpand" AutoLeafIdentification="true"
runat="server">
<Toolbars>
@@ -98,8 +98,21 @@
</f:DropDownList>
</Editor>
</f:RenderField>
<f:RenderField HeaderText="验收类型" ColumnID="CheckAcceptType" DataField="CheckAcceptType"
SortField="CheckAcceptType" HeaderTextAlign="Center" TextAlign="Center" Width="100px"
FieldType="String">
<Editor>
<f:DropDownList ID="drpCheckAcceptType" TopSpaceFirst="true" runat="server" EmptyText="--请选择--" AutoSelectFirstItem="false" ShowRedStar="true" Required="true">
<f:ListItem Value="关键工序验收" Text="关键工序验收" />
<f:ListItem Value="特殊过程验收" Text="特殊过程验收" />
<f:ListItem Value="隐蔽工程验收" Text="隐蔽工程验收" />
<f:ListItem Value="单位工程一次验收" Text="单位工程一次验收" />
<f:ListItem Value="材料进场复验" Text="材料进场复验" />
</f:DropDownList>
</Editor>
</f:RenderField>
<f:RenderField HeaderText="控制点内容描述" ColumnID="ControlItemDef" DataField="ControlItemDef" SortField="ControlItemDef"
HeaderTextAlign="Center" TextAlign="Center" Width="300px" FieldType="String">
HeaderTextAlign="Center" TextAlign="Center" Width="200px" FieldType="String">
<Editor>
<f:TextArea runat="server" ID="txtControlItemDef" AutoGrowHeight="true" Height="70px">
</f:TextArea>
SGGL/FineUIPro.Web/CQMS/WBS/ProjectControlItemInitSet.aspx.cs
+5 -1
View File
@@ -460,6 +460,7 @@ namespace FineUIPro.Web.CQMS.WBS
string controlItemCode = values.Value<string>("ControlItemCode");
Model.WBS_ControlItemProject controlItemProject = BLL.ControlItemProjectService.GetControlItemProjectByCode(controlItemCode, this.CurrUser.LoginProjectId);
controlItemProject.ControlPoint = values.Value<string>("ControlPoint");
controlItemProject.CheckAcceptType = GetCheckAcceptTypeId(values.Value<string>("CheckAcceptType"));
controlItemProject.ControlItemDef = values.Value<string>("ControlItemDef");
controlItemProject.Standard = values.Value<string>("Standard");
controlItemProject.ClauseNo = values.Value<string>("ClauseNo");
@@ -621,7 +622,7 @@ namespace FineUIPro.Web.CQMS.WBS
/// </summary>
private void BindGrid()
{
string strSql = @"SELECT ControlItemCode,WorkPackageCode,ControlItemContent,ControlPoint,ControlItemDef,HGForms,SHForms,Standard,ClauseNo,CheckNum"
string strSql = @"SELECT ControlItemCode,WorkPackageCode,ControlItemContent,ControlPoint,ControlItemDef,HGForms,SHForms,Standard,ClauseNo,CheckNum,case CheckAcceptType when '1' then '关键工序验收' when '2' then '特殊过程验收' when '3' then '隐蔽工程验收' when '4' then '单位工程一次验收' when '5' then '材料进场复验' else '' end as CheckAcceptType "
+ @" FROM WBS_ControlItemProject ";
List<SqlParameter> listStr = new List<SqlParameter>();
strSql += " where WorkPackageCode = @WorkPackageCode and ProjectId=@ProjectId";
@@ -977,6 +978,7 @@ namespace FineUIPro.Web.CQMS.WBS
cp.SHForms = item.SHForms;
cp.Standard = item.Standard;
cp.ClauseNo = item.ClauseNo;
cp.CheckAcceptType = item.CheckAcceptType;
cp.CheckNum = 1;
BLL.ControlItemProjectService.UpdateControlItemProject(cp);
}
@@ -994,6 +996,7 @@ namespace FineUIPro.Web.CQMS.WBS
controlItemProject.Standard = item.Standard;
controlItemProject.ClauseNo = item.ClauseNo;
controlItemProject.CheckNum = 1;
controlItemProject.CheckAcceptType = item.CheckAcceptType;
BLL.ControlItemProjectService.AddControlItemProject(controlItemProject);
}
}
@@ -1043,6 +1046,7 @@ namespace FineUIPro.Web.CQMS.WBS
controlItemProject.Standard = controlItemInit.Standard;
controlItemProject.ClauseNo = controlItemInit.ClauseNo;
controlItemProject.CheckNum = 1;
controlItemProject.CheckAcceptType = controlItemInit.CheckAcceptType;
BLL.ControlItemProjectService.AddControlItemProject(controlItemProject);
}
ShowNotify("全部恢复默认成功！", MessageBoxIcon.Success);
SGGL/FineUIPro.Web/CQMS/WBS/ProjectControlItemInitSet.aspx.designer.cs
Generated
+9
View File
@@ -201,6 +201,15 @@ namespace FineUIPro.Web.CQMS.WBS {
/// </remarks>
protected global::FineUIPro.DropDownList drpControlPoint;
/// <summary>
/// drpCheckAcceptType 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpCheckAcceptType;
/// <summary>
/// txtControlItemDef 控件。
/// </summary>
SGGL/FineUIPro.Web/CQMS/WBS/WorkPackageInitEdit.aspx
+10
View File
@@ -24,6 +24,16 @@
<f:TextBox ID="txtWorkPackageName" runat="server" Label="名称" LabelWidth="130px" Required="true" ShowRedStar="true"></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:DropDownList ID="drpIsChild" ShowRedStar="true" runat="server" EmptyText="--请选择--" AutoSelectFirstItem="false" Required="true" LabelWidth="130px" Label="是否末级" LabelAlign="Right" EnableEdit="true">
SGGL/FineUIPro.Web/CQMS/WBS/WorkPackageInitEdit.aspx.cs
+11
View File
@@ -73,6 +73,7 @@ namespace FineUIPro.Web.CQMS.WBS
if (!IsPostBack)
{
WorkPackageCode = Request.Params["Id"];
Funs.FineUIPleaseSelect(this.drpSubItemType);
if (Request.Params["type"] == "add")
{
List<String> codelist = null;
@@ -130,6 +131,10 @@ namespace FineUIPro.Web.CQMS.WBS
{
this.drpIsChild.SelectedValue = "False";
}
if (!string.IsNullOrEmpty(workPackageInit.SubItemType))
{
this.drpSubItemType.SelectedValue = workPackageInit.SubItemType;
}
SuperWorkPack = workPackageInit.SuperWorkPack;
}
}
@@ -140,6 +145,11 @@ namespace FineUIPro.Web.CQMS.WBS
{
if (BLL.CommonService.GetAllButtonPowerList(CurrUser.LoginProjectId, this.CurrUser.PersonId, BLL.Const.ControlItemInitSetMenuId, BLL.Const.BtnSave))
{
if (this.drpSubItemType.SelectedValue == BLL.Const._Null)
{
ShowNotify("请选择分部分项类型！", MessageBoxIcon.Warning);
return;
}
if (!BLL.WorkPackageInitService.IsExistWorkPackageInitName(this.SuperWorkPack, this.txtWorkPackageName.Text.Trim(), this.txtWorkPackageCode.Text.Trim()))
{
Model.WBS_WorkPackageInit newWorkPackage = new Model.WBS_WorkPackageInit();
@@ -147,6 +157,7 @@ namespace FineUIPro.Web.CQMS.WBS
newWorkPackage.PackageContent = this.txtWorkPackageName.Text.Trim();
newWorkPackage.SuperWorkPack = SuperWorkPack;
newWorkPackage.IsChild = Convert.ToBoolean(this.drpIsChild.SelectedValue.Trim());
newWorkPackage.SubItemType = this.drpSubItemType.SelectedValue;
newWorkPackage.ProjectType = ProjectType;
if (Request.Params["type"] == "add")
{
SGGL/FineUIPro.Web/CQMS/WBS/WorkPackageInitEdit.aspx.designer.cs
Generated
+9
View File
@@ -57,6 +57,15 @@ namespace FineUIPro.Web.CQMS.WBS {
/// </remarks>
protected global::FineUIPro.TextBox txtWorkPackageName;
/// <summary>
/// drpSubItemType 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpSubItemType;
/// <summary>
/// drpIsChild 控件。
/// </summary>
SGGL/FineUIPro.Web/CQMS/WBS/WorkPackageProjectEdit.aspx
+10
View File
@@ -24,6 +24,16 @@
<f:TextBox ID="txtWorkPackageName" runat="server" Label="名称" LabelWidth="130px" Required="true" ShowRedStar="true"></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:DropDownList ID="drpIsChild" ShowRedStar="true" runat="server" Required="true" LabelWidth="130px" Label="是否末级" LabelAlign="Right" EnableEdit="true">
SGGL/FineUIPro.Web/CQMS/WBS/WorkPackageProjectEdit.aspx.cs
+11
View File
@@ -73,6 +73,7 @@ namespace FineUIPro.Web.CQMS.WBS
if (!IsPostBack)
{
WorkPackageCode = Request.Params["Id"];
Funs.FineUIPleaseSelect(this.drpSubItemType);
if (Request.Params["type"] == "add")
{
List<String> codelist = null;
@@ -130,6 +131,10 @@ namespace FineUIPro.Web.CQMS.WBS
{
this.drpIsChild.SelectedValue = "False";
}
if (!string.IsNullOrEmpty(workPackageProject.SubItemType))
{
this.drpSubItemType.SelectedValue = workPackageProject.SubItemType;
}
SuperWorkPack = workPackageProject.SuperWorkPack;
}
}
@@ -140,6 +145,11 @@ namespace FineUIPro.Web.CQMS.WBS
{
if (BLL.CommonService.GetAllButtonPowerList(CurrUser.LoginProjectId, this.CurrUser.PersonId, BLL.Const.ControlItemProjectSetMenuId, BLL.Const.BtnSave))
{
if (this.drpSubItemType.SelectedValue == BLL.Const._Null)
{
ShowNotify("请选择分部分项类型！", MessageBoxIcon.Warning);
return;
}
if (!BLL.WorkPackageProjectService.IsExistWorkPackageProjectName(this.SuperWorkPack, this.txtWorkPackageName.Text.Trim(), this.txtWorkPackageCode.Text.Trim(), this.CurrUser.LoginProjectId))
{
Model.WBS_WorkPackageProject newWorkPackage = new Model.WBS_WorkPackageProject();
@@ -147,6 +157,7 @@ namespace FineUIPro.Web.CQMS.WBS
newWorkPackage.ProjectId = this.CurrUser.LoginProjectId;
newWorkPackage.PackageContent = this.txtWorkPackageName.Text.Trim();
newWorkPackage.SuperWorkPack = SuperWorkPack;
newWorkPackage.SubItemType = this.drpSubItemType.SelectedValue;
newWorkPackage.IsChild = Convert.ToBoolean(this.drpIsChild.SelectedValue.Trim());
newWorkPackage.ProjectType = ProjectType;
if (Request.Params["type"] == "add")
SGGL/FineUIPro.Web/CQMS/WBS/WorkPackageProjectEdit.aspx.designer.cs
Generated
+9
View File
@@ -57,6 +57,15 @@ namespace FineUIPro.Web.CQMS.WBS {
/// </remarks>
protected global::FineUIPro.TextBox txtWorkPackageName;
/// <summary>
/// drpSubItemType 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpSubItemType;
/// <summary>
/// drpIsChild 控件。
/// </summary>
SGGL/FineUIPro.Web/CQMS/WBS/WorkPackageSet1.aspx
+13 -1
View File
@@ -58,6 +58,18 @@
</f:TextBox>
</Editor>
</f:RenderField>
<f:RenderField HeaderText="分部分项类型" ColumnID="SubItemType" DataField="SubItemType"
SortField="SubItemType" HeaderTextAlign="Center" TextAlign="Center" Width="100px"
FieldType="String">
<Editor>
<f:DropDownList ID="drpSubItemType" TopSpaceFirst="true" runat="server" EmptyText="--请选择--" AutoSelectFirstItem="false" ShowRedStar="true" Required="true">
<f:ListItem Value="分部" Text="分部" />
<f:ListItem Value="子分部" Text="子分部" />
<f:ListItem Value="分项" Text="分项" />
<f:ListItem Value="子分项" Text="子分项" />
</f:DropDownList>
</Editor>
</f:RenderField>
<f:LinkButtonField Width="60px" TextAlign="Center" HeaderText="增加" ToolTip="增加" CommandName="add"
Icon="Add" />
<f:LinkButtonField Width="60px" TextAlign="Center" HeaderText="删除" ToolTip="删除" CommandName="del"
@@ -127,7 +139,7 @@
me.updateCellValue(rowId, 'Costs', (totalValue / 100 * parseFloat(Weights)).toFixed(4));
}
}
else{
else {
me.updateCellValue(rowId, 'Costs', "");
}
}
SGGL/FineUIPro.Web/CQMS/WBS/WorkPackageSet1.aspx.cs
+7
View File
@@ -65,6 +65,7 @@ namespace FineUIPro.Web.CQMS.WBS
newWorkPackageProject.WorkPackageCode = workPackageProject.WorkPackageCode;
newWorkPackageProject.WorkPackageId = SQLHelper.GetNewID(typeof(Model.WBS_WorkPackage));
newWorkPackageProject.PackageContent = workPackageProject.PackageContent;
newWorkPackageProject.SubItemType = GetSubItemTypeText(workPackageProject.SubItemType);
workPackages.Add(newWorkPackageProject);
}
foreach (var addWorkPackage in addWorkPackages)
@@ -81,6 +82,7 @@ namespace FineUIPro.Web.CQMS.WBS
newAddWorkPackage.SuperWorkPack = addWorkPackage.PackageContent.Substring(addWorkPackage.PackageContent.IndexOf("-") + 1);
}
}
newAddWorkPackage.SubItemType = GetSubItemTypeText(addWorkPackage.SubItemType);
workPackages.Add(newAddWorkPackage);
}
workPackages = workPackages.OrderBy(x => x.WorkPackageCode).ToList();
@@ -559,12 +561,14 @@ namespace FineUIPro.Web.CQMS.WBS
newWorkPackage.PackageCode = code;
newWorkPackage.ProjectType = workPackageProject.ProjectType;
newWorkPackage.InitWorkPackageCode = workPackageProject.WorkPackageCode;
newWorkPackage.SubItemType = GetSubItemTypeId(values.Value<string>("SubItemType"));
BLL.WorkPackageService.AddWorkPackage(newWorkPackage);
num++;
}
else
{
oldWorkPackage.PackageContent = workPackageProject.PackageContent + name;
oldWorkPackage.SubItemType = GetSubItemTypeId(values.Value<string>("SubItemType"));
BLL.WorkPackageService.UpdateWorkPackage(oldWorkPackage);
}
}
@@ -660,6 +664,7 @@ namespace FineUIPro.Web.CQMS.WBS
newWorkPackage.IsApprove = true;
newWorkPackage.ProjectType = workPackageProject.ProjectType;
newWorkPackage.InitWorkPackageCode = workPackageProject.WorkPackageCode;
newWorkPackage.SubItemType = GetSubItemTypeId(values.Value<string>("SubItemType"));
BLL.WorkPackageService.AddWorkPackage(newWorkPackage);
num++;
}
@@ -667,6 +672,7 @@ namespace FineUIPro.Web.CQMS.WBS
{
oldWorkPackage.PackageContent = workPackageProject.PackageContent + name;
oldWorkPackage.IsApprove = true;
oldWorkPackage.SubItemType = GetSubItemTypeId(values.Value<string>("SubItemType"));
BLL.WorkPackageService.UpdateWorkPackage(oldWorkPackage);
}
}
@@ -727,6 +733,7 @@ namespace FineUIPro.Web.CQMS.WBS
newWorkPackage.PackageCode = code;
newWorkPackage.ProjectType = workPackageProject.ProjectType;
newWorkPackage.InitWorkPackageCode = workPackageProject.WorkPackageCode;
newWorkPackage.SubItemType = GetSubItemTypeId(values.Value<string>("SubItemType"));
BLL.WorkPackageService.AddWorkPackage(newWorkPackage);
num++;
}
SGGL/FineUIPro.Web/CQMS/WBS/WorkPackageSet1.aspx.designer.cs
Generated
+9
View File
@@ -147,6 +147,15 @@ namespace FineUIPro.Web.CQMS.WBS {
/// </remarks>
protected global::FineUIPro.TextBox txtName;
/// <summary>
/// drpSubItemType 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpSubItemType;
/// <summary>
/// Region2 控件。
/// </summary>
SGGL/FineUIPro.Web/CQMS/WBS/WorkPackageSet2.aspx
+12
View File
@@ -61,6 +61,18 @@
</f:TextBox>
</Editor>
</f:RenderField>
<f:RenderField HeaderText="分部分项类型" ColumnID="SubItemType" DataField="SubItemType"
SortField="SubItemType" HeaderTextAlign="Center" TextAlign="Center" Width="100px"
FieldType="String">
<Editor>
<f:DropDownList ID="drpSubItemType" TopSpaceFirst="true" runat="server" EmptyText="--请选择--" AutoSelectFirstItem="false" ShowRedStar="true" Required="true">
<f:ListItem Value="分部" Text="分部" />
<f:ListItem Value="子分部" Text="子分部" />
<f:ListItem Value="分项" Text="分项" />
<f:ListItem Value="子分项" Text="子分项" />
</f:DropDownList>
</Editor>
</f:RenderField>
<f:LinkButtonField Width="60px" TextAlign="Center" HeaderText="增加" ToolTip="增加" CommandName="add"
Icon="Add" />
<f:LinkButtonField Width="60px" TextAlign="Center" HeaderText="删除" ToolTip="删除" CommandName="del"
SGGL/FineUIPro.Web/CQMS/WBS/WorkPackageSet2.aspx.cs
+7
View File
@@ -99,6 +99,7 @@ namespace FineUIPro.Web.CQMS.WBS
newWorkPackageProject.WorkPackageCode = workPackageProject.WorkPackageCode;
newWorkPackageProject.WorkPackageId = SQLHelper.GetNewID(typeof(Model.WBS_WorkPackage));
newWorkPackageProject.PackageContent = workPackageProject.PackageContent;
newWorkPackageProject.SubItemType = GetSubItemTypeText(workPackageProject.SubItemType);
workPackages.Add(newWorkPackageProject);
}
foreach (var addWorkPackage in addWorkPackages)
@@ -115,6 +116,7 @@ namespace FineUIPro.Web.CQMS.WBS
newAddWorkPackage.SuperWorkPack = addWorkPackage.PackageContent.Substring(addWorkPackage.PackageContent.IndexOf("-") + 1);
}
}
newAddWorkPackage.SubItemType = GetSubItemTypeText(addWorkPackage.SubItemType);
workPackages.Add(newAddWorkPackage);
}
workPackages = workPackages.OrderBy(x => x.WorkPackageCode).ToList();
@@ -591,12 +593,14 @@ namespace FineUIPro.Web.CQMS.WBS
newWorkPackage.PackageCode = code;
newWorkPackage.ProjectType = workPackageProject.ProjectType;
newWorkPackage.InitWorkPackageCode = workPackageProject.WorkPackageCode;
newWorkPackage.SubItemType = GetSubItemTypeId(values.Value<string>("SubItemType"));
BLL.WorkPackageService.AddWorkPackage(newWorkPackage);
num++;
}
else
{
oldWorkPackage.PackageContent = workPackageProject.PackageContent + name;
oldWorkPackage.SubItemType = GetSubItemTypeId(values.Value<string>("SubItemType"));
BLL.WorkPackageService.UpdateWorkPackage(oldWorkPackage);
}
}
@@ -689,6 +693,7 @@ namespace FineUIPro.Web.CQMS.WBS
newWorkPackage.IsApprove = true;
newWorkPackage.ProjectType = workPackageProject.ProjectType;
newWorkPackage.InitWorkPackageCode = workPackageProject.WorkPackageCode;
newWorkPackage.SubItemType = GetSubItemTypeId(values.Value<string>("SubItemType"));
BLL.WorkPackageService.AddWorkPackage(newWorkPackage);
num++;
}
@@ -696,6 +701,7 @@ namespace FineUIPro.Web.CQMS.WBS
{
oldWorkPackage.PackageContent = workPackageProject.PackageContent + name;
oldWorkPackage.IsApprove = true;
oldWorkPackage.SubItemType = GetSubItemTypeId(values.Value<string>("SubItemType"));
BLL.WorkPackageService.UpdateWorkPackage(oldWorkPackage);
}
}
@@ -757,6 +763,7 @@ namespace FineUIPro.Web.CQMS.WBS
newWorkPackage.PackageCode = code;
newWorkPackage.ProjectType = workPackageProject.ProjectType;
newWorkPackage.InitWorkPackageCode = workPackageProject.WorkPackageCode;
newWorkPackage.SubItemType = GetSubItemTypeId(values.Value<string>("SubItemType"));
BLL.WorkPackageService.AddWorkPackage(newWorkPackage);
num++;
}
SGGL/FineUIPro.Web/CQMS/WBS/WorkPackageSet2.aspx.designer.cs
Generated
+9
View File
@@ -156,6 +156,15 @@ namespace FineUIPro.Web.CQMS.WBS {
/// </remarks>
protected global::FineUIPro.TextBox txtName;
/// <summary>
/// drpSubItemType 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpSubItemType;
/// <summary>
/// Region2 控件。
/// </summary>