diff --git a/DataBase/版本日志/SGGLDB_WH_2023-07-14.sql b/DataBase/版本日志/SGGLDB_WH_2023-07-14.sql new file mode 100644 index 00000000..53a172b0 --- /dev/null +++ b/DataBase/版本日志/SGGLDB_WH_2023-07-14.sql @@ -0,0 +1,15 @@ +insert into HSSE_Hazard_HazardRegisterTypes +values(NEWID(),'Ѳ','01','4',null,null,1) +GO +insert into HSSE_Hazard_HazardRegisterTypes +values(NEWID(),'','02','4',null,null,1) +GO +insert into HSSE_Hazard_HazardRegisterTypes +values(NEWID(),'','03','4',null,null,1) +GO +insert into HSSE_Hazard_HazardRegisterTypes +values(NEWID(),'','04','4',null,null,1) +GO +insert into HSSE_Hazard_HazardRegisterTypes +values(NEWID(),'','05','4',null,null,1) +GO \ No newline at end of file diff --git a/SGGL/BLL/SysManage/UnitService.cs b/SGGL/BLL/SysManage/UnitService.cs index 625d2987..334b02d0 100644 --- a/SGGL/BLL/SysManage/UnitService.cs +++ b/SGGL/BLL/SysManage/UnitService.cs @@ -630,6 +630,18 @@ namespace BLL } } + public static void InitAllUnitDownList(FineUIPro.DropDownList dropName, string projectId, bool isShowPlease) + { + dropName.DataValueField = "Value"; + dropName.DataTextField = "Text"; + dropName.DataSource = drpUnitItemListByProjectId(projectId); + dropName.DataBind(); + if (isShowPlease) + { + Funs.FineUIPleaseSelect(dropName); + } + } + /// /// 字符串转化-》单位名称转化为对应的单位ID /// diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagementEdit.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagementEdit.aspx.cs index 82e3fe7a..938c52a8 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagementEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagementEdit.aspx.cs @@ -37,7 +37,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive GetButtonPower(); BLL.UnitWorkService.InitUnitWorkDownList(this.drpUnitWorkIds, this.CurrUser.LoginProjectId, false); BLL.UnitService.InitUnitDownList(this.drpUnitIds, this.CurrUser.LoginProjectId, false); - BLL.UnitService.InitUnitDownList(this.drpSendUnit, this.CurrUser.LoginProjectId, true); + BLL.UnitService.InitAllUnitDownList(this.drpSendUnit, this.CurrUser.LoginProjectId, true); BLL.CNProfessionalService.InitCNProfessionalDownList(this.drpCNProfessionalId, true); LoadAuditSelect(); this.agree.Hidden = true;