diff --git a/SGGL/FineUIPro.Web/JDGL/Check/TotalCompletion.aspx.cs b/SGGL/FineUIPro.Web/JDGL/Check/TotalCompletion.aspx.cs index 5328f5b7..16c0df1e 100644 --- a/SGGL/FineUIPro.Web/JDGL/Check/TotalCompletion.aspx.cs +++ b/SGGL/FineUIPro.Web/JDGL/Check/TotalCompletion.aspx.cs @@ -254,11 +254,11 @@ namespace FineUIPro.Web.JDGL.Check listStr.Add(new SqlParameter("@ProjectId", this.CurrUser.LoginProjectId)); SqlParameter[] parameter = listStr.ToArray(); DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter); - Grid6.RecordCount = tb.Rows.Count; + Grid7.RecordCount = tb.Rows.Count; //tb = GetFilteredTable(Grid1.FilteredData, tb); - var table = this.GetPagedDataTable(Grid6, tb); - Grid6.DataSource = table; - Grid6.DataBind(); + var table = this.GetPagedDataTable(Grid7, tb); + Grid7.DataSource = table; + Grid7.DataBind(); } #region 导入 diff --git a/SGGL/FineUIPro.Web/common/mainProject.aspx b/SGGL/FineUIPro.Web/common/mainProject.aspx index cfe539fa..b101e8d1 100644 --- a/SGGL/FineUIPro.Web/common/mainProject.aspx +++ b/SGGL/FineUIPro.Web/common/mainProject.aspx @@ -350,7 +350,7 @@ padding-left: 2em;
-
专业工作量表
+
专业工作量表
diff --git a/SGGL/FineUIPro.Web/common/mainProject.aspx.cs b/SGGL/FineUIPro.Web/common/mainProject.aspx.cs index 1542d441..d7adb7b5 100644 --- a/SGGL/FineUIPro.Web/common/mainProject.aspx.cs +++ b/SGGL/FineUIPro.Web/common/mainProject.aspx.cs @@ -71,6 +71,15 @@ namespace FineUIPro.Web.common i++; } divGZL.InnerHtml = quantityCompletionStr; + string date = string.Empty; + if (quantityCompletions.Count() > 0) + { + if (quantityCompletions.First() != null && quantityCompletions.First().EndDate != null) + { + date = " (" + string.Format("{0:yyyy-MM}", quantityCompletions.First().EndDate) + ")"; + } + } + divMonth.InnerHtml = "专业工作量表" + date; } } diff --git a/SGGL/FineUIPro.Web/common/mainProject.aspx.designer.cs b/SGGL/FineUIPro.Web/common/mainProject.aspx.designer.cs index fbb24e7f..984caca0 100644 --- a/SGGL/FineUIPro.Web/common/mainProject.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/common/mainProject.aspx.designer.cs @@ -147,6 +147,15 @@ namespace FineUIPro.Web.common { /// protected global::System.Web.UI.HtmlControls.HtmlGenericControl divBG; + /// + /// divMonth 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.HtmlControls.HtmlGenericControl divMonth; + /// /// divGZL 控件。 ///