lpf/CNCEC_SUBQHSE_WUHUAN
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

20240523 菜单精简

Browse Source
This commit is contained in:
毕文静
2024-05-23 09:41:47 +08:00
parent 3de388f25d
commit e1517d9238
70 changed files with 1029 additions and 569 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/FineUIPro.Web/HSSE/License/HSETechnicalEdit.aspx
+6 -4
View File
@@ -37,17 +37,19 @@
</f:FormRow>
<f:FormRow>
<Items>
<f:DropDownList ID="drpTechnicalMan" runat="server" Label="交底人" LabelAlign="Right" EnableEdit="true"></f:DropDownList>
<%--<f:DropDownList ID="drpTechnicalMan" runat="server" Label="交底人" LabelAlign="Right" EnableEdit="true"></f:DropDownList>--%>
<f:TextBox ID="txtTechnicalMan" runat="server" Label="交底人" LabelAlign="Right"></f:TextBox>
<f:Label runat="server" ID="lbHid"></f:Label>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:DropDownList ID="drpPartTechnicalMans" runat="server" Label="参加人员" EnableEdit="true" EnableMultiSelect="true"
<%--<f:DropDownList ID="drpPartTechnicalMans" runat="server" Label="参加人员" EnableEdit="true" EnableMultiSelect="true"
ForceSelection="false" MaxLength="2000" EnableCheckBoxSelect="true"
AutoPostBack="true" OnSelectedIndexChanged="drpPartTechnicalMans_SelectedIndexChanged">
</f:DropDownList>
<f:TextBox runat="server" ID="txtPartTechnicalManNames" MaxLength="2000" Label="补充人员"></f:TextBox>
</f:DropDownList>--%>
<f:TextBox runat="server" ID="txtPartTechnicalMans" Label="参加人员" LabelAlign="Right"></f:TextBox>
<f:TextBox runat="server" ID="txtPartTechnicalManNames" MaxLength="2000" Label="补充人员" LabelAlign="Right"></f:TextBox>
</Items>
</f:FormRow>
<f:FormRow>
SGGL/FineUIPro.Web/HSSE/License/HSETechnicalEdit.aspx.cs
+33 -29
View File
@@ -65,7 +65,7 @@ namespace FineUIPro.Web.HSSE.License
if (!string.IsNullOrEmpty(hseTechnical.UnitId))
{
this.drpUnitId.SelectedValue = hseTechnical.UnitId;
UserService.InitUserProjectIdUnitIdDropDownList(this.drpTechnicalMan, this.ProjectId, this.drpUnitId.SelectedValue, true);
//UserService.InitUserProjectIdUnitIdDropDownList(this.drpTechnicalMan, this.ProjectId, this.drpUnitId.SelectedValue, true);
TeamGroupService.InitTeamGroupProjectUnitDropDownList(this.drpTeamGroupId, this.ProjectId, this.drpUnitId.SelectedValue, true);
}
if (!string.IsNullOrEmpty(hseTechnical.TeamGroupId))
@@ -74,11 +74,13 @@ namespace FineUIPro.Web.HSSE.License
}
if (!string.IsNullOrEmpty(hseTechnical.TechnicalManId))
{
this.drpTechnicalMan.SelectedValue = hseTechnical.TechnicalManId;
//this.drpTechnicalMan.SelectedValue = hseTechnical.TechnicalManId;
this.txtTechnicalMan.Text = hseTechnical.TechnicalManId;
}
if (!string.IsNullOrEmpty(hseTechnical.PartTechnicalManIds))
{
this.drpPartTechnicalMans.SelectedValueArray = hseTechnical.PartTechnicalManIds.Split(',');
this.txtPartTechnicalMans.Text = hseTechnical.PartTechnicalManIds;
//this.drpPartTechnicalMans.SelectedValueArray = hseTechnical.PartTechnicalManIds.Split(',');
}
this.txtPartTechnicalManNames.Text = hseTechnical.PartTechnicalManNames;
this.txtWorkContents.Text = hseTechnical.WorkContents;
@@ -108,7 +110,7 @@ namespace FineUIPro.Web.HSSE.License
{
UnitService.InitUnitDropDownList(this.drpUnitId, this.ProjectId, true);
//参加人员
UserService.InitUserDropDownList(this.drpPartTechnicalMans, this.ProjectId, true);
//UserService.InitUserDropDownList(this.drpPartTechnicalMans, this.ProjectId, true);
}
#region 保存
@@ -160,10 +162,11 @@ namespace FineUIPro.Web.HSSE.License
{
hSETechnical.TeamGroupId = this.drpTeamGroupId.SelectedValue;
}
if (this.drpTechnicalMan.SelectedValue != BLL.Const._Null)
{
hSETechnical.TechnicalManId = this.drpTechnicalMan.SelectedValue;
}
//if (this.drpTechnicalMan.SelectedValue != BLL.Const._Null)
//{
//hSETechnical.TechnicalManId = this.drpTechnicalMan.SelectedValue;
//}
hSETechnical.TechnicalManId = this.txtTechnicalMan.Text.Trim();
hSETechnical.WorkContents = this.txtWorkContents.Text.Trim();
hSETechnical.Address = this.txtAddress.Text.Trim();
hSETechnical.CompileMan = this.CurrUser.UserId;
@@ -175,19 +178,20 @@ namespace FineUIPro.Web.HSSE.License
}
///组成员
string partInManIds = string.Empty;
foreach (var item in this.drpPartTechnicalMans.SelectedValueArray)
{
var user = BLL.UserService.GetUserByUserId(item);
if (user != null)
{
partInManIds += user.UserId + ",";
}
}
if (!string.IsNullOrEmpty(partInManIds))
{
hSETechnical.PartTechnicalManIds = partInManIds.Substring(0, partInManIds.LastIndexOf(","));
}
//string partInManIds = string.Empty;
//foreach (var item in this.drpPartTechnicalMans.SelectedValueArray)
//{
// var user = BLL.UserService.GetUserByUserId(item);
// if (user != null)
// {
// partInManIds += user.UserId + ",";
// }
//}
//if (!string.IsNullOrEmpty(partInManIds))
//{
// hSETechnical.PartTechnicalManIds = partInManIds.Substring(0, partInManIds.LastIndexOf(","));
//}
hSETechnical.PartTechnicalManIds = this.txtPartTechnicalMans.Text.Trim();
hSETechnical.PartTechnicalManNames = this.txtPartTechnicalManNames.Text.Trim();
if (!string.IsNullOrEmpty(this.HSETechnicalId))
@@ -232,24 +236,24 @@ namespace FineUIPro.Web.HSSE.License
protected void drpUnitId_SelectedIndexChanged(object sender, EventArgs e)
{
this.drpTeamGroupId.Items.Clear();
this.drpTechnicalMan.Items.Clear();
//this.drpTechnicalMan.Items.Clear();
if (this.drpUnitId.SelectedValue != BLL.Const._Null)
{
UserService.InitUserProjectIdUnitIdDropDownList(this.drpTechnicalMan, this.ProjectId, this.drpUnitId.SelectedValue, true);
//UserService.InitUserProjectIdUnitIdDropDownList(this.drpTechnicalMan, this.ProjectId, this.drpUnitId.SelectedValue, true);
TeamGroupService.InitTeamGroupProjectUnitDropDownList(this.drpTeamGroupId, this.ProjectId, this.drpUnitId.SelectedValue, true);
}
else
{
Funs.FineUIPleaseSelect(this.drpTeamGroupId);
Funs.FineUIPleaseSelect(this.drpTechnicalMan);
//Funs.FineUIPleaseSelect(this.drpTechnicalMan);
}
this.drpTeamGroupId.SelectedIndex = 0;
this.drpTechnicalMan.SelectedIndex = 0;
//this.drpTechnicalMan.SelectedIndex = 0;
}
protected void drpPartTechnicalMans_SelectedIndexChanged(object sender, EventArgs e)
{
this.drpPartTechnicalMans.SelectedValueArray = Funs.RemoveDropDownListNull(this.drpPartTechnicalMans.SelectedValueArray);
}
//protected void drpPartTechnicalMans_SelectedIndexChanged(object sender, EventArgs e)
//{
// this.drpPartTechnicalMans.SelectedValueArray = Funs.RemoveDropDownListNull(this.drpPartTechnicalMans.SelectedValueArray);
//}
}
}
SGGL/FineUIPro.Web/HSSE/License/HSETechnicalEdit.aspx.designer.cs
Generated
+4 -4
View File
@@ -76,13 +76,13 @@ namespace FineUIPro.Web.HSSE.License {
protected global::FineUIPro.DropDownList drpTeamGroupId;
/// <summary>
/// drpTechnicalMan 控件。
/// txtTechnicalMan 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpTechnicalMan;
protected global::FineUIPro.TextBox txtTechnicalMan;
/// <summary>
/// lbHid 控件。
@@ -94,13 +94,13 @@ namespace FineUIPro.Web.HSSE.License {
protected global::FineUIPro.Label lbHid;
/// <summary>
/// drpPartTechnicalMans 控件。
/// txtPartTechnicalMans 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpPartTechnicalMans;
protected global::FineUIPro.TextBox txtPartTechnicalMans;
/// <summary>
/// txtPartTechnicalManNames 控件。