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

Compare commits

base: lpf:487f11b94adf02897b3cae224473d48fa3cdf954
Branches Tags
lpf:master
lpf:panhf_20240125
..
compare: lpf:9cc1ef7faacb8c318a6e9f1247744ea5d180a4ad
Branches Tags
lpf:master
lpf:panhf_20240125

2 Commits
487f11b94a ... 9cc1ef7faa

Author SHA1 Message Date
毕文静 9cc1ef7faa Merge branch 'master' of http://47.104.102.122:3000/panhf/CNCEC_SUBQHSE_WUHUAN 2024-10-28 14:21:11 +08:00
毕文静 379b8ede4d 20241028 2024-10-28 14:20:56 +08:00
4 changed files with 52 additions and 23 deletions
Show Stats Expand all files Collapse all files

2
SGGL/FineUIPro.Web/CQMS/WBS/Control/DivisionDivideList.aspx
View File

@ -18,7 +18,7 @@
<Toolbars> <Toolbars>
<f:Toolbar ID="Toolbar1" runat="server"> <f:Toolbar ID="Toolbar1" runat="server">
<Items> <Items>
<f:DropDownList ID="drpUnitWork" runat="server" Label="单位工程名称" LabelWidth="120px" LabelAlign="Right" EnableEdit="true"></f:DropDownList> <f:DropDownList ID="drpUnitWork" runat="server" Label="单位工程名称" LabelWidth="120px" LabelAlign="Right" EnableEdit="true" AutoPostBack="true" OnSelectedIndexChanged="drpUnitWork_SelectedIndexChanged"></f:DropDownList>
<f:DropDownList ID="drpBranchEngineering" runat="server" Label="分部工程名称" LabelWidth="120px" LabelAlign="Right" EnableEdit="true"></f:DropDownList> <f:DropDownList ID="drpBranchEngineering" runat="server" Label="分部工程名称" LabelWidth="120px" LabelAlign="Right" EnableEdit="true"></f:DropDownList>
<f:Button ID="btnSearch" runat="server" Text="查询" Icon="SystemSearch" OnClick="btnSearch_Click"></f:Button> <f:Button ID="btnSearch" runat="server" Text="查询" Icon="SystemSearch" OnClick="btnSearch_Click"></f:Button>
<f:ToolbarFill ID="ToolbarFill1" runat="server"></f:ToolbarFill> <f:ToolbarFill ID="ToolbarFill1" runat="server"></f:ToolbarFill>

46
SGGL/FineUIPro.Web/CQMS/WBS/Control/DivisionDivideList.aspx.cs
View File

@ -25,11 +25,11 @@ namespace FineUIPro.Web.CQMS.WBS.Control
{ {
BLL.UnitWorkService.InitUnitWorkDownList(this.drpUnitWork, this.CurrUser.LoginProjectId, true); BLL.UnitWorkService.InitUnitWorkDownList(this.drpUnitWork, this.CurrUser.LoginProjectId, true);
var subProjectLists = from x in Funs.DB.Division_SubProjects where x.ProjectId==this.CurrUser.LoginProjectId && x.ParentId==null select x; //var subProjectLists = from x in Funs.DB.Division_SubProjects where x.ProjectId==this.CurrUser.LoginProjectId && x.ParentId==null select x;
this.drpBranchEngineering.DataTextField = "BranchEngineeringName"; //this.drpBranchEngineering.DataTextField = "BranchEngineeringName";
this.drpBranchEngineering.DataValueField = "DivisionId"; //this.drpBranchEngineering.DataValueField = "DivisionId";
this.drpBranchEngineering.DataSource = subProjectLists; //this.drpBranchEngineering.DataSource = subProjectLists;
this.drpBranchEngineering.DataBind(); //this.drpBranchEngineering.DataBind();
Funs.FineUIPleaseSelect(this.drpBranchEngineering); Funs.FineUIPleaseSelect(this.drpBranchEngineering);
BindGrid(); BindGrid();
@ -49,7 +49,7 @@ namespace FineUIPro.Web.CQMS.WBS.Control
strSql += " AND (UnitWorkId =@unitWorkId or SuperUnitWork=@unitWorkId) "; strSql += " AND (UnitWorkId =@unitWorkId or SuperUnitWork=@unitWorkId) ";
listStr.Add(new SqlParameter("@unitWorkId", this.drpUnitWork.SelectedValue)); listStr.Add(new SqlParameter("@unitWorkId", this.drpUnitWork.SelectedValue));
} }
if (this.drpBranchEngineering.SelectedValue!=BLL.Const._Null) if (this.drpBranchEngineering.SelectedValue != BLL.Const._Null)
{ {
strSql += " AND (DivisionId = @divisionId or ParentId=@divisionId) "; strSql += " AND (DivisionId = @divisionId or ParentId=@divisionId) ";
listStr.Add(new SqlParameter("@divisionId", this.drpBranchEngineering.SelectedValue)); listStr.Add(new SqlParameter("@divisionId", this.drpBranchEngineering.SelectedValue));
@ -57,7 +57,7 @@ namespace FineUIPro.Web.CQMS.WBS.Control
strSql += " ORDER BY SupUnitWorkCode,ChildUnitWorkCode,Sort,DivisionLevel "; strSql += " ORDER BY SupUnitWorkCode,ChildUnitWorkCode,Sort,DivisionLevel ";
SqlParameter[] parameter = listStr.ToArray(); SqlParameter[] parameter = listStr.ToArray();
DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter); DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
Grid1.RecordCount = tb.Rows.Count; Grid1.RecordCount = tb.Rows.Count;
//tb = GetFilteredTable(Grid1.FilteredData, tb); //tb = GetFilteredTable(Grid1.FilteredData, tb);
//var table = this.GetPagedDataTable(Grid1, tb); //var table = this.GetPagedDataTable(Grid1, tb);
@ -100,7 +100,7 @@ namespace FineUIPro.Web.CQMS.WBS.Control
} }
if (this.drpBranchEngineering.SelectedValue != BLL.Const._Null) if (this.drpBranchEngineering.SelectedValue != BLL.Const._Null)
{ {
lists = lists.Where(x => x.DivisionId == this.drpBranchEngineering.SelectedValue || x.ParentId==this.drpBranchEngineering.SelectedValue); lists = lists.Where(x => x.DivisionId == this.drpBranchEngineering.SelectedValue || x.ParentId == this.drpBranchEngineering.SelectedValue);
} }
lists = lists.OrderBy(x => x.SupUnitWorkCode).ThenBy(x => x.ChildUnitWorkCode).ThenBy(x => x.Sort).ThenBy(x => x.DivisionLevel); lists = lists.OrderBy(x => x.SupUnitWorkCode).ThenBy(x => x.ChildUnitWorkCode).ThenBy(x => x.Sort).ThenBy(x => x.DivisionLevel);
@ -139,7 +139,7 @@ namespace FineUIPro.Web.CQMS.WBS.Control
row = sheet.CreateRow(i); row = sheet.CreateRow(i);
// 添加数据 // 添加数据
cell = row.CreateCell(0); cell = row.CreateCell(0);
cell.CellStyle = cellStyle; cell.CellStyle = cellStyle;
cell.SetCellValue(item.SupUnitWorkCode);//单位工程编码 cell.SetCellValue(item.SupUnitWorkCode);//单位工程编码
cell = row.CreateCell(1); cell = row.CreateCell(1);
@ -208,5 +208,33 @@ namespace FineUIPro.Web.CQMS.WBS.Control
} }
} }
#endregion #endregion
/// <summary>
/// 单位工程下拉选择
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void drpUnitWork_SelectedIndexChanged(object sender, EventArgs e)
{
this.drpBranchEngineering.Items.Clear();
if (this.drpUnitWork.SelectedValue != BLL.Const._Null && !string.IsNullOrEmpty(this.drpUnitWork.SelectedValue))
{
var q = (from x in Funs.DB.View_WBS_DivisionDivide
where x.ProjectId == this.CurrUser.LoginProjectId
&& x.UnitWorkId == this.drpUnitWork.SelectedValue
&& x.ParentId==null
select new
{
x.DivisionId,
x.BranchEngineeringName
}).Distinct().ToList();
this.drpBranchEngineering.DataTextField = "BranchEngineeringName";
this.drpBranchEngineering.DataValueField = "DivisionId";
this.drpBranchEngineering.DataSource = q;
this.drpBranchEngineering.DataBind();
Funs.FineUIPleaseSelect(this.drpBranchEngineering);
this.drpBranchEngineering.SelectedIndex = 0;
}
}
} }
} }

24
SGGL/FineUIPro.Web/CQMS/WBS/Control/DivisionSubProjectsNewEdit.aspx.cs
View File

@ -235,11 +235,11 @@ namespace FineUIPro.Web.CQMS.WBS.Control
} }
else else
{ {
var sub = BLL.SubProjectsService.GetSubProjectsById(this.ParentId); //var sub = BLL.SubProjectsService.GetSubProjectsById(this.ParentId);
if (sub.DivisionLevel == 1) //if (sub.DivisionLevel == 1)
{ //{
newSubProjects.DivisionLevel = 2; newSubProjects.DivisionLevel = 2;
} //}
newSubProjects.ProEngineeringName = this.txtProEngineeringName.Text.Trim(); newSubProjects.ProEngineeringName = this.txtProEngineeringName.Text.Trim();
newSubProjects.DivisionId = SQLHelper.GetNewID(typeof(Model.Division_SubProjects)); newSubProjects.DivisionId = SQLHelper.GetNewID(typeof(Model.Division_SubProjects));
this.DivisionId = newSubProjects.DivisionId; this.DivisionId = newSubProjects.DivisionId;
@ -264,15 +264,15 @@ namespace FineUIPro.Web.CQMS.WBS.Control
} }
else else
{ {
var sub = BLL.SubProjectsService.GetSubProjectsById(this.ParentId); //var sub = BLL.SubProjectsService.GetSubProjectsById(this.ParentId);
if (sub.DivisionLevel == 1) //if (sub.DivisionLevel == 1)
{ //{
newSubProjects.DivisionLevel = 2; // newSubProjects.DivisionLevel = 2;
} //}
else if (sub.DivisionLevel==2) //else if (sub.DivisionLevel==2)
{ //{
newSubProjects.DivisionLevel = 3; newSubProjects.DivisionLevel = 3;
} //}
newSubProjects.DivisionId = SQLHelper.GetNewID(typeof(Model.Division_SubProjects)); newSubProjects.DivisionId = SQLHelper.GetNewID(typeof(Model.Division_SubProjects));
this.DivisionId = newSubProjects.DivisionId; this.DivisionId = newSubProjects.DivisionId;
BLL.SubProjectsService.AddSubProjects(newSubProjects); BLL.SubProjectsService.AddSubProjects(newSubProjects);

3
SGGL/FineUIPro.Web/common/Menu_CQMS.xml
View File

@ -8,9 +8,10 @@
<TreeNode id="6769098A-53D7-4585-87CC-2DADBCBC2C74" Text="类似项目施工经验总结清单" NavigateUrl="CQMS/QualityPlanning/ConExperienceSummary.aspx"></TreeNode> <TreeNode id="6769098A-53D7-4585-87CC-2DADBCBC2C74" Text="类似项目施工经验总结清单" NavigateUrl="CQMS/QualityPlanning/ConExperienceSummary.aspx"></TreeNode>
</TreeNode> </TreeNode>
<TreeNode id="3B322232-38A1-4291-9832-CD4A01C2A975" Text="检验试验计划/单位分部分项工程划分" NavigateUrl=""><TreeNode id="1025D812-2325-4FE9-A1E9-D53F2CAACDC6" Text="现场控制点裁剪(新)" NavigateUrl="CQMS/WBS/Control/PointCropping.aspx"></TreeNode> <TreeNode id="3B322232-38A1-4291-9832-CD4A01C2A975" Text="检验试验计划/单位分部分项工程划分" NavigateUrl=""><TreeNode id="1025D812-2325-4FE9-A1E9-D53F2CAACDC6" Text="现场控制点裁剪(新)" NavigateUrl="CQMS/WBS/Control/PointCropping.aspx"></TreeNode>
<TreeNode id="17E206A1-E06B-40C0-8DCB-E3AAA2E3B339" Text="分部分项工程(新)" NavigateUrl="CQMS/WBS/Control/DivisionSubProjects.aspx"></TreeNode> <TreeNode id="0E1CCE60-6F9D-419D-B763-E9E0AF5621E6" Text="单位分部分项工程划分、裁剪" NavigateUrl=""><TreeNode id="17E206A1-E06B-40C0-8DCB-E3AAA2E3B339" Text="分部分项工程数据库" NavigateUrl="CQMS/WBS/Control/DivisionSubProjectsNew.aspx"></TreeNode>
<TreeNode id="FB94A120-921B-4AAB-B54F-EC11B6F561FD" Text="单位分部分项工程划分、裁剪" NavigateUrl="CQMS/WBS/Control/DivisionDivideAndCrop.aspx"></TreeNode> <TreeNode id="FB94A120-921B-4AAB-B54F-EC11B6F561FD" Text="单位分部分项工程划分、裁剪" NavigateUrl="CQMS/WBS/Control/DivisionDivideAndCrop.aspx"></TreeNode>
<TreeNode id="BA250432-492B-49A3-8BB6-D04BF74D2EDD" Text="单位分部分项工程划分表" NavigateUrl="CQMS/WBS/Control/DivisionDivideList.aspx"></TreeNode> <TreeNode id="BA250432-492B-49A3-8BB6-D04BF74D2EDD" Text="单位分部分项工程划分表" NavigateUrl="CQMS/WBS/Control/DivisionDivideList.aspx"></TreeNode>
</TreeNode>
<TreeNode id="5AA08233-9E04-4808-AC43-DD411C5F9D31" Text="现场控制点裁剪" NavigateUrl="CQMS/WBS/ProjectControlPoint.aspx"></TreeNode> <TreeNode id="5AA08233-9E04-4808-AC43-DD411C5F9D31" Text="现场控制点裁剪" NavigateUrl="CQMS/WBS/ProjectControlPoint.aspx"></TreeNode>
<TreeNode id="88F115C3-D193-4455-8E8D-76F2EAF56291" Text="现场控制点资料柜" NavigateUrl="CQMS/WBS/ProjectControlPointFile.aspx"></TreeNode> <TreeNode id="88F115C3-D193-4455-8E8D-76F2EAF56291" Text="现场控制点资料柜" NavigateUrl="CQMS/WBS/ProjectControlPointFile.aspx"></TreeNode>
</TreeNode> </TreeNode>