zhanghj/ChengDa_English
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改培训人员添加以及增加培训记录页面

Browse Source
This commit is contained in:
潘鸿锋
2024-04-03 11:12:45 +08:00
parent 0b081ea38f
commit 9235b5e078
23 changed files with 1656 additions and 585 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/FineUIPro.Web/HSSE/SitePerson/PersonList.aspx
+1 -1
View File
@@ -165,7 +165,7 @@
</f:Panel>
<f:Window ID="Window1" Title="编辑人员信息" Hidden="true" EnableIFrame="true" EnableMaximize="true"
Target="Parent" EnableResize="false" runat="server" OnClose="Window1_Close" IsModal="true"
Width="1000px" Height="700px">
Width="1000px" Height="800px">
</f:Window>
<f:Window ID="Window2" Title="导入人员信息" Hidden="true" EnableIFrame="true" EnableMaximize="true"
Target="Parent" EnableResize="false" runat="server" OnClose="Window2_Close" IsModal="true"
SGGL/FineUIPro.Web/HSSE/SitePerson/PersonListEdit.aspx
+33 -19
View File
@@ -57,7 +57,7 @@
</f:Toolbar>
</Toolbars>
<Items>
<f:TabStrip ID="TabStrip1" CssClass="f-tabstrip-theme-simple" Height="580px" ShowBorder="true"
<f:TabStrip ID="TabStrip1" CssClass="f-tabstrip-theme-simple" Height="650px" ShowBorder="true"
TabPosition="Top" MarginBottom="5px" EnableTabCloseMenu="false" runat="server"
ActiveTabIndex="0">
<Tabs>
@@ -99,6 +99,13 @@
</f:RadioButtonList>
<f:DatePicker ID="txtIdcardEndDate" runat="server" Label="安全/特种作业证书有效日期" LabelAlign="Right" LabelWidth="110px">
</f:DatePicker>
<%--新增--%>
<f:DatePicker ID="txtCertificateLimitTime" runat="server" Label="特岗证书有效期" LabelAlign="Right" >
</f:DatePicker>
<f:DatePicker ID="txtOutTime" runat="server" Label="出场时间" LabelAlign="Right">
</f:DatePicker>
</Items>
</f:Panel>
<f:Panel ID="Panel4" runat="server" BoxFlex="3" ShowBorder="false" ShowHeader="false"
@@ -108,7 +115,7 @@
LabelAlign="Right" AutoPostBack="true" OnTextChanged="TextBox_TextChanged">
</f:TextBox>
<f:Button runat="server" ID="btnReadIdentityCard" Icon="Vcard" OnClick="btnReadIdentityCard_Click"
Text="读取证件" MarginLeft="90px" Hidden="true">
Text="读取证件" MarginLeft="90px" Hidden="true" >
</f:Button>
<f:RadioButtonList ID="rblSex" runat="server" Label="性别" LabelAlign="Right" Required="True" ShowRedStar="True">
<f:RadioItem Value="1" Text="男" Selected="true" />
@@ -128,9 +135,24 @@
<f:DatePicker ID="txtAuditorDate" runat="server" Label="审核时间" LabelAlign="Right" >
</f:DatePicker>
<f:CheckBox runat="server" ID="ckIsOutside" Label="外聘" LabelAlign="Right"></f:CheckBox>
<f:CheckBox runat="server" ID="ckIsOutside" Label="外聘" LabelAlign="Right" CssStyle="margin-bottom:15px"></f:CheckBox>
<%--新增--%>
<f:DropDownList ID="drpCertificate" runat="server" Label="特岗证书" LabelAlign="Right" EnableEdit="true" CssStyle="margin-bottom:15px">
</f:DropDownList>
<f:TextBox ID="txtCertificateCode" runat="server" Label="证书编号" LabelAlign="Right" MaxLength="20" CssStyle="margin-bottom:20px">
</f:TextBox>
<f:RadioButtonList ID="rblIsCardUsed" runat="server" Label="考勤卡启用" CssStyle="margin-bottom:15px"
LabelAlign="Right" Required="True">
<f:RadioItem Value="True" Text="是" />
<f:RadioItem Value="False" Text="否" />
</f:RadioButtonList>
<f:TextBox ID="txtOutResult" runat="server" Label="出场原因" LabelAlign="Right" MaxLength="50">
</f:TextBox>
</Items>
</f:Panel>
<f:Panel ID="Panel5" Title="面板1" BoxFlex="2" runat="server" ShowBorder="false" ShowHeader="false"
@@ -149,8 +171,10 @@
</f:Panel>
</Items>
</f:Tab>
<f:Tab ID="Tab2" Title="详细信息" BodyPadding="5px" Layout="VBox" IconFont="Bookmark" runat="server">
<f:Tab ID="Tab2" Title="详细信息" BodyPadding="5px" Layout="VBox" IconFont="Bookmark" runat="server" Hidden="true">
<Items>
<f:Form ID="Form7" ShowBorder="false" ShowHeader="false" runat="server" LabelWidth="100px">
<Rows>
@@ -188,35 +212,25 @@
</f:FormRow>
<f:FormRow>
<Items>
<f:DropDownList ID="drpCertificate" runat="server" Label="特岗证书" LabelAlign="Right" EnableEdit="true">
</f:DropDownList>
<f:TextBox ID="txtCertificateCode" runat="server" Label="证书编号" LabelAlign="Right" MaxLength="20">
</f:TextBox>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:DatePicker ID="txtCertificateLimitTime" runat="server" Label="证书有效期" LabelAlign="Right" >
</f:DatePicker>
<f:RadioButtonList ID="rblIsCardUsed" runat="server" Label="考勤卡启用"
LabelAlign="Right" Required="True">
<f:RadioItem Value="True" Text="是" />
<f:RadioItem Value="False" Text="否" />
</f:RadioButtonList>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:TextBox ID="txtAddress" runat="server" Label="家庭地址" MaxLength="500" LabelAlign="Right" >
</f:TextBox>
<f:DatePicker ID="txtOutTime" runat="server" Label="出场时间" LabelAlign="Right">
</f:DatePicker>
</Items>
</f:FormRow>
<f:FormRow ColumnWidths="100%">
<Items>
<f:TextBox ID="txtOutResult" runat="server" Label="出场原因" LabelAlign="Right" MaxLength="50">
</f:TextBox>
</Items>
</f:FormRow>
</Rows>
SGGL/FineUIPro.Web/HSSE/SitePerson/PersonListEdit.aspx.designer.cs
Generated
+483 -483
View File
File diff suppressed because it is too large Load Diff