From 917136c1a266b4f17b2890eca24957003e750823 Mon Sep 17 00:00:00 2001
From: ndbs <nabs@LAPTOP-FJ5VQJ6J>
Date: Wed, 27 Jul 2022 10:34:13 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E5=BB=BA=E7=AB=8B=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E7=BB=93=E6=9D=9F=E6=97=B6=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Views/PM_Resume/Form.cshtml               | 26 +++++++++++--------
 .../Views/PM_Resume/Index.js                  |  3 ++-
 .../PM_Resume/PM_ResumeEntity.cs              |  7 ++++-
 3 files changed, 23 insertions(+), 13 deletions(-)

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";
 }
 <div class="lr-form-wrap">
-    <div class="col-xs-12 lr-form-item"  data-table="PM_Resume" >
+    <div class="col-xs-6 lr-form-item" data-table="PM_Resume">
         <div class="lr-form-item-title">时间<font face="宋体">*</font></div>
-        <input id="RTime" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ dateFmt:'yyyy-MM-dd HH:mm',onpicked: function () { $('#RTime').trigger('change'); } })"  isvalid="yes" checkexpession="NotNull" />
+        <input id="RTime" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ dateFmt:'yyyy-MM-dd HH:mm',onpicked: function () { $('#RTime').trigger('change'); } })" isvalid="yes" checkexpession="NotNull" />
     </div>
-    <div class="col-xs-12 lr-form-item"  data-table="PM_Resume" >
+    <div class="col-xs-6 lr-form-item" data-table="PM_Resume">
+        <div class="lr-form-item-title">时间<font face="宋体">*</font></div>
+        <input id="ETime" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ dateFmt:'yyyy-MM-dd HH:mm',onpicked: function () { $('#RTime').trigger('change'); } })" isvalid="yes" checkexpession="NotNull" />
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="PM_Resume">
         <div class="lr-form-item-title">工作单位<font face="宋体">*</font></div>
         <input id="UnitName" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
     </div>
-    <div class="col-xs-12 lr-form-item"  data-table="PM_Resume" >
+    <div class="col-xs-12 lr-form-item" data-table="PM_Resume">
         <div class="lr-form-item-title">证明人</div>
-        <input id="Witness" type="text" class="form-control"  />
+        <input id="Witness" type="text" class="form-control" />
     </div>
-    <div class="col-xs-12 lr-form-item"  data-table="PM_Resume" >
+    <div class="col-xs-12 lr-form-item" data-table="PM_Resume">
         <div class="lr-form-item-title">部门</div>
-        <input id="DepartmentID" type="text" class="form-control"  />
+        <input id="DepartmentID" type="text" class="form-control" />
     </div>
-    <div class="col-xs-12 lr-form-item"  data-table="PM_Resume" >
+    <div class="col-xs-12 lr-form-item" data-table="PM_Resume">
         <div class="lr-form-item-title">岗位</div>
-        <input id="PostID" type="text" class="form-control"  />
+        <input id="PostID" type="text" class="form-control" />
     </div>
-    <div class="col-xs-12 lr-form-item"  data-table="PM_Resume" >
+    <div class="col-xs-12 lr-form-item" data-table="PM_Resume">
         <div class="lr-form-item-title">工作描述</div>
-        <textarea id="Describe" class="form-control" style="height:100px;"  ></textarea>
+        <textarea id="Describe" class="form-control" style="height:100px;"></textarea>
     </div>
 </div>
 @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
     /// 描 述：工作简历
     /// </summary>
-    public class PM_ResumeEntity 
+    public class PM_ResumeEntity
     {
         #region  实体成员
         /// <summary>
@@ -30,6 +30,11 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         [Column("RTIME")]
         public DateTime? RTime { get; set; }
         /// <summary>
+        /// 结束时间
+        /// </summary>
+        [Column("ETIME")]
+        public DateTime? Etime { get; set; }
+        /// <summary>
         /// 工作单位
         /// </summary>
         [Column("UNITNAME")]