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

修改公司级培训

Browse Source
This commit is contained in:
潘鸿锋
2024-11-20 17:47:24 +08:00
parent f4e6755b17
commit 70ff1350bb
25 changed files with 3546 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/FineUIPro.Web/ErrLog.txt
+6
View File
@@ -1224,3 +1224,9 @@ IP地址:::1
通用定时器结束!
环境数据同步开始!
环境数据同步结束!
环境数据同步开始!
环境数据同步结束!
通用定时器开启!
启用环境定时器开始!
启用环境定时器结束!
通用定时器结束!
SGGL/FineUIPro.Web/HSSE/EduTrain/CompanyTraining.aspx
+1 -1
View File
@@ -40,7 +40,7 @@
<Items>
<f:Grid ID="Grid1" Width="850px" ShowBorder="true" ShowHeader="false" EnableCollapse="true" ForceFit="true"
runat="server" BoxFlex="1" DataKeyNames="CompanyTrainingItemIdNum" DataIDField="CompanyTrainingItemIdNum"
AllowSorting="true" SortField="CompanyTrainingItemCode" OnRowCommand="Grid1_RowCommand"
AllowSorting="true" SortField="CompileDate" OnRowCommand="Grid1_RowCommand"
SortDirection="DESC" OnSort="Grid1_Sort" AllowPaging="true" IsDatabasePaging="true"
PageSize="10" OnPageIndexChange="Grid1_PageIndexChange" EnableRowDoubleClickEvent="true"
OnRowDoubleClick="Grid1_RowDoubleClick" EnableTextSelection="True" EnableColumnLines="true">
SGGL/FineUIPro.Web/HSSE/EduTrain/CompanyTrainingItemSave.aspx
+4 -2
View File
@@ -41,12 +41,14 @@
</f:FormRow>
<f:FormRow>
<Items>
<f:NumberBox ID="txtLearningTime" Label="时长（分钟）" runat="server" DecimalPrecision="0" NoDecimal="true" NoNegative="true" ></f:NumberBox>
<f:NumberBox ID="txtLearningTime" Label="时长（分钟）" Required="true"
ShowRedStar="true" runat="server" DecimalPrecision="0" NoDecimal="true" NoNegative="true" ></f:NumberBox>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:DropDownBox runat="server" ID="ddTestTraining" Label="考试题库" EnableMultiSelect="true" CustomData="true">
<f:DropDownBox runat="server" ID="ddTestTraining" Required="true"
ShowRedStar="true" Label="考试题库" EnableMultiSelect="true" CustomData="true">
<PopPanel>
<f:Tree ID="treeTestTraining" ShowHeader="false" Hidden="true" runat="server" EnableCheckBox="true" CascadeCheck="true">
SGGL/FineUIPro.Web/Person/EduTrain/TestRecord.aspx
+1 -1
View File
@@ -123,7 +123,7 @@
<f:MenuButton ID="btnMenuView" OnClick="btnMenuView_Click" EnablePostBack="true"
runat="server" Text="查看" Icon="Find">
</f:MenuButton>
<f:MenuButton ID="btnPrinter" EnablePostBack="true" runat="server"
<f:MenuButton ID="btnPrinter" EnablePostBack="true" runat="server" Hidden="true"
Text="导出" Icon="Printer" OnClick="btnPrint_Click" EnableAjax="false" DisableControlBeforePostBack="false">
</f:MenuButton>
<%--<f:MenuButton ID="btnFile" OnClick="btnMenuFile_Click" EnablePostBack="true"
SGGL/FineUIPro.Web/Person/EduTrain/TestRecord.aspx.cs
+1 -1
View File
@@ -56,7 +56,7 @@ namespace FineUIPro.Web.Person.EduTrain
LEFT JOIN dbo.Training_TestTraining AS Training ON Training.TrainingId = TestRecord.TestType
LEFT JOIN dbo.Sys_User AS Person ON Person.UserId = TestRecord.TestManId
LEFT JOIN dbo.Base_Unit AS Unit ON Person.UnitId=Unit.UnitId
WHERE (isFiled IS NULL OR isFiled = 0) and TestRecord.ProjectId is null ";
WHERE (isFiled IS NULL OR isFiled = 0) and (TestRecord.ProjectId is null or TestRecord.ProjectId='' ) ";
List<SqlParameter> listStr = new List<SqlParameter>();
if (!string.IsNullOrEmpty(this.txtName.Text.Trim()))
{