lpf
/
SGGL_SHJ
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

20230626 调整本部检查及单位类单位下拉框

This commit is contained in:
杨红卫 2023-06-26 15:42:26 +08:00
parent c35272be84
commit 1acdf08555
43 changed files with 68 additions and 85 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
SGGL/BLL/Common/Const.cs
View File

@ -194,6 +194,10 @@
/// </summary>
public const string UnitId_SEDIN = "d72a27c9-4ba9-41c5-ab0b-c010409f20f2";
/// <summary>
/// 集团公司单位id
/// </summary>
public const string UnitId_CNCEC = "722090d1-b5de-4c3c-a4f7-14f308161a3b";
/// <summary>
/// 赛鼎
/// </summary>
public const string AppID_SEDIN = "wxee9d14366730ae44";

50
SGGL/BLL/SysManage/UnitService.cs
View File

@ -473,23 +473,6 @@ namespace BLL
Funs.FineUIPleaseSelect(dropName);
}
}
/// <summary>
/// 根据单位类型获取单位表下拉框
/// </summary>
/// <param name="dropName">下拉框名字</param>
/// <param name="isShowPlease">是否显示请选择</param>
public static void InitUnitNameByProjectIdUnitTypeDropDownList(FineUIPro.DropDownList dropName, string projectId, string unitType, bool isShowPlease)
{
dropName.DataValueField = "UnitName";
dropName.DataTextField = "UnitName";
dropName.DataSource = BLL.UnitService.GetUnitByProjectIdUnitTypeList(projectId, unitType);
dropName.DataBind();
if (isShowPlease)
{
Funs.FineUIPleaseSelect(dropName);
}
}
#endregion
/// <summary>
@ -579,22 +562,6 @@ namespace BLL
}
}
/// <summary>
/// 单位表下拉框
/// </summary>
/// <param name="dropName">下拉框名字</param>
/// <param name="isShowPlease">是否显示请选择</param>
public static void GetUnit(FineUIPro.DropDownList dropName, string projectId, bool isShowPlease)
{
dropName.DataValueField = "UnitId";
dropName.DataTextField = "UnitName";
dropName.DataSource = GetUnitByProjectIdList(projectId);
dropName.DataBind();
if (isShowPlease)
{
Funs.FineUIPleaseSelect(dropName);
}
}
public static void GetALLUnit(FineUIPro.DropDownList dropName, bool isShowPlease)
{
dropName.DataValueField = "UnitId";
@ -657,6 +624,21 @@ namespace BLL
}
}
public static void InitSeDinAndCNCECUnitDropDownList(FineUIPro.DropDownList dropName, bool isShowPlease)
{
dropName.Items.Clear();
dropName.DataValueField = "UnitId";
dropName.DataTextField = "UnitName";
dropName.DataSource = (from x in Funs.DB.Base_Unit
where x.UnitId==Const.UnitId_SEDIN || x.UnitId == Const.UnitId_CNCEC
select x).OrderByDescending(x => x.UnitCode).ToList();
dropName.DataBind();
if (isShowPlease)
{
Funs.FineUIPleaseSelect(dropName);
}
}
#region 根据多单位ID得到单位名称字符串
/// <summary>
/// 根据多单位ID得到单位名称字符串
@ -712,7 +694,7 @@ namespace BLL
/// <param name="dropName"></param>
/// <param name="projectId"></param>
/// <param name="isShowPlease"></param>
public static void InitUnitDownList(FineUIPro.DropDownList dropName, string projectId, bool isShowPlease)
public static void InitMainOrSubUnitDownList(FineUIPro.DropDownList dropName, string projectId, bool isShowPlease)
{
dropName.DataValueField = "Value";
dropName.DataTextField = "Text";

2
SGGL/FineUIPro.Web/CQMS/Check/EditTechnicalContactList.aspx.cs
View File

@ -69,7 +69,7 @@ namespace FineUIPro.Web.CQMS.Check
if (!IsPostBack)
{
UnitService.GetUnit(drpProposeUnit, CurrUser.LoginProjectId, false);
UnitService.InitUnitDropDownList(drpProposeUnit, CurrUser.LoginProjectId, false);
var unitWork = UnitWorkService.GetUnitWorkLists(CurrUser.LoginProjectId);
var unitWorks = from x in unitWork
select

2
SGGL/FineUIPro.Web/CQMS/Check/SpotCheck.aspx.cs
View File

@ -57,7 +57,7 @@ namespace FineUIPro.Web.CQMS.Check
{
if (!IsPostBack)
{
UnitService.GetUnit(drpUnit, CurrUser.LoginProjectId, true);
UnitService.InitUnitDropDownList(drpUnit, CurrUser.LoginProjectId, true);
ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
btnNew.OnClientClick = Window1.GetShowReference("EditSpotCheck.aspx") + "return false;";
GetButtonPower();

2
SGGL/FineUIPro.Web/CQMS/Check/SpotCheckFile.aspx.cs
View File

@ -30,7 +30,7 @@ namespace FineUIPro.Web.CQMS.Check
{
if (!IsPostBack)
{
UnitService.GetUnit(drpUnit, CurrUser.LoginProjectId, true);
UnitService.InitUnitDropDownList(drpUnit, CurrUser.LoginProjectId, true);
ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
BindData();

2
SGGL/FineUIPro.Web/CQMS/Check/SpotDataCheck.aspx.cs
View File

@ -49,7 +49,7 @@ namespace FineUIPro.Web.CQMS.Check
{
if (!IsPostBack)
{
UnitService.GetUnit(drpUnit, CurrUser.LoginProjectId, true);
UnitService.InitUnitDropDownList(drpUnit, CurrUser.LoginProjectId, true);
ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
GetButtonPower();
BindData();

2
SGGL/FineUIPro.Web/CQMS/Check/TechnicalContactList.aspx.cs
View File

@ -58,7 +58,7 @@ namespace FineUIPro.Web.CQMS.Check
{
if (!IsPostBack)
{
UnitService.GetUnit(drpProposeUnit, CurrUser.LoginProjectId, true);
UnitService.InitUnitDropDownList(drpProposeUnit, CurrUser.LoginProjectId, true);
Funs.FineUIPleaseSelect(this.drpContactListType);
Funs.FineUIPleaseSelect(this.drpIsReply);
Funs.FineUIPleaseSelect(this.drpState);

2
SGGL/FineUIPro.Web/CQMS/Check/TechnicalContactListFile.aspx.cs
View File

@ -29,7 +29,7 @@ namespace FineUIPro.Web.CQMS.Check
{
if (!IsPostBack)
{
UnitService.GetUnit(drpProposeUnit, CurrUser.LoginProjectId, true);
UnitService.InitUnitDropDownList(drpProposeUnit, CurrUser.LoginProjectId, true);
Funs.FineUIPleaseSelect(this.drpContactListType);
Funs.FineUIPleaseSelect(this.drpIsReply);
UnitWorkService.InitUnitWorkDownList(drpUnitWork, this.CurrUser.LoginProjectId, true);

2
SGGL/FineUIPro.Web/CQMS/Check/WorkContactFile.aspx.cs
View File

@ -30,7 +30,7 @@ namespace FineUIPro.Web.CQMS.Check
{
if (!IsPostBack)
{
UnitService.GetUnit(drpProposeUnit, CurrUser.LoginProjectId, true);
UnitService.InitUnitDropDownList(drpProposeUnit, CurrUser.LoginProjectId, true);
Funs.FineUIPleaseSelect(this.drpIsReply);
ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
BindGrid();

2
SGGL/FineUIPro.Web/CQMS/Material/ConstructionTest.aspx.cs
View File

@ -28,7 +28,7 @@ namespace FineUIPro.Web.CQMS.Material
if (!IsPostBack)
{
this.ProjectId = this.CurrUser.LoginProjectId;
BLL.UnitService.GetUnit(this.drpUnit, this.ProjectId, true);
BLL.UnitService.InitUnitDropDownList(this.drpUnit, this.ProjectId, true);
btnNew.OnClientClick = Window1.GetShowReference("ConstructionTestEdit.aspx") + "return false;";
GetButtonPower();
BindGrid();

4
SGGL/FineUIPro.Web/CQMS/Material/ConstructionTestEdit.aspx.cs
View File

@ -46,8 +46,8 @@ namespace FineUIPro.Web.CQMS.Material
{
if (!IsPostBack)
{
BLL.UnitService.GetUnit(this.drpUnit, this.CurrUser.LoginProjectId, true);
BLL.UnitService.GetUnit(this.drpCheckUnit, this.CurrUser.LoginProjectId, true);
BLL.UnitService.InitUnitDropDownList(this.drpUnit, this.CurrUser.LoginProjectId, true);
BLL.UnitService.InitUnitDropDownList(this.drpCheckUnit, this.CurrUser.LoginProjectId, true);
BLL.ConstructionTestTypeService.InitConstructionTestType(this.drpConstructionTestType, true);
BLL.Person_PersonsService.InitUserProjectIdUnitIdRoleIdDropDownList(this.drpWitness, this.CurrUser.LoginProjectId, string.Empty, string.Empty, true);
ConstructionTestId = Request.Params["ConstructionTestId"];

4
SGGL/FineUIPro.Web/CQMS/Material/ConstructionTestView.aspx.cs
View File

@ -46,8 +46,8 @@ namespace FineUIPro.Web.CQMS.Material
{
if (!IsPostBack)
{
BLL.UnitService.GetUnit(this.drpUnit, this.CurrUser.LoginProjectId, true);
BLL.UnitService.GetUnit(this.drpCheckUnit, this.CurrUser.LoginProjectId, true);
BLL.UnitService.InitUnitDropDownList(this.drpUnit, this.CurrUser.LoginProjectId, true);
BLL.UnitService.InitUnitDropDownList(this.drpCheckUnit, this.CurrUser.LoginProjectId, true);
BLL.ConstructionTestTypeService.InitConstructionTestType(this.drpConstructionTestType, true);
BLL.Person_PersonsService.InitUserProjectIdUnitIdRoleIdDropDownList(this.drpWitness, this.CurrUser.LoginProjectId, string.Empty, string.Empty, true);
ConstructionTestId = Request.Params["ConstructionTestId"];

2
SGGL/FineUIPro.Web/CQMS/Material/Equipment.aspx.cs
View File

@ -28,7 +28,7 @@ namespace FineUIPro.Web.CQMS.Material
if (!IsPostBack)
{
this.ProjectId = this.CurrUser.LoginProjectId;
BLL.UnitService.GetUnit(this.drpUnit, this.ProjectId, true);
BLL.UnitService.InitUnitDropDownList(this.drpUnit, this.ProjectId, true);
BLL.MainItemService.InitMainItemDownList(drpMainItem, this.ProjectId, true);
btnNew.OnClientClick = Window1.GetShowReference("EquipmentEdit.aspx") + "return false;";
GetButtonPower();

2
SGGL/FineUIPro.Web/CQMS/Material/EquipmentEdit.aspx.cs
View File

@ -25,7 +25,7 @@ namespace FineUIPro.Web.CQMS.Material
if (!IsPostBack)
{
this.ProjectId = this.CurrUser.LoginProjectId;
BLL.UnitService.GetUnit(this.drpUnit, this.ProjectId, true);
BLL.UnitService.InitUnitDropDownList(this.drpUnit, this.ProjectId, true);
BLL.MainItemService.InitMainItemDownList(drpMainItem, this.ProjectId, true);
this.btnClose.OnClientClick = ActiveWindow.GetHideReference();
string EquipmentId = Request.Params["EquipmentId"];

2
SGGL/FineUIPro.Web/CQMS/Material/EquipmentSearch.aspx.cs
View File

@ -34,7 +34,7 @@ namespace FineUIPro.Web.CQMS.Material
{
this.ProjectId = this.CurrUser.LoginProjectId;
list = new List<string>();
BLL.UnitService.GetUnit(this.drpUnit, this.ProjectId, true);
BLL.UnitService.InitUnitDropDownList(this.drpUnit, this.ProjectId, true);
BLL.MainItemService.InitMainItemDownList(drpMainItem, this.ProjectId, true);
if (!string.IsNullOrEmpty(this.CurrUser.UnitId))
{

2
SGGL/FineUIPro.Web/CQMS/Material/EquipmentView.aspx.cs
View File

@ -25,7 +25,7 @@ namespace FineUIPro.Web.CQMS.Material
if (!IsPostBack)
{
this.ProjectId = this.CurrUser.LoginProjectId;
BLL.UnitService.GetUnit(this.drpUnit, this.ProjectId, true);
BLL.UnitService.InitUnitDropDownList(this.drpUnit, this.ProjectId, true);
BLL.MainItemService.InitMainItemDownList(drpMainItem, this.ProjectId, true);
this.btnClose.OnClientClick = ActiveWindow.GetHideReference();
string EquipmentId = Request.Params["EquipmentId"];

2
SGGL/FineUIPro.Web/CQMS/Material/Inspection.aspx.cs
View File

@ -40,7 +40,7 @@ namespace FineUIPro.Web.CQMS.Material
this.ProjectId = this.CurrUser.LoginProjectId;
//权限按钮方法
GetButtonPower();
BLL.UnitService.GetUnit(this.drpUnit, this.ProjectId, true);
BLL.UnitService.InitUnitDropDownList(this.drpUnit, this.ProjectId, true);
Funs.FineUIPleaseSelect(this.drpState);
ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
// 绑定表格

2
SGGL/FineUIPro.Web/CQMS/Material/InspectionEdit.aspx.cs
View File

@ -46,7 +46,7 @@ namespace FineUIPro.Web.CQMS.Material
{
if (!IsPostBack)
{
BLL.UnitService.GetUnit(this.drpUnit, this.CurrUser.LoginProjectId, true);
BLL.UnitService.InitUnitDropDownList(this.drpUnit, this.CurrUser.LoginProjectId, true);
InspectionId = Request.Params["InspectionId"];
this.HideOptions.Hidden = true;
this.rblIsAgree.Hidden = true;

2
SGGL/FineUIPro.Web/CQMS/Material/InspectionView.aspx.cs
View File

@ -46,7 +46,7 @@ namespace FineUIPro.Web.CQMS.Material
{
if (!IsPostBack)
{
BLL.UnitService.GetUnit(this.drpUnit, this.CurrUser.LoginProjectId, true);
BLL.UnitService.InitUnitDropDownList(this.drpUnit, this.CurrUser.LoginProjectId, true);
InspectionId = Request.Params["InspectionId"];
if (!string.IsNullOrEmpty(InspectionId))
{

2
SGGL/FineUIPro.Web/CQMS/Material/Material.aspx.cs
View File

@ -28,7 +28,7 @@ namespace FineUIPro.Web.CQMS.Material
if (!IsPostBack)
{
this.ProjectId = this.CurrUser.LoginProjectId;
BLL.UnitService.GetUnit(this.drpUnit, this.ProjectId, true);
BLL.UnitService.InitUnitDropDownList(this.drpUnit, this.ProjectId, true);
BLL.MainItemService.InitMainItemDownList(drpMainItem, this.ProjectId, true);
btnNew.OnClientClick = Window1.GetShowReference("MaterialEdit.aspx") + "return false;";
GetButtonPower();

2
SGGL/FineUIPro.Web/CQMS/Material/MaterialEdit.aspx.cs
View File

@ -25,7 +25,7 @@ namespace FineUIPro.Web.CQMS.Material
if (!IsPostBack)
{
this.ProjectId = this.CurrUser.LoginProjectId;
BLL.UnitService.GetUnit(this.drpUnit, this.ProjectId, true);
BLL.UnitService.InitUnitDropDownList(this.drpUnit, this.ProjectId, true);
BLL.MainItemService.InitMainItemDownList(drpMainItem, this.ProjectId, true);
this.btnClose.OnClientClick = ActiveWindow.GetHideReference();
string MaterialId = Request.Params["MaterialId"];

2
SGGL/FineUIPro.Web/CQMS/Material/MaterialSearch.aspx.cs
View File

@ -34,7 +34,7 @@ namespace FineUIPro.Web.CQMS.Material
{
this.ProjectId = this.CurrUser.LoginProjectId;
list = new List<string>();
BLL.UnitService.GetUnit(this.drpUnit, this.ProjectId, true);
BLL.UnitService.InitUnitDropDownList(this.drpUnit, this.ProjectId, true);
BLL.MainItemService.InitMainItemDownList(drpMainItem, this.ProjectId, true);
if (!string.IsNullOrEmpty(this.CurrUser.UnitId))
{

2
SGGL/FineUIPro.Web/CQMS/Material/MaterialTest.aspx.cs
View File

@ -28,7 +28,7 @@ namespace FineUIPro.Web.CQMS.Material
if (!IsPostBack)
{
this.ProjectId = this.CurrUser.LoginProjectId;
BLL.UnitService.GetUnit(this.drpUnit, this.ProjectId, true);
BLL.UnitService.InitUnitDropDownList(this.drpUnit, this.ProjectId, true);
btnNew.OnClientClick = Window1.GetShowReference("MaterialTestEdit.aspx") + "return false;";
GetButtonPower();
BindGrid();

4
SGGL/FineUIPro.Web/CQMS/Material/MaterialTestEdit.aspx.cs
View File

@ -46,8 +46,8 @@ namespace FineUIPro.Web.CQMS.Material
{
if (!IsPostBack)
{
BLL.UnitService.GetUnit(this.drpUnit, this.CurrUser.LoginProjectId, true);
BLL.UnitService.GetUnit(this.drpCheckUnit, this.CurrUser.LoginProjectId, true);
BLL.UnitService.InitUnitDropDownList(this.drpUnit, this.CurrUser.LoginProjectId, true);
BLL.UnitService.InitUnitDropDownList(this.drpCheckUnit, this.CurrUser.LoginProjectId, true);
BLL.MaterialTypeService.InitMaterialType(this.drpMaterialType, true);
BLL.Person_PersonsService.InitUserProjectIdUnitIdRoleIdDropDownList(this.drpWitness, this.CurrUser.LoginProjectId, string.Empty, string.Empty, true);
MaterialTestId = Request.Params["MaterialTestId"];

4
SGGL/FineUIPro.Web/CQMS/Material/MaterialTestView.aspx.cs
View File

@ -46,8 +46,8 @@ namespace FineUIPro.Web.CQMS.Material
{
if (!IsPostBack)
{
BLL.UnitService.GetUnit(this.drpUnit, this.CurrUser.LoginProjectId, true);
BLL.UnitService.GetUnit(this.drpCheckUnit, this.CurrUser.LoginProjectId, true);
BLL.UnitService.InitUnitDropDownList(this.drpUnit, this.CurrUser.LoginProjectId, true);
BLL.UnitService.InitUnitDropDownList(this.drpCheckUnit, this.CurrUser.LoginProjectId, true);
BLL.MaterialTypeService.InitMaterialType(this.drpMaterialType, true);
BLL.Person_PersonsService.InitUserProjectIdUnitIdRoleIdDropDownList(this.drpWitness, this.CurrUser.LoginProjectId, string.Empty, string.Empty, true);
MaterialTestId = Request.Params["MaterialTestId"];

2
SGGL/FineUIPro.Web/CQMS/Material/MaterialView.aspx.cs
View File

@ -24,7 +24,7 @@ namespace FineUIPro.Web.CQMS.Material
if (!IsPostBack)
{
this.ProjectId = this.CurrUser.LoginProjectId;
BLL.UnitService.GetUnit(this.drpUnit, this.ProjectId, true);
BLL.UnitService.InitUnitDropDownList(this.drpUnit, this.ProjectId, true);
BLL.MainItemService.InitMainItemDownList(drpMainItem, this.ProjectId, true);
this.btnClose.OnClientClick = ActiveWindow.GetHideReference();
string MaterialId = Request.Params["MaterialId"];

2
SGGL/FineUIPro.Web/CQMS/Material/NoticeAndSupervision.aspx.cs
View File

@ -28,7 +28,7 @@ namespace FineUIPro.Web.CQMS.Material
if (!IsPostBack)
{
this.ProjectId = this.CurrUser.LoginProjectId;
BLL.UnitService.GetUnit(this.drpUnit, this.ProjectId, true);
BLL.UnitService.InitUnitDropDownList(this.drpUnit, this.ProjectId, true);
BLL.MainItemService.InitMainItemDownList(drpMainItem, this.ProjectId, true);
btnNew.OnClientClick = Window1.GetShowReference("NoticeAndSupervisionEdit.aspx") + "return false;";
GetButtonPower();

2
SGGL/FineUIPro.Web/CQMS/Material/NoticeAndSupervisionEdit.aspx.cs
View File

@ -46,7 +46,7 @@ namespace FineUIPro.Web.CQMS.Material
{
if (!IsPostBack)
{
BLL.UnitService.GetUnit(this.drpUnit, this.CurrUser.LoginProjectId, true);
BLL.UnitService.InitUnitDropDownList(this.drpUnit, this.CurrUser.LoginProjectId, true);
BLL.MainItemService.InitMainItemDownList(drpMainItem, this.CurrUser.LoginProjectId, true);
BLL.NoticeAndSupervisionTypeService.InitNoticeAndSupervisionType(this.drpNoticeAndSupervisionType, true);
NoticeAndSupervisionId = Request.Params["NoticeAndSupervisionId"];

2
SGGL/FineUIPro.Web/CQMS/Material/NoticeAndSupervisionView.aspx.cs
View File

@ -46,7 +46,7 @@ namespace FineUIPro.Web.CQMS.Material
{
if (!IsPostBack)
{
BLL.UnitService.GetUnit(this.drpUnit, this.CurrUser.LoginProjectId, true);
BLL.UnitService.InitUnitDropDownList(this.drpUnit, this.CurrUser.LoginProjectId, true);
BLL.MainItemService.InitMainItemDownList(drpMainItem, this.CurrUser.LoginProjectId, true);
BLL.NoticeAndSupervisionTypeService.InitNoticeAndSupervisionType(this.drpNoticeAndSupervisionType, true);
NoticeAndSupervisionId = Request.Params["NoticeAndSupervisionId"];

2
SGGL/FineUIPro.Web/CQMS/Meeting/MonthMeetingEdit.aspx.cs
View File

@ -49,7 +49,7 @@ namespace FineUIPro.Web.CQMS.Meeting
MeetingId = Request.Params["MeetingId"];
this.drpHandleType.DataTextField = "Text";
this.drpHandleType.DataValueField = "Value";
BLL.UnitService.GetUnit(this.drpUnit, this.CurrUser.LoginProjectId, true);
BLL.UnitService.InitUnitDropDownList(this.drpUnit, this.CurrUser.LoginProjectId, true);
this.HideOptions.Hidden = true;
this.rblIsAgree.Hidden = true;
BLL.SitePerson_PersonService.InitProjectUserListByProjectUnitTypeDropDownList(this.drpAttentPerson, this.CurrUser.LoginProjectId, Const.ProjectUnitType_1 + "," + Const.ProjectUnitType_2, true);

2
SGGL/FineUIPro.Web/CQMS/Meeting/MonthMeetingView.aspx.cs
View File

@ -47,7 +47,7 @@ namespace FineUIPro.Web.CQMS.Meeting
if (!IsPostBack)
{
MeetingId = Request.Params["MeetingId"];
BLL.UnitService.GetUnit(this.drpUnit, this.CurrUser.LoginProjectId, true);
BLL.UnitService.InitUnitDropDownList(this.drpUnit, this.CurrUser.LoginProjectId, true);
BLL.SitePerson_PersonService.InitProjectUserListByProjectUnitTypeDropDownList(this.drpAttentPerson, this.CurrUser.LoginProjectId, Const.ProjectUnitType_1 + "," + Const.ProjectUnitType_2, true);
if (!string.IsNullOrEmpty(MeetingId))
{

2
SGGL/FineUIPro.Web/CQMS/Meeting/SpecialMeetingEdit.aspx.cs
View File

@ -49,7 +49,7 @@ namespace FineUIPro.Web.CQMS.Meeting
MeetingId = Request.Params["MeetingId"];
this.drpHandleType.DataTextField = "Text";
this.drpHandleType.DataValueField = "Value";
BLL.UnitService.GetUnit(this.drpUnit, this.CurrUser.LoginProjectId, true);
BLL.UnitService.InitUnitDropDownList(this.drpUnit, this.CurrUser.LoginProjectId, true);
this.HideOptions.Hidden = true;
this.rblIsAgree.Hidden = true;
BLL.SitePerson_PersonService.InitProjectUserListByProjectUnitTypeDropDownList(this.drpAttentPerson, this.CurrUser.LoginProjectId, Const.ProjectUnitType_1 + "," + Const.ProjectUnitType_2, true);

2
SGGL/FineUIPro.Web/CQMS/Meeting/SpecialMeetingView.aspx.cs
View File

@ -47,7 +47,7 @@ namespace FineUIPro.Web.CQMS.Meeting
if (!IsPostBack)
{
MeetingId = Request.Params["MeetingId"];
BLL.UnitService.GetUnit(this.drpUnit, this.CurrUser.LoginProjectId, true);
BLL.UnitService.InitUnitDropDownList(this.drpUnit, this.CurrUser.LoginProjectId, true);
BLL.SitePerson_PersonService.InitProjectUserListByProjectUnitTypeDropDownList(this.drpAttentPerson, this.CurrUser.LoginProjectId, Const.ProjectUnitType_1 + "," + Const.ProjectUnitType_2, true);
if (!string.IsNullOrEmpty(MeetingId))
{

2
SGGL/FineUIPro.Web/CQMS/Unqualified/AddWorkContactFinalFile.aspx.cs
View File

@ -35,7 +35,7 @@ namespace FineUIPro.Web.CQMS.Unqualified
{
if (!IsPostBack)
{
UnitService.GetUnit(drpUnit, CurrUser.LoginProjectId, false);
UnitService.InitUnitDropDownList(drpUnit, CurrUser.LoginProjectId, false);
//主送单位
gvMainSendUnit.DataSource = UnitService.GetUnitByProjectIdList(CurrUser.LoginProjectId);
gvMainSendUnit.DataBind();

2
SGGL/FineUIPro.Web/CQMS/Unqualified/ContactList.aspx.cs
View File

@ -58,7 +58,7 @@ namespace FineUIPro.Web.CQMS.Unqualified
{
if (!IsPostBack)
{
UnitService.GetUnit(drpProposeUnit, CurrUser.LoginProjectId, true);
UnitService.InitUnitDropDownList(drpProposeUnit, CurrUser.LoginProjectId, true);
Funs.FineUIPleaseSelect(this.drpIsReply);
Funs.FineUIPleaseSelect(this.drpState);
ddlPageSize.SelectedValue = Grid1.PageSize.ToString();

2
SGGL/FineUIPro.Web/CQMS/Unqualified/EditWorkContact.aspx.cs
View File

@ -53,7 +53,7 @@ namespace FineUIPro.Web.CQMS.Unqualified
{
if (!IsPostBack)
{
UnitService.GetUnit(drpUnit, CurrUser.LoginProjectId, false);
UnitService.InitUnitDropDownList(drpUnit, CurrUser.LoginProjectId, false);
//主送单位
gvMainSendUnit.DataSource = UnitService.GetUnitByProjectIdList(CurrUser.LoginProjectId);
gvMainSendUnit.DataBind();

2
SGGL/FineUIPro.Web/HJGL/PreDesign/MaterialManageEdit.aspx.cs
View File

@ -25,7 +25,7 @@ namespace FineUIPro.Web.HJGL.PreDesign
if (!IsPostBack)
{
this.ProjectId = this.CurrUser.LoginProjectId;
BLL.UnitService.GetUnit(this.drpUnit, this.ProjectId, true);
BLL.UnitService.InitUnitDropDownList(this.drpUnit, this.ProjectId, true);
BLL.MainItemService.InitMainItemDownList(drpMainItem, this.ProjectId, true);
this.btnClose.OnClientClick = ActiveWindow.GetHideReference();
string MaterialId = Request.Params["MaterialId"];

2
SGGL/FineUIPro.Web/HJGL/PreDesign/MaterialManageView.aspx.cs
View File

@ -24,7 +24,7 @@ namespace FineUIPro.Web.HJGL.PreDesign
if (!IsPostBack)
{
this.ProjectId = this.CurrUser.LoginProjectId;
BLL.UnitService.GetUnit(this.drpUnit, this.ProjectId, true);
BLL.UnitService.InitUnitDropDownList(this.drpUnit, this.ProjectId, true);
BLL.MainItemService.InitMainItemDownList(drpMainItem, this.ProjectId, true);
this.btnClose.OnClientClick = ActiveWindow.GetHideReference();
string MaterialId = Request.Params["MaterialId"];

2
SGGL/FineUIPro.Web/HSSE/Check/CheckSpecialEdit.aspx.cs
View File

@ -139,7 +139,7 @@ namespace FineUIPro.Web.HSSE.Check
Person_PersonsService.InitUserProjectIdUnitIdRoleIdDropDownList(this.drpPartInPersons, this.ProjectId, null, null, true);
ConstValue.InitConstNameDropDownList(this.drpHandleStep, ConstValue.Group_HandleStep, true);
///责任单位
UnitService.InitUnitNameByProjectIdUnitTypeDropDownList(this.drpWorkUnit, this.ProjectId, Const.ProjectUnitType_2, false);
UnitService.InitUnitByProjectIdUnitTypeDropDownList(this.drpWorkUnit, this.ProjectId, Const.ProjectUnitType_2, false);
///单位工程
UnitWorkService.InitUnitWorkNameDropDownList(this.drpCheckArea, this.ProjectId, false);
}

4
SGGL/FineUIPro.Web/OfficeCheck/Check/CheckNotice.aspx
View File

@ -153,10 +153,6 @@
SortField="CheckPostName" FieldType="String" HeaderText="工作组职务"
HeaderTextAlign="Center" TextAlign="Left">
</f:RenderField>
<f:RenderField Width="90px" ColumnID="CheckDate" DataField="CheckDate"
SortField="CheckDate" FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd"
HeaderText="检查日期" HeaderTextAlign="Center" TextAlign="Center">
</f:RenderField>
</Columns>
<Listeners>
<f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu2" />

2
SGGL/FineUIPro.Web/OfficeCheck/Check/CheckNoticeEdit.aspx.cs
View File

@ -36,7 +36,7 @@ namespace FineUIPro.Web.OfficeCheck.Check
this.GetButtonPower();
BLL.ProjectService.InitAllProjectDropDownList(this.drpSubjectProject, true);
BLL.UnitService.InitUnitDropDownList(this.drpUnit, this.CurrUser.LoginProjectId, true);
BLL.UnitService.InitSeDinAndCNCECUnitDropDownList(this.drpUnit, false);
this.CheckNoticeId = Request.Params["CheckNoticeId"];
if (!string.IsNullOrEmpty(this.CheckNoticeId))

9
SGGL/FineUIPro.Web/OfficeCheck/Check/CheckTeamEdit.aspx
View File

@ -24,7 +24,8 @@
<Rows>
<f:FormRow>
<Items>
<f:NumberBox ID="txtSortIndex" runat="server" Label="序号" LabelWidth="120px" MinValue="1" NoDecimal="true" NoNegative="true">
<f:NumberBox ID="txtSortIndex" runat="server" Label="序号" LabelWidth="120px"
MinValue="1" NoDecimal="true" NoNegative="true">
</f:NumberBox>
<f:TextBox ID="txtUserName" runat="server" Label="组成员" LabelWidth="100px" FocusOnPageLoad="true"
ShowRedStar="true" Required="true" AutoPostBack="true" OnTextChanged="txtUserName_TextChanged">
@ -52,10 +53,10 @@
</f:FormRow>
<f:FormRow>
<Items>
<f:TextBox ID="txtCheckPostName" runat="server" Label="评价小组职务" LabelWidth="120px" MaxLength="200">
<f:TextBox ID="txtCheckPostName" runat="server" Label="检查小组职务" LabelWidth="120px" MaxLength="200">
</f:TextBox>
<f:DatePicker runat="server" DateFormatString="yyyy-MM-dd" Label="评价日期" ID="txtCheckDate"
EmptyText="请选择评价日期">
<f:DatePicker runat="server" DateFormatString="yyyy-MM-dd" Label="检查日期" ID="txtCheckDate"
EmptyText="请选择检查日期">
</f:DatePicker>
</Items>
</f:FormRow>

2
SGGL/FineUIPro.Web/OfficeCheck/Check/CheckTeamEdit.aspx.cs
View File

@ -50,7 +50,7 @@ namespace FineUIPro.Web.OfficeCheck.Check
this.CheckNoticeId = Request.Params["CheckNoticeId"];
this.CheckTeamId = Request.Params["CheckTeamId"];
BLL.UnitService.InitUnitDropDownList(this.drpUnit, this.CurrUser.LoginProjectId, true);
BLL.UnitService.InitUnitDropDownList(this.drpUnit, null, true);
if (!string.IsNullOrEmpty(this.CheckTeamId))
{