diff --git a/HJGL_DS/FineUIPro.Web/FineUIPro.Web.csproj.user b/HJGL_DS/FineUIPro.Web/FineUIPro.Web.csproj.user index e3436b8..6e29203 100644 --- a/HJGL_DS/FineUIPro.Web/FineUIPro.Web.csproj.user +++ b/HJGL_DS/FineUIPro.Web/FineUIPro.Web.csproj.user @@ -2,7 +2,7 @@ true - Release|Any CPU + Debug|Any CPU diff --git a/HJGL_DS/FineUIPro.Web/SYBData/PressureTestPackageList.aspx.cs b/HJGL_DS/FineUIPro.Web/SYBData/PressureTestPackageList.aspx.cs index 27d3abe..9d8692e 100644 --- a/HJGL_DS/FineUIPro.Web/SYBData/PressureTestPackageList.aspx.cs +++ b/HJGL_DS/FineUIPro.Web/SYBData/PressureTestPackageList.aspx.cs @@ -300,39 +300,46 @@ namespace FineUIPro.Web.SYBData } SqlParameter[] parameter = listStr.ToArray(); DataTable tb = SQLHelper.GetDataTableRunProc("SYB_TestPackagePipeList", parameter); - - DataTable dt = new DataTable(); - dt.TableName = "Data"; - dt.Columns.Add("Number1"); - dt.Columns.Add("PipelineCode1"); - dt.Columns.Add("TestPackageNo1"); - dt.Columns.Add("Number2"); - dt.Columns.Add("PipelineCode2"); - dt.Columns.Add("TestPackageNo2"); - - DataRow[] rows = tb.DefaultView.ToTable().Select(); - foreach (var row in rows) + if (tb.Rows.Count > 0) { - var newRow = dt.NewRow(); - newRow["Number1"] = row["Number1"].ToString(); - newRow["PipelineCode1"] = row["PipelineCode1"].ToString(); - newRow["TestPackageNo1"] = row["TestPackageNo1"].ToString(); - newRow["Number2"] = row["Number2"].ToString(); - newRow["PipelineCode2"] = row["PipelineCode2"].ToString(); - newRow["TestPackageNo2"] = row["TestPackageNo2"].ToString(); - dt.Rows.Add(newRow); + DataTable dt = new DataTable(); + dt.TableName = "Data"; + dt.Columns.Add("Number1"); + dt.Columns.Add("PipelineCode1"); + dt.Columns.Add("TestPackageNo1"); + dt.Columns.Add("Number2"); + dt.Columns.Add("PipelineCode2"); + dt.Columns.Add("TestPackageNo2"); + + DataRow[] rows = tb.DefaultView.ToTable().Select(); + foreach (var row in rows) + { + var newRow = dt.NewRow(); + newRow["Number1"] = row["Number1"].ToString(); + newRow["PipelineCode1"] = row["PipelineCode1"].ToString(); + newRow["TestPackageNo1"] = row["TestPackageNo1"].ToString(); + newRow["Number2"] = row["Number2"].ToString(); + newRow["PipelineCode2"] = row["PipelineCode2"].ToString(); + newRow["TestPackageNo2"] = row["TestPackageNo2"].ToString(); + dt.Rows.Add(newRow); + } + BLL.Common.FastReportService.AddFastreportTable(dt); + + + Dictionary keyValuePairs = new Dictionary(); + keyValuePairs.Add("ProjectName", BLL.Base_ProjectService.GetProjectByProjectId(this.ProjectId).ProjectName); + BLL.Common.FastReportService.AddFastreportParameter(keyValuePairs); + + initTemplatePath = "File\\Fastreport\\SYBData\\管道试压包一览表.frx"; + if (File.Exists(rootPath + initTemplatePath)) + { + PageContext.RegisterStartupScript(WindowPrint.GetShowReference(String.Format("../common/ReportPrint/Fastreport.aspx?ReportPath={0}", rootPath + initTemplatePath))); + } } - BLL.Common.FastReportService.AddFastreportTable(dt); - - - Dictionary keyValuePairs = new Dictionary(); - keyValuePairs.Add("ProjectName", BLL.Base_ProjectService.GetProjectByProjectId(this.ProjectId).ProjectName); - BLL.Common.FastReportService.AddFastreportParameter(keyValuePairs); - - initTemplatePath = "File\\Fastreport\\SYBData\\管道试压包一览表.frx"; - if (File.Exists(rootPath + initTemplatePath)) + else { - PageContext.RegisterStartupScript(WindowPrint.GetShowReference(String.Format("../common/ReportPrint/Fastreport.aspx?ReportPath={0}", rootPath + initTemplatePath))); + Alert.ShowInTop("请先保存数据！", MessageBoxIcon.Warning); + return; } } else diff --git a/HJGL_DS/FineUIPro.Web/SYBData/RTProportionConfirmation.aspx.cs b/HJGL_DS/FineUIPro.Web/SYBData/RTProportionConfirmation.aspx.cs index 7776cc1..d9529e1 100644 --- a/HJGL_DS/FineUIPro.Web/SYBData/RTProportionConfirmation.aspx.cs +++ b/HJGL_DS/FineUIPro.Web/SYBData/RTProportionConfirmation.aspx.cs @@ -14,6 +14,15 @@ namespace FineUIPro.Web.SYBData { public partial class RTProportionConfirmation : PageBase { + /// + /// 项目Id + /// + private string ProjectId + { + get { return (string)ViewState["ProjectId"]; } + set { ViewState["ProjectId"] = value; } + } + protected void Page_Load(object sender, EventArgs e) { if (!IsPostBack) @@ -25,17 +34,15 @@ namespace FineUIPro.Web.SYBData this.drpProjectId.DataSource = BLL.Base_ProjectService.GetOnProjectListByUserId(this.CurrUser.UserId, "1"); this.drpProjectId.DataBind(); Funs.FineUIPleaseSelect(this.drpProjectId); - if (!string.IsNullOrEmpty(this.CurrUser.LoginProjectId)) - { - this.drpProjectId.SelectedValue = this.CurrUser.LoginProjectId; - } + this.ProjectId = this.CurrUser.LoginProjectId; + this.drpProjectId.SelectedValue = this.ProjectId; this.InitTreeMenu();//加载树 this.tvControlItem.SelectedNodeID = this.drpProjectId.SelectedValue; - DataBind(); + BindGrid(); } } - #region 加载树 + #region 加载树项目 /// /// 加载树 /// @@ -43,51 +50,32 @@ namespace FineUIPro.Web.SYBData { this.tvControlItem.Nodes.Clear(); TreeNode rootNode = new TreeNode(); - rootNode.Text = "施工号"; + rootNode.Text = "项目"; rootNode.ToolTip = "项目"; rootNode.NodeID = "0"; rootNode.Expanded = true; this.tvControlItem.Nodes.Add(rootNode); List projects = BLL.Base_ProjectService.GetOnProjectListByUserId(this.CurrUser.UserId, "1"); - if (this.drpProjectId.SelectedValue != null && this.drpProjectId.SelectedValue != "null") - { - projects = projects.Where(x => x.ProjectId == this.drpProjectId.SelectedValue).ToList(); - } + if (this.drpProjectId.SelectedValue != BLL.Const._Null) + { + projects = projects.Where(e => e.ProjectId == this.drpProjectId.SelectedValue).ToList(); + } foreach (var item in projects) { TreeNode rootProjectNode = new TreeNode();//定义根节点 rootProjectNode.Text = item.ProjectCode; rootProjectNode.NodeID = item.ProjectId; rootProjectNode.EnableClickEvent = true; + rootProjectNode.Expanded = true; rootProjectNode.ToolTip = item.ProjectName; + rootProjectNode.CommandName = "项目名称"; rootNode.Nodes.Add(rootProjectNode); } } #endregion - #region 绑定数据 - /// - /// 绑定数据 - /// - private void BindGrid() - { - if (!string.IsNullOrEmpty(this.tvControlItem.SelectedNodeID)) - { - List listStr = new List(); - listStr.Add(new SqlParameter("@ProjectId", this.tvControlItem.SelectedNodeID)); - SqlParameter[] parameter = listStr.ToArray(); - DataTable tb = SQLHelper.GetDataTableRunProc("HJGL_rpt_RayCheckConfirmProject", parameter); - this.Grid1.RecordCount = tb.Rows.Count; - var table = this.GetPagedDataTable(Grid1, tb); - Grid1.DataSource = table; - Grid1.DataBind(); - } - } - - #endregion - #region 点击TreeView /// /// 点击TreeView @@ -96,10 +84,35 @@ namespace FineUIPro.Web.SYBData /// protected void tvControlItem_NodeCommand(object sender, TreeCommandEventArgs e) { - BindGrid(); + if (this.tvControlItem.SelectedNodeID != "0") + { + this.ProjectId = this.tvControlItem.SelectedNodeID; + this.BindGrid(); + } } #endregion + #region 绑定数据 + /// + /// 绑定数据 + /// + private void BindGrid() + { + if (!string.IsNullOrEmpty(this.ProjectId)) + { + List listStr = new List(); + listStr.Add(new SqlParameter("@ProjectId", this.ProjectId)); + SqlParameter[] parameter = listStr.ToArray(); + DataTable tb = SQLHelper.GetDataTableRunProc("HJGL_rpt_RayCheckConfirmProject", parameter); + this.Grid1.RecordCount = tb.Rows.Count; + var table = this.GetPagedDataTable(Grid1, tb); + Grid1.DataSource = table; + Grid1.DataBind(); + } + } + + #endregion + #region 排序 /// /// 排序 @@ -148,8 +161,9 @@ namespace FineUIPro.Web.SYBData /// protected void drpProjectId_SelectedIndexChanged(object sender, EventArgs e) { + this.ProjectId = this.drpProjectId.SelectedValue; this.InitTreeMenu(); - this.tvControlItem.SelectedNodeID = this.drpProjectId.SelectedValue; + this.tvControlItem.SelectedNodeID = this.ProjectId; BindGrid(); } #endregion diff --git a/HJGL_DS/FineUIPro.Web/Web.config b/HJGL_DS/FineUIPro.Web/Web.config index 30834b7..6bfb6c8 100644 --- a/HJGL_DS/FineUIPro.Web/Web.config +++ b/HJGL_DS/FineUIPro.Web/Web.config @@ -67,7 +67,7 @@ - + diff --git a/HJGL_DS/WebAPI/WebAPI.csproj.user b/HJGL_DS/WebAPI/WebAPI.csproj.user index 8cd7f1f..ef14066 100644 --- a/HJGL_DS/WebAPI/WebAPI.csproj.user +++ b/HJGL_DS/WebAPI/WebAPI.csproj.user @@ -1,7 +1,7 @@ - Release|Any CPU + Debug|Any CPU FolderProfile true