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

202306131、新增项目级消息待办页面功能。2、新增项目单位是否同步实名制设置功能。3、优化考试合格自动生成卡号功能。

Browse Source
This commit is contained in:
杨红卫
2023-06-13 16:30:08 +08:00
parent 3c887b46d1
commit 7a2a8ffb93
37 changed files with 805 additions and 194 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/FineUIPro.Web/ProjectData/ProjectUnit.aspx
+91 -89
View File
@@ -5,21 +5,19 @@
<head runat="server">
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title>项目单位</title>
<link href="../res/css/common.css" rel="stylesheet" type="text/css" />
<link href="../res/css/common.css" rel="stylesheet" type="text/css" />
<style type="text/css">
.f-grid-row .f-grid-cell-inner {
white-space: normal;
word-break: break-all;
}
.f-grid-row.red
{
}
.f-grid-row.red {
background-color: #FF7575;
background-image: none;
}
.fontred
{
.fontred {
color: #FF7575;
background-image: none;
}
@@ -27,87 +25,91 @@
</head>
<body>
<form id="form1" runat="server">
<f:PageManager ID="PageManager1" AutoSizePanelID="Panel1" runat="server" />
<f:Panel ID="Panel1" runat="server" Margin="5px" BodyPadding="5px" ShowBorder="false"
ShowHeader="false" Layout="VBox" BoxConfigAlign="Stretch" >
<Items>
<f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="项目单位"
EnableCollapse="true" runat="server" BoxFlex="1" EnableColumnLines="true"
DataKeyNames="ProjectUnitId" AllowCellEditing="true" ClicksToEdit="2" DataIDField="ProjectUnitId"
AllowSorting="true" SortField="UnitType,UnitCode" SortDirection="ASC" OnSort="Grid1_Sort"
AllowPaging="true" IsDatabasePaging="true" PageSize="10" OnPageIndexChange="Grid1_PageIndexChange"
EnableRowDoubleClickEvent="true" OnRowDoubleClick="Grid1_RowDoubleClick" EnableTextSelection="True">
<Toolbars>
<f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Left">
<Items>
<f:DropDownList ID="drpProject" runat="server" Label="项目" Width="300px" LabelWidth="60px" EmptyText="请选择项目"
EnableEdit="true" AutoPostBack="true" OnSelectedIndexChanged="TextBox_TextChanged">
</f:DropDownList>
<f:TextBox runat="server" Label="单位名称" ID="txtUnitName" EmptyText="输入查询条件"
AutoPostBack="true" OnTextChanged="TextBox_TextChanged" Width="250px" LabelWidth="80px"></f:TextBox>
<f:Label runat="server" Label="说明" CssClass="fontred" Text="请双击填报单位类型" LabelAlign="right"></f:Label>
<f:ToolbarFill runat="server"></f:ToolbarFill>
<f:Button ID="btnSelect" Text="新增" Icon="Add" Hidden="true" runat="server"
OnClick="btnSelect_Click">
</f:Button>
<f:Button ID="btnOut" OnClick="btnOut_Click" runat="server" Text="导出" Icon="FolderUp"
EnableAjax="false" DisableControlBeforePostBack="false">
</f:Button>
</Items>
</f:Toolbar>
</Toolbars>
<Columns>
<f:TemplateField ColumnID="tfNumber" Width="55px" HeaderText="序号" HeaderTextAlign="Center"
TextAlign="Center">
<ItemTemplate>
<asp:Label ID="lblNumber" runat="server" Text='<%# Grid1.PageIndex * Grid1.PageSize + Container.DataItemIndex + 1 %>'></asp:Label>
</ItemTemplate>
</f:TemplateField>
<f:RenderField Width="150px" ColumnID="UnitTypeName" DataField="UnitTypeName" SortField="UnitTypeName"
FieldType="String" HeaderText="单位类型" HeaderTextAlign="Center" TextAlign="Left">
</f:RenderField>
<f:RenderField Width="180px" ColumnID="UnitCode" DataField="UnitCode" SortField="UnitCode" FieldType="String"
HeaderText="单位编号">
</f:RenderField>
<f:RenderField Width="250px" ColumnID="UnitName" DataField="UnitName" SortField="UnitName"
FieldType="String" HeaderText="单位名称" HeaderTextAlign="Center" TextAlign="Left" ExpandUnusedSpace="true">
</f:RenderField>
<f:RenderField Width="110px" ColumnID="InTime" DataField="InTime" SortField="InTime"
FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd" HeaderText="入场时间"
HeaderTextAlign="Center" TextAlign="Center">
</f:RenderField>
<f:RenderField Width="110px" ColumnID="OutTime" DataField="OutTime" SortField="OutTime"
FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd" HeaderText="出场时间"
HeaderTextAlign="Center" TextAlign="Center">
</f:RenderField>
</Columns>
<Listeners>
<f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
<f:Listener Event="dataload" Handler="onGridDataLoad" />
</Listeners>
<PageItems>
<f:ToolbarSeparator ID="ToolbarSeparator1" runat="server">
</f:ToolbarSeparator>
<f:ToolbarText ID="ToolbarText1" runat="server" Text="每页记录数：">
</f:ToolbarText>
<f:DropDownList runat="server" ID="ddlPageSize" Width="80px" AutoPostBack="true"
OnSelectedIndexChanged="ddlPageSize_SelectedIndexChanged">
</f:DropDownList>
</PageItems>
</f:Grid>
</Items>
</f:Panel>
<f:Window ID="Window1" Hidden="true" EnableIFrame="true" EnableMaximize="true"
Target="Parent" EnableResize="false" runat="server" OnClose="Window1_Close" IsModal="true">
</f:Window>
<f:Menu ID="Menu1" runat="server">
<f:MenuButton ID="btnMenuEdit" OnClick="btnMenuEdit_Click" EnablePostBack="true" Hidden="true"
Icon="Pencil" runat="server" Text="编辑">
</f:MenuButton>
<f:MenuButton ID="btnMenuDelete" OnClick="btnMenuDelete_Click" EnablePostBack="true" Hidden="true"
Icon="Delete" ConfirmText="删除选中行？" ConfirmTarget="Parent" runat="server" Text="删除">
</f:MenuButton>
</f:Menu>
<f:PageManager ID="PageManager1" AutoSizePanelID="Panel1" runat="server" />
<f:Panel ID="Panel1" runat="server" Margin="5px" BodyPadding="5px" ShowBorder="false"
ShowHeader="false" Layout="VBox" BoxConfigAlign="Stretch">
<Items>
<f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="项目单位"
EnableCollapse="true" runat="server" BoxFlex="1" EnableColumnLines="true"
DataKeyNames="ProjectUnitId" AllowCellEditing="true" ClicksToEdit="2" DataIDField="ProjectUnitId"
AllowSorting="true" SortField="UnitType,UnitCode" SortDirection="ASC" OnSort="Grid1_Sort"
AllowPaging="true" IsDatabasePaging="true" PageSize="10" OnPageIndexChange="Grid1_PageIndexChange"
EnableRowDoubleClickEvent="true" OnRowDoubleClick="Grid1_RowDoubleClick" EnableTextSelection="True">
<Toolbars>
<f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Left">
<Items>
<f:DropDownList ID="drpProject" runat="server" Label="项目" Width="300px" LabelWidth="60px" EmptyText="请选择项目"
EnableEdit="true" AutoPostBack="true" OnSelectedIndexChanged="TextBox_TextChanged">
</f:DropDownList>
<f:TextBox runat="server" Label="单位名称" ID="txtUnitName" EmptyText="输入查询条件"
AutoPostBack="true" OnTextChanged="TextBox_TextChanged" Width="250px" LabelWidth="80px">
</f:TextBox>
<f:Label runat="server" Label="说明" CssClass="fontred" Text="请双击填报单位类型" LabelAlign="right"></f:Label>
<f:ToolbarFill runat="server"></f:ToolbarFill>
<f:Button ID="btnSelect" Text="新增" Icon="Add" Hidden="true" runat="server"
OnClick="btnSelect_Click">
</f:Button>
<f:Button ID="btnOut" OnClick="btnOut_Click" runat="server" Text="导出" Icon="FolderUp"
EnableAjax="false" DisableControlBeforePostBack="false">
</f:Button>
</Items>
</f:Toolbar>
</Toolbars>
<Columns>
<f:TemplateField ColumnID="tfNumber" Width="55px" HeaderText="序号" HeaderTextAlign="Center"
TextAlign="Center">
<ItemTemplate>
<asp:Label ID="lblNumber" runat="server" Text='<%# Grid1.PageIndex * Grid1.PageSize + Container.DataItemIndex + 1 %>'></asp:Label>
</ItemTemplate>
</f:TemplateField>
<f:RenderField Width="150px" ColumnID="UnitTypeName" DataField="UnitTypeName" SortField="UnitTypeName"
FieldType="String" HeaderText="单位类型" HeaderTextAlign="Center" TextAlign="Left">
</f:RenderField>
<f:RenderField Width="180px" ColumnID="UnitCode" DataField="UnitCode" SortField="UnitCode" FieldType="String"
HeaderText="单位编号">
</f:RenderField>
<f:RenderField Width="250px" ColumnID="UnitName" DataField="UnitName" SortField="UnitName"
FieldType="String" HeaderText="单位名称" HeaderTextAlign="Center" TextAlign="Left" ExpandUnusedSpace="true">
</f:RenderField>
<f:RenderField Width="110px" ColumnID="InTime" DataField="InTime" SortField="InTime"
FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd" HeaderText="入场时间"
HeaderTextAlign="Center" TextAlign="Center">
</f:RenderField>
<f:RenderField Width="110px" ColumnID="OutTime" DataField="OutTime" SortField="OutTime"
FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd" HeaderText="出场时间"
HeaderTextAlign="Center" TextAlign="Center">
</f:RenderField>
<f:CheckBoxField Width="100px" SortField="IsSynchro" RenderAsStaticField="true" DataField="IsSynchro"
HeaderText="同步实名制" HeaderTextAlign="Center" TextAlign="Center">
</f:CheckBoxField>
</Columns>
<Listeners>
<f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
<f:Listener Event="dataload" Handler="onGridDataLoad" />
</Listeners>
<PageItems>
<f:ToolbarSeparator ID="ToolbarSeparator1" runat="server">
</f:ToolbarSeparator>
<f:ToolbarText ID="ToolbarText1" runat="server" Text="每页记录数：">
</f:ToolbarText>
<f:DropDownList runat="server" ID="ddlPageSize" Width="80px" AutoPostBack="true"
OnSelectedIndexChanged="ddlPageSize_SelectedIndexChanged">
</f:DropDownList>
</PageItems>
</f:Grid>
</Items>
</f:Panel>
<f:Window ID="Window1" Hidden="true" EnableIFrame="true" EnableMaximize="true"
Target="Parent" EnableResize="false" runat="server" OnClose="Window1_Close" IsModal="true">
</f:Window>
<f:Menu ID="Menu1" runat="server">
<f:MenuButton ID="btnMenuEdit" OnClick="btnMenuEdit_Click" EnablePostBack="true" Hidden="true"
Icon="Pencil" runat="server" Text="编辑">
</f:MenuButton>
<f:MenuButton ID="btnMenuDelete" OnClick="btnMenuDelete_Click" EnablePostBack="true" Hidden="true"
Icon="Delete" ConfirmText="删除选中行？" ConfirmTarget="Parent" runat="server" Text="删除">
</f:MenuButton>
</f:Menu>
</form>
<script type="text/javascript">
var menuID = '<%= Menu1.ClientID %>';
SGGL/FineUIPro.Web/ProjectData/ProjectUnit.aspx.cs
+2 -1
View File
@@ -48,7 +48,8 @@ namespace FineUIPro.Web.ProjectData
{
if (this.drpProject.Items.Count() > 0)
{
string strSql = @"SELECT ProjectUnit.ProjectUnitId,ProjectUnit.ProjectId,Project.ProjectCode,Project.ProjectName,ProjectUnit.UnitId,Unit.UnitCode,Unit.UnitName,ProjectUnit.UnitType,sysConst.ConstText AS UnitTypeName,ProjectUnit.InTime,ProjectUnit.OutTime "
string strSql = @"SELECT ProjectUnit.ProjectUnitId,ProjectUnit.ProjectId,Project.ProjectCode,Project.ProjectName,ProjectUnit.UnitId,Unit.UnitCode,Unit.UnitName
,ProjectUnit.UnitType,sysConst.ConstText AS UnitTypeName,ProjectUnit.InTime,ProjectUnit.OutTime,ProjectUnit.IsSynchro "
+ @" FROM Project_ProjectUnit AS ProjectUnit "
+ @" LEFT JOIN Base_Project AS Project ON ProjectUnit.ProjectId = Project.ProjectId "
+ @" LEFT JOIN Base_Unit AS Unit ON ProjectUnit.UnitId = Unit.UnitId "
SGGL/FineUIPro.Web/ProjectData/ProjectUnitSave.aspx
+11 -4
View File
@@ -68,6 +68,11 @@
<f:DatePicker runat="server" Label="出场时间" ID="txtOutTime"></f:DatePicker>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:CheckBox runat="server" ID="ckIsSynchro" Label="是否同步实名制"></f:CheckBox>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:NumberBox ID="nbPlanCostA" NoDecimal="false" NoNegative="false" MinValue="0" runat="server"
@@ -88,10 +93,12 @@
<Items>
<f:Label runat="server" ID="hdProjectUnitItemId" Hidden="true"></f:Label>
<f:TextBox runat="server" ID="txtContractNum" Label="合同号" LabelWidth="80px"></f:TextBox>
<f:NumberBox runat="server" ID="txtTotalMoney" Label="总金额(元)" LabelWidth="90px"
DecimalPrecision="2" NoNegative="true"></f:NumberBox>
<f:NumberBox runat="server" ID="txtHSEMoney" Label="HSE费用(元)" LabelWidth="100px"
DecimalPrecision="2" NoNegative="true"></f:NumberBox>
<f:NumberBox runat="server" ID="txtTotalMoney" Label="总金额(元)" LabelWidth="90px"
DecimalPrecision="2" NoNegative="true">
</f:NumberBox>
<f:NumberBox runat="server" ID="txtHSEMoney" Label="HSE费用(元)" LabelWidth="100px"
DecimalPrecision="2" NoNegative="true">
</f:NumberBox>
</Items>
</f:FormRow>
<f:FormRow>
SGGL/FineUIPro.Web/ProjectData/ProjectUnitSave.aspx.cs
+14
View File
@@ -61,6 +61,7 @@ namespace FineUIPro.Web.ProjectData
BLL.ConstValue.InitConstValueDropDownList(this.drpUnitType, ConstValue.Group_ProjectUnitType, true);
BasicDataService.InitBasicDataProjectUnitDropDownList(this.drpIdcardType, "ZHENGJIAN_TYPE", true);
this.drpIdcardType.SelectedValue = "SHENFEN_ZHENGJIAN";
this.ckIsSynchro.Checked = false;
this.ProjectUnitId = Request.QueryString["ProjectUnitId"];
if (!String.IsNullOrEmpty(this.ProjectUnitId))
{
@@ -110,6 +111,10 @@ namespace FineUIPro.Web.ProjectData
this.nbPlanCostB.Text = projectUnit.PlanCostB.ToString();
}
this.txtContractRange.Text = projectUnit.ContractRange;
if (projectUnit.IsSynchro == true)
{
this.ckIsSynchro.Checked = true;
}
}
this.BindGrid();
@@ -136,6 +141,15 @@ namespace FineUIPro.Web.ProjectData
newProjectUnit.PlanCostA = Funs.GetNewDecimalOrZero(this.nbPlanCostA.Text.Trim());
newProjectUnit.PlanCostB = Funs.GetNewDecimalOrZero(this.nbPlanCostB.Text.Trim());
newProjectUnit.ContractRange = this.txtContractRange.Text.Trim();
if (this.ckIsSynchro.Checked)
{
newProjectUnit.IsSynchro = true;
}
else
{
newProjectUnit.IsSynchro = false;
}
BLL.ProjectUnitService.UpdateProjectUnit(newProjectUnit);
Model.Base_Unit unit = BLL.UnitService.GetUnitByUnitId(newProjectUnit.UnitId);
if (unit != null)
SGGL/FineUIPro.Web/ProjectData/ProjectUnitSave.aspx.designer.cs
Generated
+9
View File
@@ -149,6 +149,15 @@ namespace FineUIPro.Web.ProjectData
/// </remarks>
protected global::FineUIPro.DatePicker txtOutTime;
/// <summary>
/// ckIsSynchro 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.CheckBox ckIsSynchro;
/// <summary>
/// nbPlanCostA 控件。
/// </summary>
SGGL/FineUIPro.Web/ProjectData/ProjectUser.aspx.cs
+1 -1
View File
@@ -66,7 +66,7 @@
LEFT JOIN Base_Unit AS Unit ON SitePerson.UnitId = Unit.UnitId
LEFT JOIN Base_WorkPost AS WorkPost ON SitePerson.WorkPostId =WorkPost.WorkPostId
LEFT JOIN Sys_Const AS sysConst ON sysConst.GroupId ='" + BLL.ConstValue.Group_ProjectUnitType + "' " +
" AND ProjectUnit.UnitType=sysConst.ConstValue WHERE SitePerson.RoleIds IS NOT NULL AND Persons.Account IS NOT NULL ";
" AND ProjectUnit.UnitType=sysConst.ConstValue WHERE SitePerson.RoleIds IS NOT NULL AND SitePerson.RoleIds != '' AND Persons.Account IS NOT NULL ";
List<SqlParameter> listStr = new List<SqlParameter>();
strSql += " AND SitePerson.ProjectId = @ProjectId";
listStr.Add(new SqlParameter("@ProjectId", this.drpProject.SelectedValue));