diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/PM_Resume/Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/PM_Resume/Form.cshtml index 600f31733..98e4ab6f1 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/PM_Resume/Form.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/PM_Resume/Form.cshtml @@ -3,29 +3,33 @@ Layout = "~/Views/Shared/_Form.cshtml"; }
-
+
时间*
- +
-
+
+
时间*
+ +
+
工作单位*
-
+
证明人
- +
-
+
部门
- +
-
+
岗位
- +
-
+
工作描述
- +
@Html.AppendJsFile("/Areas/EducationalAdministration/Views/PM_Resume/Form.js") diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/PM_Resume/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/PM_Resume/Index.js index bcfcf00a8..f16ccd845 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/PM_Resume/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/PM_Resume/Index.js @@ -115,7 +115,8 @@ var bootstrap = function ($, learun) { $('#gridtable').lrAuthorizeJfGrid({ url: top.$.rootUrl + '/EducationalAdministration/PM_Resume/GetPageList', headData: [ - { label: "时间", name: "RTime", width: 130, align: "left" }, + { label: "开始时间", name: "RTime", width: 130, align: "left" }, + { label: "结束时间", name: "ETime", width: 130, align: "left" }, { label: "工作单位", name: "UnitName", width: 100, align: "left" }, { label: "证明人", name: "Witness", width: 100, align: "left" }, { label: "部门", name: "DepartmentID", width: 100, align: "left" }, diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/PM_Resume/PM_ResumeEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/PM_Resume/PM_ResumeEntity.cs index 8d8b7bb06..b9aa0db1c 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/PM_Resume/PM_ResumeEntity.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/PM_Resume/PM_ResumeEntity.cs @@ -11,7 +11,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration /// 日 期:2020-03-30 14:11 /// 描 述:工作简历 /// - public class PM_ResumeEntity + public class PM_ResumeEntity { #region 实体成员 /// @@ -30,6 +30,11 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration [Column("RTIME")] public DateTime? RTime { get; set; } /// + /// 结束时间 + /// + [Column("ETIME")] + public DateTime? Etime { get; set; } + /// /// 工作单位 /// [Column("UNITNAME")]