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

培训

Browse Source
This commit is contained in:
夏菊
2025-02-25 16:41:06 +08:00
parent ca8be515a9
commit b7c8a426bf
87 changed files with 5778 additions and 1835 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/FineUIPro.Web/HSSE/SitePerson/PersonList.aspx
+4 -4
View File
@@ -58,9 +58,9 @@
<f:DropDownList ID="drpPost" runat="server" Label="岗位" EnableEdit="true" EnableMultiSelect="true"
Width="200px" LabelWidth="50px" LabelAlign="right" ForceSelection="false" EnableCheckBoxSelect="true">
</f:DropDownList>
<f:DropDownList ID="drpRole" runat="server" Label="培训岗位" EnableEdit="true" EnableMultiSelect="true"
<%--<f:DropDownList ID="drpRole" runat="server" Label="培训岗位" EnableEdit="true" EnableMultiSelect="true"
Width="200px" LabelWidth="50px" LabelAlign="right" ForceSelection="false" EnableCheckBoxSelect="true">
</f:DropDownList>
</f:DropDownList>--%>
<f:DropDownList ID="drpTreamGroup" runat="server" Label="班组" EnableEdit="true"
Width="200px" LabelWidth="50px" LabelAlign="right" ForceSelection="false">
</f:DropDownList>
@@ -116,9 +116,9 @@
<f:RenderField HeaderText="单位名称" ColumnID="UnitName" DataField="UnitName" SortField="UnitName"
FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="200px">
</f:RenderField>
<f:RenderField HeaderText="培训岗位" ColumnID="PostTrainingRoleName" DataField="PostTrainingRoleName" SortField="PostTrainingRoleName"
<%--<f:RenderField HeaderText="培训岗位" ColumnID="PostTrainingRoleName" DataField="PostTrainingRoleName" SortField="PostTrainingRoleName"
FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="120px">
</f:RenderField>
</f:RenderField>--%>
<%-- <f:RenderField HeaderText="部门名称" ColumnID="DepartName" DataField="DepartName" SortField="DepartName"
FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="100px">
</f:RenderField> --%>
SGGL/FineUIPro.Web/HSSE/SitePerson/PersonList.aspx.cs
+16 -16
View File
@@ -65,7 +65,7 @@ namespace FineUIPro.Web.HSSE.SitePerson
this.btnMenuDelete.ConfirmText = String.Format("你确定要删除选中的&nbsp;<b><script>{0}</script></b>&nbsp;行数据吗？", Grid1.GetSelectedCountReference());
this.ddlPageSize.SelectedValue = this.Grid1.PageSize.ToString();
BLL.WorkPostService.InitWorkPostDropDownList(this.drpPost, true);
PostTrainingRoleService.InitPostTrainingRoleDropDownList(this.drpRole, true);
//PostTrainingRoleService.InitPostTrainingRoleDropDownList(this.drpRole, true);
this.InitTreeMenu();//加载树
}
}
@@ -294,21 +294,21 @@ namespace FineUIPro.Web.HSSE.SitePerson
strSql += ")";
}
if (this.drpRole.SelectedItemArray.Count() > 1 || (this.drpRole.SelectedValue != BLL.Const._Null && this.drpRole.SelectedItemArray.Count() == 1))
{
strSql += " AND (1=2 ";
int i = 0;
foreach (var item in this.drpRole.SelectedValueArray)
{
if (!string.IsNullOrEmpty(item) && item != BLL.Const._Null)
{
strSql += " OR PostTrainingRoleId = @PostTrainingRoleId" + i.ToString();
listStr.Add(new SqlParameter("@PostTrainingRoleId" + i.ToString(), item));
}
i++;
}
strSql += ")";
}
//if (this.drpRole.SelectedItemArray.Count() > 1 || (this.drpRole.SelectedValue != BLL.Const._Null && this.drpRole.SelectedItemArray.Count() == 1))
//{
// strSql += " AND (1=2 ";
// int i = 0;
// foreach (var item in this.drpRole.SelectedValueArray)
// {
// if (!string.IsNullOrEmpty(item) && item != BLL.Const._Null)
// {
// strSql += " OR PostTrainingRoleId = @PostTrainingRoleId" + i.ToString();
// listStr.Add(new SqlParameter("@PostTrainingRoleId" + i.ToString(), item));
// }
// i++;
// }
// strSql += ")";
//}
if (this.ckTrain.Checked)
{
SGGL/FineUIPro.Web/HSSE/SitePerson/PersonList.aspx.designer.cs
Generated
-9
View File
@@ -131,15 +131,6 @@ namespace FineUIPro.Web.HSSE.SitePerson
/// </remarks>
protected global::FineUIPro.DropDownList drpPost;
/// <summary>
/// drpRole 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpRole;
/// <summary>
/// drpTreamGroup 控件。
/// </summary>
SGGL/FineUIPro.Web/HSSE/SitePerson/PersonListEdit.aspx
+2 -2
View File
@@ -144,8 +144,8 @@
<f:RadioItem Value="True" Text="是" />
<f:RadioItem Value="False" Text="否" />
</f:RadioButtonList>
<f:DropDownList ID="drpRole" runat="server" Label="培训岗位" LabelAlign="Right" Required="True" ShowRedStar="True" EnableEdit="true">
</f:DropDownList>
<%--<f:DropDownList ID="drpRole" runat="server" Label="培训岗位" LabelAlign="Right" Required="True" ShowRedStar="True" EnableEdit="true">
</f:DropDownList>--%>
</Items>
</f:Panel>
SGGL/FineUIPro.Web/HSSE/SitePerson/PersonListEdit.aspx.cs
+15 -15
View File
@@ -113,10 +113,10 @@ namespace FineUIPro.Web.HSSE.SitePerson
{
this.drpPost.SelectedValue = person.WorkPostId;
}
if (!string.IsNullOrEmpty(person.PostTrainingRoleId))
{
this.drpRole.SelectedValue = person.PostTrainingRoleId;
}
//if (!string.IsNullOrEmpty(person.PostTrainingRoleId))
//{
// this.drpRole.SelectedValue = person.PostTrainingRoleId;
//}
if (!string.IsNullOrEmpty(person.PositionId))
{
this.drpPosition.SelectedValue = person.PositionId;
@@ -270,8 +270,8 @@ namespace FineUIPro.Web.HSSE.SitePerson
gvWorkArea.DataBind();//单位工程
//所属岗位
WorkPostService.InitWorkPostDropDownList(this.drpPost, true);
//培训岗位
PostTrainingRoleService.InitPostTrainingRoleDropDownList(this.drpRole, true);
////培训岗位
//PostTrainingRoleService.InitPostTrainingRoleDropDownList(this.drpRole, true);
PositionService.InitPositionDropDownList(this.drpPosition, true);
PostTitleService.InitPostTitleDropDownList(this.drpTitle, true);
TeamGroupService.InitTeamGroupProjectUnitDropDownList(this.drpTeamGroup, this.ProjectId, this.UnitId, true);
@@ -333,11 +333,11 @@ namespace FineUIPro.Web.HSSE.SitePerson
ShowNotify("请选择所属岗位！", MessageBoxIcon.Warning);
return;
}
if (this.drpRole.SelectedValue == BLL.Const._Null)
{
ShowNotify("请选择培训岗位！", MessageBoxIcon.Warning);
return;
}
//if (this.drpRole.SelectedValue == BLL.Const._Null)
//{
// ShowNotify("请选择培训岗位！", MessageBoxIcon.Warning);
// return;
//}
if (string.IsNullOrEmpty(this.txtInTime.Text))
{
ShowNotify("入场时间不能为空！", MessageBoxIcon.Warning);
@@ -398,10 +398,10 @@ namespace FineUIPro.Web.HSSE.SitePerson
{
person.WorkPostId = this.drpPost.SelectedValue;
}
if (this.drpRole.SelectedValue != BLL.Const._Null)
{
person.PostTrainingRoleId = this.drpRole.SelectedValue;
}
//if (this.drpRole.SelectedValue != BLL.Const._Null)
//{
// person.PostTrainingRoleId = this.drpRole.SelectedValue;
//}
if (this.drpPosition.SelectedValue != BLL.Const._Null)
{
person.PositionId = this.drpPosition.SelectedValue;
SGGL/FineUIPro.Web/HSSE/SitePerson/PersonListEdit.aspx.designer.cs
Generated
-9
View File
@@ -401,15 +401,6 @@ namespace FineUIPro.Web.HSSE.SitePerson
/// </remarks>
protected global::FineUIPro.RadioButtonList rblIsUsed;
/// <summary>
/// drpRole 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpRole;
/// <summary>
/// Panel5 控件。
/// </summary>