安全报表增加系统外工时统计

SUBQHSE/FineUIPro.Web/HSSE/InformationProject/MillionsMonthlyReport.aspx.cs

@@ -65,7 +65,7 @@ namespace FineUIPro.Web.InformationProject
                 this.BindGrid();
             }
         }
-
+        
         /// <summary>
         /// 公司级树加载
         /// </summary>
@@ -75,14 +75,10 @@ namespace FineUIPro.Web.InformationProject
         {
             this.ProjectId = this.ucTree.ProjectId;
 
-            if (string.IsNullOrEmpty(this.CurrUser.LoginProjectId))
-            {
-                btnNew.Hidden = true;
-            }
+           
             this.GetButtonPower();
             this.BindGrid();
         }
-
         /// <summary>
         /// 绑定数据
         /// </summary>
@@ -92,7 +88,6 @@ namespace FineUIPro.Web.InformationProject
             {
                 return;
             }
-
             string strSql = @"SELECT MillionsMonthlyReport.MillionsMonthlyReportId,"
                           + @"MillionsMonthlyReport.ProjectId,"
                           + @"MillionsMonthlyReport.Year,"
@@ -108,6 +103,7 @@ namespace FineUIPro.Web.InformationProject
                           + @"MillionsMonthlyReport.ContractorNum,"
                           + @"MillionsMonthlyReport.SumPersonNum,"
                           + @"MillionsMonthlyReport.TotalWorkNum,"
+                          + @"MillionsMonthlyReport.OutSideUnitWorkNum,"
                           + @"MillionsMonthlyReport.DeathAccidentNum,"
                           + @"MillionsMonthlyReport.DeathAccidentPersonNum,"
                           + @"MillionsMonthlyReport.DeathAccidentLossHour,"
@@ -327,6 +323,12 @@ namespace FineUIPro.Web.InformationProject
                     this.btnMenuDelete.Hidden = false;
                 }
             }
+            if (string.IsNullOrEmpty(this.CurrUser.LoginProjectId))
+            {
+                btnNew.Hidden = true;
+                btnMenuDelete.Hidden = true;
+                btnMenuEdit.Hidden = true;
+            }
         }
         #endregion
     }