diff --git a/SGGL/BLL/Common/Const.cs b/SGGL/BLL/Common/Const.cs index 6ac39088..47d4a320 100644 --- a/SGGL/BLL/Common/Const.cs +++ b/SGGL/BLL/Common/Const.cs @@ -3774,6 +3774,10 @@ namespace BLL /// public const string TrainRecordTemplateUrl = "File\\Excel\\DataIn\\人员培训导入模板.xls"; /// + /// 公司教材库模板文件原始的虚拟路径 + /// + public const string CompanyTrainingTemplateUrl = "File\\Excel\\DataIn\\公司教材库导入模板.xls"; + /// /// 考试试题模版文件原始的虚拟路径 /// public const string TestTrainingTemplateUrl = "File\\Excel\\DataIn\\考试试题模版.xls"; diff --git a/SGGL/FineUIPro.Web/File/Excel/DataIn/公司教材库导入模板.xls b/SGGL/FineUIPro.Web/File/Excel/DataIn/公司教材库导入模板.xls new file mode 100644 index 00000000..595b822e Binary files /dev/null and b/SGGL/FineUIPro.Web/File/Excel/DataIn/公司教材库导入模板.xls differ diff --git a/SGGL/FineUIPro.Web/File/Excel/DataIn/考试试题模版.xls b/SGGL/FineUIPro.Web/File/Excel/DataIn/考试试题模版.xls index 344bacfd..292ce150 100644 Binary files a/SGGL/FineUIPro.Web/File/Excel/DataIn/考试试题模版.xls and b/SGGL/FineUIPro.Web/File/Excel/DataIn/考试试题模版.xls differ diff --git a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj index b4342684..9cd54837 100644 --- a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj +++ b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj @@ -1853,6 +1853,7 @@ + @@ -12683,6 +12684,13 @@ TaskNoticeEdit.aspx + + CompanyTrainingItemIn.aspx + ASPXCodeBehind + + + CompanyTrainingItemIn.aspx + TrainFindWorkPost.aspx ASPXCodeBehind diff --git a/SGGL/FineUIPro.Web/HSSE/EduTrain/CompanyTraining.aspx b/SGGL/FineUIPro.Web/HSSE/EduTrain/CompanyTraining.aspx index 97cebd14..a896d47c 100644 --- a/SGGL/FineUIPro.Web/HSSE/EduTrain/CompanyTraining.aspx +++ b/SGGL/FineUIPro.Web/HSSE/EduTrain/CompanyTraining.aspx @@ -63,6 +63,9 @@ + @@ -137,6 +140,10 @@ Target="Parent" EnableResize="false" runat="server" OnClose="Window2_Close" IsModal="true" Width="700px" Height="600px"> +