diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/TalentsJoinInfo/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/TalentsJoinInfo/Index.js index 72bcf4699..ce2e79e01 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/TalentsJoinInfo/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/TalentsJoinInfo/Index.js @@ -84,9 +84,13 @@ var bootstrap = function ($, learun) { }, { label: "民族", name: "Nationality", width: 100, align: "left"}, { label: "文化程度", name: "CultureDegree", width: 100, align: "left"}, - { label: "婚姻状况", name: "Marriage", width: 100, align: "left"}, - { label: "毕业院校", name: "WilliamsSchool", width: 100, align: "left"}, - { label: "所学专业", name: "Major", width: 100, align: "left"}, + { label: "婚姻状况", name: "Marriage", width: 100, align: "left" }, + { label: "第一学历毕业院校", name: "WilliamsSchool", width: 100, align: "left" }, + { label: "第一学历专业", name: "Major", width: 100, align: "left" }, + { label: "硕士毕业院校", name: "MasterSchool", width: 100, align: "left" }, + { label: "硕士专业", name: "MasterMajor", width: 100, align: "left" }, + { label: "博士毕业院校", name: "DoctorSchool", width: 100, align: "left"}, + { label: "博士专业", name: "DoctorMajor", width: 100, align: "left"}, { label: "毕业时间", name: "GraduateTime", width: 100, align: "left", }, @@ -107,7 +111,34 @@ var bootstrap = function ($, learun) { { label: "联系电话", name: "Phone", width: 100, align: "left"}, { label: "手机", name: "Mobile", width: 100, align: "left" }, { label: "邮箱", name: "Email", width: 100, align: "left" }, - { label: "简历", name: "Resume", width: 100, align: "left"}, + { label: "简历", name: "Resume", width: 100, align: "left" }, + { + label: "附件", name: "FilePath", width: 500, align: "center", + formatterAsync: function (callback, value, row, op, $cell) { + $.ajax({ + url: '/LR_SystemModule/Annexes/GetAnnexesFileList', + data: { folderId: value }, + type: 'GET', + dataType: "json", + async: false, + cache: false, + success: function (res) { + var bb = ''; + //$.each(res.data, function (i, item) { + // bb += item.F_FileName.substring(0, item.F_FileName.indexOf(".")) + ',' + //}) + $.each(res.data, function (i, item) { + bb += '' + + item.F_FileName.substring(0, item.F_FileName.indexOf(".")) + + ',   '; + }) + callback(bb); + } + }); + } + }, ], mainId:'ID', isPage: true @@ -124,3 +155,11 @@ var bootstrap = function ($, learun) { }; page.init(); } +function downLoad(fileId, fileTwo) { + if (fileTwo) { + top.learun.postFormSilence(top.$.rootUrl + '/PersonnelManagement/MP_QualityObjectives/AddRecord', { fileId: fileTwo }, function () { + + }); + } + top.learun.download({ url: top.$.rootUrl + '/LR_SystemModule/Annexes/DownAnnexesFile', param: { fileId: fileId, __RequestVerificationToken: $.lrToken }, method: 'POST' }); +} \ No newline at end of file diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/TalentsJoinInfo/TalentsJoinInfoEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/TalentsJoinInfo/TalentsJoinInfoEntity.cs index b7737d0c2..580cefebd 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/TalentsJoinInfo/TalentsJoinInfoEntity.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/TalentsJoinInfo/TalentsJoinInfoEntity.cs @@ -159,6 +159,26 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration /// [Column("FILEPATH")] public string FilePath { get; set; } + /// + /// FilePath + /// + [Column("MasterSchool")] + public string MasterSchool { get; set; } + /// + /// FilePath + /// + [Column("MasterMajor")] + public string MasterMajor { get; set; } + /// + /// FilePath + /// + [Column("FILEPATH")] + public string DoctorSchool { get; set; } + /// + /// FilePath + /// + [Column("FILEPATH")] + public string DoctorMajor { get; set; } #endregion #region 扩展操作