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

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 导入

SGGL/FineUIPro.Web/common/mainProject.aspx

@@ -350,7 +350,7 @@ padding-left: 2em;
             <div class="item flex2">
                 <div class="bw-b-bottom">
                     <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="jd-list jd-list-long" runat="server" id="divGZL" style="overflow:scroll;max-height:200px;">
                                 <div class="jd-item">

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;
             }
         }
 

SGGL/FineUIPro.Web/common/mainProject.aspx.designer.cs

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