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

Merge branch 'master' of https://gitee.com/frane-yang/SGGL_CWCEC

This commit is contained in:
杨红卫 2021-10-19 17:42:34 +08:00
parent 2cb980f348 fbe44ac308
commit ee6a8bd998
4 changed files with 23 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
SGGL/FineUIPro.Web/JDGL/Check/TotalCompletion.aspx.cs
View File

@ -254,11 +254,11 @@ namespace FineUIPro.Web.JDGL.Check
listStr.Add(new SqlParameter("@ProjectId", this.CurrUser.LoginProjectId)); listStr.Add(new SqlParameter("@ProjectId", this.CurrUser.LoginProjectId));
SqlParameter[] parameter = listStr.ToArray(); SqlParameter[] parameter = listStr.ToArray();
DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter); DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
Grid6.RecordCount = tb.Rows.Count; Grid7.RecordCount = tb.Rows.Count;
//tb = GetFilteredTable(Grid1.FilteredData, tb); //tb = GetFilteredTable(Grid1.FilteredData, tb);
var table = this.GetPagedDataTable(Grid6, tb); var table = this.GetPagedDataTable(Grid7, tb);
Grid6.DataSource = table; Grid7.DataSource = table;
Grid6.DataBind(); Grid7.DataBind();
} }
#region 导入 #region 导入

2
SGGL/FineUIPro.Web/common/mainProject.aspx
View File

@ -350,7 +350,7 @@ padding-left: 2em;
<div class="item flex2"> <div class="item flex2">
<div class="bw-b-bottom"> <div class="bw-b-bottom">
<div class="bw-b-bottom-up flex flexV"> <div class="bw-b-bottom-up flex flexV">
<div class="tit-one tit-center" style="color:#fff">专业工作量表</div> <div class="tit-one tit-center" runat="server" id="divMonth" style="color:#fff">专业工作量表</div>
<div class="bw-item-content flex1 flex jd-list-wrap"> <div class="bw-item-content flex1 flex jd-list-wrap">
<div class="jd-list jd-list-long" runat="server" id="divGZL" style="overflow:scroll;max-height:200px;"> <div class="jd-list jd-list-long" runat="server" id="divGZL" style="overflow:scroll;max-height:200px;">
<div class="jd-item"> <div class="jd-item">

9
SGGL/FineUIPro.Web/common/mainProject.aspx.cs
View File

@ -71,6 +71,15 @@ namespace FineUIPro.Web.common
i++; i++;
} }
divGZL.InnerHtml = quantityCompletionStr; 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;
} }
} }

9
SGGL/FineUIPro.Web/common/mainProject.aspx.designer.cs generated
View File

@ -147,6 +147,15 @@ namespace FineUIPro.Web.common {
/// </remarks> /// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlGenericControl divBG; protected global::System.Web.UI.HtmlControls.HtmlGenericControl divBG;
/// <summary>
/// divMonth 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlGenericControl divMonth;
/// <summary> /// <summary>
/// divGZL 控件。 /// divGZL 控件。
/// </summary> /// </summary>