diff --git a/SGGL/FineUIPro.Web/CQMS/WBS/ProjectControlPoint.aspx b/SGGL/FineUIPro.Web/CQMS/WBS/ProjectControlPoint.aspx
index 04b7fa9f..851496d2 100644
--- a/SGGL/FineUIPro.Web/CQMS/WBS/ProjectControlPoint.aspx
+++ b/SGGL/FineUIPro.Web/CQMS/WBS/ProjectControlPoint.aspx
@@ -86,6 +86,9 @@
+
+
diff --git a/SGGL/FineUIPro.Web/CQMS/WBS/ProjectControlPoint.aspx.cs b/SGGL/FineUIPro.Web/CQMS/WBS/ProjectControlPoint.aspx.cs
index 24175af9..b54e197b 100644
--- a/SGGL/FineUIPro.Web/CQMS/WBS/ProjectControlPoint.aspx.cs
+++ b/SGGL/FineUIPro.Web/CQMS/WBS/ProjectControlPoint.aspx.cs
@@ -65,11 +65,12 @@ namespace FineUIPro.Web.CQMS.WBS
this.Grid1.Columns[3].Hidden = true;
this.Grid1.Columns[4].Hidden = true;
this.Grid1.Columns[5].Hidden = false;
- this.Grid1.Columns[7].Hidden = false;
+ this.Grid1.Columns[6].Hidden = false;
this.Grid1.Columns[8].Hidden = false;
this.Grid1.Columns[9].Hidden = false;
this.Grid1.Columns[10].Hidden = false;
this.Grid1.Columns[11].Hidden = false;
+ this.Grid1.Columns[12].Hidden = false;
}
}
#endregion
@@ -452,25 +453,27 @@ namespace FineUIPro.Web.CQMS.WBS
this.Grid1.Columns[3].Hidden = true;
this.Grid1.Columns[4].Hidden = true;
this.Grid1.Columns[5].Hidden = false;
- this.Grid1.Columns[7].Hidden = false;
+ this.Grid1.Columns[6].Hidden = false;
this.Grid1.Columns[8].Hidden = false;
this.Grid1.Columns[9].Hidden = false;
this.Grid1.Columns[10].Hidden = false;
this.Grid1.Columns[11].Hidden = false;
this.Grid1.Columns[12].Hidden = false;
+ this.Grid1.Columns[13].Hidden = false;
}
else
{
this.Grid1.Columns[2].Hidden = false;
this.Grid1.Columns[3].Hidden = false;
this.Grid1.Columns[4].Hidden = false;
- this.Grid1.Columns[5].Hidden = true;
- this.Grid1.Columns[7].Hidden = true;
+ this.Grid1.Columns[5].Hidden = false;
+ this.Grid1.Columns[6].Hidden = true;
this.Grid1.Columns[8].Hidden = true;
this.Grid1.Columns[9].Hidden = true;
this.Grid1.Columns[10].Hidden = true;
this.Grid1.Columns[11].Hidden = true;
this.Grid1.Columns[12].Hidden = true;
+ this.Grid1.Columns[13].Hidden = true;
}
BindGrid();
}
@@ -845,8 +848,9 @@ namespace FineUIPro.Web.CQMS.WBS
///
private void BindGrid()
{
- string strSql = @"SELECT BreakdownProjectId,BreakdownCode,BreakdownName,Basis,CheckPoints,RecordAndCode,Class,FenBao,WuHuan,JianLi,YeZhu,Remark,ModelURL"
- + @" FROM WBS_BreakdownProject ";
+ string strSql = @"SELECT BreakdownProjectId,BreakdownCode,BreakdownName,Basis,CheckPoints,RecordAndCode,Class,FenBao,WuHuan,JianLi,YeZhu,Remark,ModelURL
+,(CASE WHEN CheckAcceptType='1' THEN '关键工序验收' WHEN CheckAcceptType='2' THEN '特殊过程验收' WHEN CheckAcceptType='3' THEN '隐蔽工程验收' WHEN CheckAcceptType='4' THEN '单位工程验收' WHEN CheckAcceptType='5' THEN '分部工程验收' WHEN CheckAcceptType='6' THEN '分项工程验收' ELSE '' END) AS CheckAcceptType
+FROM WBS_BreakdownProject ";
List listStr = new List();
strSql += " where DivisionProjectId = @DivisionProjectId and ProjectId=@ProjectId";
listStr.Add(new SqlParameter("@DivisionProjectId", this.trWBS.SelectedNodeID));
diff --git a/SGGL/FineUIPro.Web/CQMS/WBS/ProjectControlPointFile.aspx b/SGGL/FineUIPro.Web/CQMS/WBS/ProjectControlPointFile.aspx
index 51a61a1e..9801e065 100644
--- a/SGGL/FineUIPro.Web/CQMS/WBS/ProjectControlPointFile.aspx
+++ b/SGGL/FineUIPro.Web/CQMS/WBS/ProjectControlPointFile.aspx
@@ -44,13 +44,19 @@
-
+ PageSize="100" OnPageIndexChange="Grid1_PageIndexChange" AllowFilters="true" OnFilterChange="Grid1_FilterChange">--%>
+
@@ -73,6 +79,9 @@
+
+
diff --git a/SGGL/FineUIPro.Web/CQMS/WBS/ProjectControlPointFile.aspx.cs b/SGGL/FineUIPro.Web/CQMS/WBS/ProjectControlPointFile.aspx.cs
index 73319341..f1413fd0 100644
--- a/SGGL/FineUIPro.Web/CQMS/WBS/ProjectControlPointFile.aspx.cs
+++ b/SGGL/FineUIPro.Web/CQMS/WBS/ProjectControlPointFile.aspx.cs
@@ -58,11 +58,12 @@ namespace FineUIPro.Web.CQMS.WBS
this.Grid1.Columns[3].Hidden = true;
this.Grid1.Columns[4].Hidden = true;
this.Grid1.Columns[5].Hidden = false;
- this.Grid1.Columns[7].Hidden = false;
+ this.Grid1.Columns[6].Hidden = false;
this.Grid1.Columns[8].Hidden = false;
this.Grid1.Columns[9].Hidden = false;
this.Grid1.Columns[10].Hidden = false;
this.Grid1.Columns[11].Hidden = false;
+ this.Grid1.Columns[12].Hidden = false;
}
}
#endregion
@@ -351,12 +352,13 @@ namespace FineUIPro.Web.CQMS.WBS
this.Grid1.Columns[3].Hidden = true;
this.Grid1.Columns[4].Hidden = true;
this.Grid1.Columns[5].Hidden = false;
- this.Grid1.Columns[7].Hidden = false;
+ this.Grid1.Columns[6].Hidden = false;
this.Grid1.Columns[8].Hidden = false;
this.Grid1.Columns[9].Hidden = false;
this.Grid1.Columns[10].Hidden = false;
this.Grid1.Columns[11].Hidden = false;
this.Grid1.Columns[12].Hidden = false;
+ this.Grid1.Columns[13].Hidden = false;
}
else
{
@@ -364,12 +366,13 @@ namespace FineUIPro.Web.CQMS.WBS
this.Grid1.Columns[3].Hidden = false;
this.Grid1.Columns[4].Hidden = false;
this.Grid1.Columns[5].Hidden = true;
- this.Grid1.Columns[7].Hidden = true;
+ this.Grid1.Columns[6].Hidden = true;
this.Grid1.Columns[8].Hidden = true;
this.Grid1.Columns[9].Hidden = true;
this.Grid1.Columns[10].Hidden = true;
this.Grid1.Columns[11].Hidden = true;
this.Grid1.Columns[12].Hidden = true;
+ this.Grid1.Columns[13].Hidden = true;
}
BindGrid();
}
@@ -516,8 +519,9 @@ namespace FineUIPro.Web.CQMS.WBS
///
private void BindGrid()
{
- string strSql = @"SELECT BreakdownProjectId,BreakdownCode,BreakdownName,Basis,CheckPoints,RecordAndCode,Class,FenBao,WuHuan,JianLi,YeZhu,Remark,ModelURL
- FROM WBS_BreakdownProject ";
+ string strSql = @"SELECT BreakdownProjectId,BreakdownCode,BreakdownName,Basis,CheckPoints,RecordAndCode,Class,FenBao,WuHuan,JianLi,YeZhu,Remark,ModelURL
+,(CASE WHEN CheckAcceptType='1' THEN '关键工序验收' WHEN CheckAcceptType='2' THEN '特殊过程验收' WHEN CheckAcceptType='3' THEN '隐蔽工程验收' WHEN CheckAcceptType='4' THEN '单位工程验收' WHEN CheckAcceptType='5' THEN '分部工程验收' WHEN CheckAcceptType='6' THEN '分项工程验收' ELSE '' END) AS CheckAcceptType
+FROM WBS_BreakdownProject ";
List listStr = new List();
strSql += " where IsSelected = 1 and DivisionProjectId = @DivisionProjectId and ProjectId=@ProjectId";
listStr.Add(new SqlParameter("@DivisionProjectId", this.trWBS.SelectedNodeID));