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

20241028

Browse Source
This commit is contained in:
毕文静
2024-10-28 14:20:56 +08:00
parent abb15b53fc
commit 379b8ede4d
5 changed files with 52 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/FineUIPro.Web/CQMS/WBS/Control/DivisionDivideList.aspx
+1 -1
View File
@@ -18,7 +18,7 @@
<Toolbars>
<f:Toolbar ID="Toolbar1" runat="server">
<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:Button ID="btnSearch" runat="server" Text="查询" Icon="SystemSearch" OnClick="btnSearch_Click"></f:Button>
<f:ToolbarFill ID="ToolbarFill1" runat="server"></f:ToolbarFill>
SGGL/FineUIPro.Web/CQMS/WBS/Control/DivisionDivideList.aspx.cs
+37 -9
View File
@@ -25,11 +25,11 @@ namespace FineUIPro.Web.CQMS.WBS.Control
{
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;
this.drpBranchEngineering.DataTextField = "BranchEngineeringName";
this.drpBranchEngineering.DataValueField = "DivisionId";
this.drpBranchEngineering.DataSource = subProjectLists;
this.drpBranchEngineering.DataBind();
//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.DataValueField = "DivisionId";
//this.drpBranchEngineering.DataSource = subProjectLists;
//this.drpBranchEngineering.DataBind();
Funs.FineUIPleaseSelect(this.drpBranchEngineering);
BindGrid();
@@ -49,7 +49,7 @@ namespace FineUIPro.Web.CQMS.WBS.Control
strSql += " AND (UnitWorkId =@unitWorkId or SuperUnitWork=@unitWorkId) ";
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) ";
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 ";
SqlParameter[] parameter = listStr.ToArray();
DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
Grid1.RecordCount = tb.Rows.Count;
//tb = GetFilteredTable(Grid1.FilteredData, tb);
//var table = this.GetPagedDataTable(Grid1, tb);
@@ -100,7 +100,7 @@ namespace FineUIPro.Web.CQMS.WBS.Control
}
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);
@@ -139,7 +139,7 @@ namespace FineUIPro.Web.CQMS.WBS.Control
row = sheet.CreateRow(i);
// 添加数据
cell = row.CreateCell(0);
cell.CellStyle = cellStyle;
cell.CellStyle = cellStyle;
cell.SetCellValue(item.SupUnitWorkCode);//单位工程编码
cell = row.CreateCell(1);
@@ -208,5 +208,33 @@ namespace FineUIPro.Web.CQMS.WBS.Control
}
}
#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;
}
}
}
}
SGGL/FineUIPro.Web/CQMS/WBS/Control/DivisionSubProjectsNewEdit.aspx.cs
+12 -12
View File
@@ -235,11 +235,11 @@ namespace FineUIPro.Web.CQMS.WBS.Control
}
else
{
var sub = BLL.SubProjectsService.GetSubProjectsById(this.ParentId);
if (sub.DivisionLevel == 1)
{
//var sub = BLL.SubProjectsService.GetSubProjectsById(this.ParentId);
//if (sub.DivisionLevel == 1)
//{
newSubProjects.DivisionLevel = 2;
}
//}
newSubProjects.ProEngineeringName = this.txtProEngineeringName.Text.Trim();
newSubProjects.DivisionId = SQLHelper.GetNewID(typeof(Model.Division_SubProjects));
this.DivisionId = newSubProjects.DivisionId;
@@ -264,15 +264,15 @@ namespace FineUIPro.Web.CQMS.WBS.Control
}
else
{
var sub = BLL.SubProjectsService.GetSubProjectsById(this.ParentId);
if (sub.DivisionLevel == 1)
{
newSubProjects.DivisionLevel = 2;
}
else if (sub.DivisionLevel==2)
{
//var sub = BLL.SubProjectsService.GetSubProjectsById(this.ParentId);
//if (sub.DivisionLevel == 1)
//{
// newSubProjects.DivisionLevel = 2;
//}
//else if (sub.DivisionLevel==2)
//{
newSubProjects.DivisionLevel = 3;
}
//}
newSubProjects.DivisionId = SQLHelper.GetNewID(typeof(Model.Division_SubProjects));
this.DivisionId = newSubProjects.DivisionId;
BLL.SubProjectsService.AddSubProjects(newSubProjects);