diff --git a/SGGL/FineUIPro.Web/ErrLog.txt b/SGGL/FineUIPro.Web/ErrLog.txt index 30e81efa..5f282702 100644 --- a/SGGL/FineUIPro.Web/ErrLog.txt +++ b/SGGL/FineUIPro.Web/ErrLog.txt @@ -1,19 +1 @@ - -错误信息开始=====> -错误类型:Exception -错误信息:Region control must be included in RegionPanel control. -错误堆栈: - 在 FineUIPro.Region.OnInit(EventArgs e) - 在 System.Web.UI.Control.InitRecursive(Control namingContainer) - 在 System.Web.UI.Control.InitRecursive(Control namingContainer) - 在 System.Web.UI.Control.InitRecursive(Control namingContainer) - 在 System.Web.UI.Control.InitRecursive(Control namingContainer) - 在 System.Web.UI.Control.InitRecursive(Control namingContainer) - 在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint) -出错时间:09/29/2021 15:32:37 -出错文件:http://localhost:8118/JDGL/WBS/WBSSetAudit.aspx -IP地址:::1 -操作人员:JT - -出错时间:09/29/2021 15:32:37 - + \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/File/Excel/Temp/202110140535101693.xls b/SGGL/FineUIPro.Web/File/Excel/Temp/202110140535101693.xls new file mode 100644 index 00000000..d5432a97 Binary files /dev/null and b/SGGL/FineUIPro.Web/File/Excel/Temp/202110140535101693.xls differ diff --git a/SGGL/FineUIPro.Web/File/Excel/Temp/202110140536472863.xls b/SGGL/FineUIPro.Web/File/Excel/Temp/202110140536472863.xls new file mode 100644 index 00000000..d5432a97 Binary files /dev/null and b/SGGL/FineUIPro.Web/File/Excel/Temp/202110140536472863.xls differ diff --git a/SGGL/FineUIPro.Web/HSSE/License/LicenseManager.aspx.cs b/SGGL/FineUIPro.Web/HSSE/License/LicenseManager.aspx.cs index 82bc8c73..07dc80e4 100644 --- a/SGGL/FineUIPro.Web/HSSE/License/LicenseManager.aspx.cs +++ b/SGGL/FineUIPro.Web/HSSE/License/LicenseManager.aspx.cs @@ -77,16 +77,13 @@ namespace FineUIPro.Web.HSSE.License + @" WHERE 1=1 "; List listStr = new List(); strSql += " AND LicenseManager.ProjectId = @ProjectId"; + listStr.Add(new SqlParameter("@ProjectId", this.ProjectId)); if (!string.IsNullOrEmpty(Request.Params["projectId"])) ///是否文件柜查看页面传项目值 - { - listStr.Add(new SqlParameter("@ProjectId", Request.Params["projectId"])); + { strSql += " AND LicenseManager.States = @States"; ///状态为已完成 listStr.Add(new SqlParameter("@States", BLL.Const.State_2)); } - else - { - listStr.Add(new SqlParameter("@ProjectId", this.CurrUser.LoginProjectId)); - } + if (BLL.ProjectUnitService.GetProjectUnitTypeByProjectIdUnitId(this.ProjectId, this.CurrUser.UnitId)) { strSql += " AND LicenseManager.UnitId = @UnitId"; ///状态为已完成 diff --git a/SGGL/FineUIPro.Web/HSSE/SitePerson/PersonInfoIn.aspx b/SGGL/FineUIPro.Web/HSSE/SitePerson/PersonInfoIn.aspx index c06ecf73..7cb185a3 100644 --- a/SGGL/FineUIPro.Web/HSSE/SitePerson/PersonInfoIn.aspx +++ b/SGGL/FineUIPro.Web/HSSE/SitePerson/PersonInfoIn.aspx @@ -42,8 +42,8 @@ + EnableColumnLines="true" BoxFlex="1" DataKeyNames="CheckingId" DataIDField="CheckingId" + AllowSorting="true" SortField="CardNo" PageSize="5000" Height="400px">