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

Merge branch 'master' of https://gitee.com/frane-yang/SGGL_SeDin_New

Browse Source
This commit is contained in:
高飞
2023-07-25 14:08:57 +08:00
parent b8dae5be20 3c141d8710
commit 0bdd467fdb
13 changed files with 278 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/FineUIPro.Web/BaseInfo/Certificate.aspx
+23 -14
View File
@@ -21,20 +21,20 @@
<body>
<form id="form1" runat="server">
<f:PageManager ID="PageManager1" AutoSizePanelID="Panel1" runat="server" />
<f:Panel ID="Panel1" runat="server" Margin="5px" BodyPadding="5px" Title="特岗证书" Layout="HBox" ShowHeader="false">
<Items>
<f:Panel ID="Panel1" runat="server" Margin="5px" BodyPadding="5px" Title="特岗证书" Layout="HBox" ShowHeader="false" ColumnWidth="70% 30%">
<Items >
<f:Grid ID="Grid1" Title="特岗证书" ShowHeader="false" EnableCollapse="true" PageSize="10" EnableColumnLines="true"
ShowBorder="true" AllowPaging="true" IsDatabasePaging="true" runat="server" Width="750px" ForceFit="true"
ShowBorder="true" AllowPaging="true" IsDatabasePaging="true" runat="server" Width="750px"
DataKeyNames="CertificateId" DataIDField="CertificateId" OnPageIndexChange="Grid1_PageIndexChange"
AllowFilters="true" OnFilterChange="Grid1_FilterChange" EnableTextSelection="True">
<Columns>
<f:RowNumberField EnablePagingNumber="true" HeaderText="序号" Width="50px" HeaderTextAlign="Center"
TextAlign="Center" />
<f:RenderField Width="150px" ColumnID="CertificateCode" DataField="CertificateCode"
FieldType="String" HeaderText="证书编号" HeaderTextAlign="Center" TextAlign="Center">
<f:RenderField Width="80px" ColumnID="CertificateCode" DataField="CertificateCode"
FieldType="String" HeaderText="编号" HeaderTextAlign="Center" TextAlign="Center">
</f:RenderField>
<f:RenderField Width="250px" ColumnID="CertificateName" DataField="CertificateName"
FieldType="String" HeaderText="证书名称" HeaderTextAlign="Center" TextAlign="Left">
<f:RenderField Width="200px" ColumnID="CertificateName" DataField="CertificateName"
FieldType="String" HeaderText="名称" HeaderTextAlign="Center" TextAlign="Left">
</f:RenderField>
<f:RenderField Width="100px" ColumnID="CertificateType" DataField="CertificateType" FieldType="String"
HeaderText="证件类别" HeaderTextAlign="Center" TextAlign="Center">
@@ -43,8 +43,13 @@
RendererFunction="renderIsHsse" HeaderText="注安师" HeaderTextAlign="Center"
TextAlign="Center">
</f:RenderField>
<f:RenderField Width="250px" ColumnID="Remark" DataField="Remark" FieldType="String"
HeaderText="备注" HeaderTextAlign="Center" TextAlign="Center">
<f:TemplateField Width="120px" HeaderText="类型" HeaderTextAlign="Center" TextAlign="Center">
<ItemTemplate>
<asp:Label ID="Label1" runat="server" Text='<%# ConvertType(Eval("Type")) %>'></asp:Label>
</ItemTemplate>
</f:TemplateField>
<f:RenderField Width="150px" ColumnID="Remark" DataField="Remark" FieldType="String"
HeaderText="备注" HeaderTextAlign="Center" TextAlign="Center" ExpandUnusedSpace="true">
</f:RenderField>
</Columns>
<Listeners>
@@ -62,7 +67,7 @@
</PageItems>
</f:Grid>
<f:SimpleForm ID="SimpleForm1" runat="server" ShowBorder="true" ShowHeader="false"
LabelWidth="80px" BodyPadding="5px" Width="350px">
LabelWidth="110px" BodyPadding="5px" Width="450px" >
<Items>
<f:TextBox ID="hfFormID" Hidden="true"
runat="server" LabelAlign="right">
@@ -73,14 +78,15 @@
<f:TextBox ID="txtCertificateName" Label="名称" ShowRedStar="true" Required="true"
runat="server" LabelAlign="right" AutoPostBack="true" OnTextChanged="TextBox_TextChanged">
</f:TextBox>
<f:DropDownList ID="drpCertificateType" runat="server" Label="证件类别" LabelAlign="Right"
LabelWidth="80px">
<f:DropDownList ID="drpCertificateType" runat="server" Label="类别(ABC)" LabelAlign="Right">
<f:ListItem Value="A" Text="A类" />
<f:ListItem Value="B" Text="B类" />
<f:ListItem Value="C" Text="C类" />
</f:DropDownList>
<f:CheckBox ID="ckbIsRegisterHSSE" runat="server" Label="注安师" LabelAlign="Right" LabelWidth="80px">
</f:DropDownList>
<f:CheckBox ID="ckbIsRegisterHSSE" runat="server" Label="注安师" LabelAlign="Right" >
</f:CheckBox>
<f:DropDownList ID="drpType" runat="server" Label="类型" LabelAlign="Right">
</f:DropDownList>
<f:TextArea ID="txtRemark" runat="server" Label="备注" LabelAlign="right">
</f:TextArea>
</Items>
@@ -141,6 +147,8 @@
var txtNameClientID = '<%= txtCertificateName.ClientID %>';
var drpCertificateTypeClientID = '<%= drpCertificateType.ClientID %>';
var ckbIsRegisterHSSEClientID = '<%= ckbIsRegisterHSSE.ClientID %>';
var drpTypeClientID = '<%= drpType.ClientID %>';
var txtRemarkClientID = '<%=txtRemark.ClientID %>';
function onGridRowSelect(event, rowId) {
@@ -158,6 +166,7 @@
F(txtNameClientID).setValue(rowValue['CertificateName']);
F(drpCertificateTypeClientID).setValue(rowValue['CertificateType']);
F(ckbIsRegisterHSSEClientID).setValue(rowValue['IsRegisterHSSE']);
F(drpTypeClientID).setValue(rowValue['Type']);
F(txtRemarkClientID).setValue(rowValue['Remark']);
// 更新保存按钮文本
SGGL/FineUIPro.Web/BaseInfo/Certificate.aspx.cs
+31 -1
View File
@@ -24,6 +24,7 @@ namespace FineUIPro.Web.BaseInfo
this.GetButtonPower();
Funs.DropDownPageSize(this.ddlPageSize);
Funs.FineUIPleaseSelect(this.drpCertificateType);
BLL.DropListService.InitConstDropDownList(this.drpType, DropListService.Group_CertificateType, true);
ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
// 绑定表格
BindGrid();
@@ -190,6 +191,10 @@ namespace FineUIPro.Web.BaseInfo
{
this.ckbIsRegisterHSSE.Checked = true;
}
if (!string.IsNullOrEmpty(certificate.Type))
{
this.drpType.SelectedValue = certificate.Type;
}
this.txtRemark.Text = certificate.Remark;
hfFormID.Text = Id;
this.btnDelete.Enabled = true;
@@ -219,9 +224,13 @@ namespace FineUIPro.Web.BaseInfo
{
certificate.CertificateType = this.drpCertificateType.SelectedValue;
}
if (this.drpType.SelectedValue != BLL.Const._Null)
{
certificate.Type = this.drpType.SelectedValue;
}
if (string.IsNullOrEmpty(strRowID))
{
certificate.CertificateId = SQLHelper.GetNewID(typeof(Model.Base_Certificate));
certificate.CertificateId = SQLHelper.GetNewID();
BLL.CertificateService.AddCertificate(certificate);
BLL.LogService.AddSys_Log(this.CurrUser, certificate.CertificateCode, certificate.CertificateId, BLL.Const.CertificateMenuId, BLL.Const.BtnAdd);
}
@@ -302,5 +311,26 @@ namespace FineUIPro.Web.BaseInfo
}
}
#endregion
#region 根据身份证号码获取年龄
/// <summary>
/// 根据身份证号码获取年龄
/// </summary>
/// <param name="IdentityCard"></param>
/// <returns></returns>
protected string ConvertType(object Type)
{
string name = string.Empty;
if (Type != null)
{
var doplist = DropListService.HSSE_getCertificateType().FirstOrDefault(x => x.Value == Type.ToString());
if (doplist != null)
{
name = doplist.Text;
}
}
return name;
}
#endregion
}
}
SGGL/FineUIPro.Web/BaseInfo/Certificate.aspx.designer.cs
Generated
+46 -26
View File
@@ -7,11 +7,13 @@
// </自动生成>
//------------------------------------------------------------------------------
namespace FineUIPro.Web.BaseInfo {
public partial class Certificate {
namespace FineUIPro.Web.BaseInfo
{
public partial class Certificate
{
/// <summary>
/// form1 控件。
/// </summary>
@@ -20,7 +22,7 @@ namespace FineUIPro.Web.BaseInfo {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlForm form1;
/// <summary>
/// PageManager1 控件。
/// </summary>
@@ -29,7 +31,7 @@ namespace FineUIPro.Web.BaseInfo {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.PageManager PageManager1;
/// <summary>
/// Panel1 控件。
/// </summary>
@@ -38,7 +40,7 @@ namespace FineUIPro.Web.BaseInfo {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Panel Panel1;
/// <summary>
/// Grid1 控件。
/// </summary>
@@ -47,7 +49,16 @@ namespace FineUIPro.Web.BaseInfo {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Grid Grid1;
/// <summary>
/// Label1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.WebControls.Label Label1;
/// <summary>
/// ToolbarSeparator1 控件。
/// </summary>
@@ -56,7 +67,7 @@ namespace FineUIPro.Web.BaseInfo {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1;
/// <summary>
/// ToolbarText1 控件。
/// </summary>
@@ -65,7 +76,7 @@ namespace FineUIPro.Web.BaseInfo {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.ToolbarText ToolbarText1;
/// <summary>
/// ddlPageSize 控件。
/// </summary>
@@ -74,7 +85,7 @@ namespace FineUIPro.Web.BaseInfo {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList ddlPageSize;
/// <summary>
/// SimpleForm1 控件。
/// </summary>
@@ -83,7 +94,7 @@ namespace FineUIPro.Web.BaseInfo {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.SimpleForm SimpleForm1;
/// <summary>
/// hfFormID 控件。
/// </summary>
@@ -92,7 +103,7 @@ namespace FineUIPro.Web.BaseInfo {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox hfFormID;
/// <summary>
/// txtCertificateCode 控件。
/// </summary>
@@ -101,7 +112,7 @@ namespace FineUIPro.Web.BaseInfo {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtCertificateCode;
/// <summary>
/// txtCertificateName 控件。
/// </summary>
@@ -110,7 +121,7 @@ namespace FineUIPro.Web.BaseInfo {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtCertificateName;
/// <summary>
/// drpCertificateType 控件。
/// </summary>
@@ -119,7 +130,7 @@ namespace FineUIPro.Web.BaseInfo {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpCertificateType;
/// <summary>
/// ckbIsRegisterHSSE 控件。
/// </summary>
@@ -128,7 +139,16 @@ namespace FineUIPro.Web.BaseInfo {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.CheckBox ckbIsRegisterHSSE;
/// <summary>
/// drpType 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpType;
/// <summary>
/// txtRemark 控件。
/// </summary>
@@ -137,7 +157,7 @@ namespace FineUIPro.Web.BaseInfo {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextArea txtRemark;
/// <summary>
/// Toolbar1 控件。
/// </summary>
@@ -146,7 +166,7 @@ namespace FineUIPro.Web.BaseInfo {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Toolbar Toolbar1;
/// <summary>
/// btnNew 控件。
/// </summary>
@@ -155,7 +175,7 @@ namespace FineUIPro.Web.BaseInfo {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnNew;
/// <summary>
/// btnDelete 控件。
/// </summary>
@@ -164,7 +184,7 @@ namespace FineUIPro.Web.BaseInfo {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnDelete;
/// <summary>
/// ToolbarFill1 控件。
/// </summary>
@@ -173,7 +193,7 @@ namespace FineUIPro.Web.BaseInfo {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.ToolbarFill ToolbarFill1;
/// <summary>
/// btnSave 控件。
/// </summary>
@@ -182,7 +202,7 @@ namespace FineUIPro.Web.BaseInfo {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnSave;
/// <summary>
/// Menu1 控件。
/// </summary>
@@ -191,7 +211,7 @@ namespace FineUIPro.Web.BaseInfo {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Menu Menu1;
/// <summary>
/// btnMenuEdit 控件。
/// </summary>
@@ -200,7 +220,7 @@ namespace FineUIPro.Web.BaseInfo {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.MenuButton btnMenuEdit;
/// <summary>
/// btnMenuDelete 控件。
/// </summary>
SGGL/FineUIPro.Web/FineUIPro.Web.csproj
+1 -1
View File
@@ -13954,7 +13954,7 @@
<AutoAssignPort>True</AutoAssignPort>
<DevelopmentServerPort>0</DevelopmentServerPort>
<DevelopmentServerVPath>/</DevelopmentServerVPath>
<IISUrl>http://localhost:6562/</IISUrl>
<IISUrl>http://localhost:12528/</IISUrl>
<NTLMAuthentication>False</NTLMAuthentication>
<UseCustomServer>False</UseCustomServer>
<CustomServerUrl>
SGGL/FineUIPro.Web/HSSE/InformationProject/ConstructionStandardIdentifyEdit.aspx
+6 -6
View File
@@ -10,7 +10,7 @@
<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" />
</head>
<body>
<form id="form1" runat="server">
@@ -37,9 +37,9 @@
</f:CheckBox>
</Items>
</f:Toolbar>
<f:Toolbar ID="Toolbar1" Position="Top" runat="server" >
<f:Toolbar ID="Toolbar1" Position="Top" runat="server">
<Items>
<f:TextBox ID="txtConstructionStandardIdentifyCode" runat="server" Label="编号" LabelAlign="Right"
<f:TextBox ID="txtConstructionStandardIdentifyCode" runat="server" Label="编号" LabelAlign="Right"
MaxLength="30" Readonly="true" Width="400px">
</f:TextBox>
<f:TextBox ID="txtRemark" runat="server" Label="备注" LabelAlign="Right" MaxLength="150" Width="400px">
@@ -49,10 +49,10 @@
</Toolbars>
<Items>
<f:Grid ID="Grid1" ShowBorder="false" ShowHeader="false" Title="标准规范辨识" EnableCollapse="true"
IsDatabasePaging="true" PageSize="10" AllowPaging="true" runat="server" BoxFlex="1"
DataKeyNames="StandardId" DataIDField="StandardId" AllowCellEditing="true"
IsDatabasePaging="true" PageSize="20" AllowPaging="true" runat="server" BoxFlex="1"
DataKeyNames="StandardId" DataIDField="StandardId" AllowCellEditing="true"
OnPageIndexChange="Grid1_PageIndexChange" EnableTextSelection="true"
EnableColumnLines="true" EnableCheckBoxSelect="true">
EnableColumnLines="true" EnableCheckBoxSelect="true">
<Columns>
<f:RenderField Width="100px" ColumnID="StandardGrade" DataField="StandardGrade" FieldType="String"
HeaderText="标准级别" HeaderTextAlign="Center" TextAlign="Left">
SGGL/FineUIPro.Web/HSSE/InformationProject/ConstructionStandardIdentifyEdit.aspx.cs
+48 -5
View File
@@ -143,13 +143,56 @@ namespace FineUIPro.Web.HSSE.InformationProject
/// </summary>
private void BindGrid()
{
var q = from x in Funs.DB.View_InformationProject_ConstructionStandardSelectedItem
where x.StandardName != null
select x;
if (!this.ckbAll.Checked)
IQueryable<Model.View_InformationProject_ConstructionStandardSelectedItem> q;
if (this.ckbAll.Checked)
{
q = q.Where(e => e.ConstructionStandardIdentifyId == this.ConstructionStandardIdentifyId);
q = from x in Funs.DB.Law_HSSEStandardsList
join y in Funs.DB.InformationProject_ConstructionStandardSelectedItem on x.StandardId equals y.StandardId
join z in Funs.DB.InformationProject_ConstructionStandardIdentify on y.ConstructionStandardIdentifyId equals z.ConstructionStandardIdentifyId
where x.StandardName != null && z.ProjectId == this.CurrUser.LoginProjectId
select new Model.View_InformationProject_ConstructionStandardSelectedItem
{
ConstructionStandardSelectedItemId =y.ConstructionStandardSelectedItemId,
ConstructionStandardIdentifyId = y.ConstructionStandardIdentifyId,
ProjectId = this.CurrUser.LoginProjectId,
StandardId = x.StandardId,
StandardGrade = x.StandardGrade,
StandardNo = x.StandardNo,
StandardName = x.StandardName,
AttachUrl = x.AttachUrl,
IsSelected1 = x.IsSelected1,
IsSelected2 = x.IsSelected2,
IsSelected3 = x.IsSelected3,
IsSelected4 = x.IsSelected4,
IsSelected5 = x.IsSelected5,
IsSelected6 = x.IsSelected6,
IsSelected7 = x.IsSelected7,
IsSelected8 = x.IsSelected8,
IsSelected9 = x.IsSelected9,
IsSelected10 = x.IsSelected10,
IsSelected11 = x.IsSelected11,
IsSelected12 = x.IsSelected12,
IsSelected13 = x.IsSelected13,
IsSelected14 = x.IsSelected14,
IsSelected15 = x.IsSelected15,
IsSelected16 = x.IsSelected16,
IsSelected17 = x.IsSelected17,
IsSelected18 = x.IsSelected18,
IsSelected19 = x.IsSelected19,
IsSelected20 = x.IsSelected20,
IsSelected21 = x.IsSelected21,
IsSelected22 = x.IsSelected22,
IsSelected23 = x.IsSelected23,
IsSelected90 = x.IsSelected90
};
}
else
{
q = from x in Funs.DB.View_InformationProject_ConstructionStandardSelectedItem
where x.ConstructionStandardIdentifyId == this.ConstructionStandardIdentifyId
select x;
}
if (!string.IsNullOrEmpty(this.txtStandardGrade.Text.Trim()))
{
q = q.Where(e => e.StandardGrade.Contains(this.txtStandardGrade.Text.Trim()));
SGGL/FineUIPro.Web/Person/PersonEdit.aspx.cs
+2 -5
View File
@@ -916,11 +916,8 @@ namespace FineUIPro.Web.Person
left join Base_Project P on C.ProjectId=P.ProjectId
where 1=1 ";
List<SqlParameter> listStr = new List<SqlParameter>();
if (this.CurrUser.PersonId != BLL.Const.sysglyId && this.CurrUser.PersonId != BLL.Const.hfnbdId)
{
strSql += " AND C.UserId=@UserId ";
listStr.Add(new SqlParameter("@UserId", this.PersonId));
}
strSql += " AND C.UserId=@UserId ";
listStr.Add(new SqlParameter("@UserId", this.PersonId ?? ""));
SqlParameter[] parameter = listStr.ToArray();
DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);