Merge branch '金隅分支' of http://123.57.209.16:3000/bjquanjiang/DigitalScholl into 金隅分支

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/PM_EducationExperience/Form.cshtml

@@ -3,37 +3,41 @@
     Layout = "~/Views/Shared/_Form.cshtml";
 }
 <div class="lr-form-wrap">
-    <div class="col-xs-12 lr-form-item"  data-table="PM_EducationExperience" >
-        <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 () { $('#ETime').trigger('change'); } })"  isvalid="yes" checkexpession="NotNull" />
+    <div class="col-xs-12 lr-form-item" data-table="PM_EducationExperience">
+        <div class="lr-form-item-title">开始时间<font face="宋体">*</font></div>
+        <input id="ESTime" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
     </div>
-    <div class="col-xs-12 lr-form-item"  data-table="PM_EducationExperience" >
+    <div class="col-xs-12 lr-form-item" data-table="PM_EducationExperience">
+        <div class="lr-form-item-title">结束时间<font face="宋体">*</font></div>
+        <input id="ETime" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="PM_EducationExperience">
         <div class="lr-form-item-title">学校<font face="宋体">*</font></div>
         <input id="School" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
     </div>
-    <div class="col-xs-12 lr-form-item"  data-table="PM_EducationExperience" >
+    <div class="col-xs-12 lr-form-item" data-table="PM_EducationExperience">
         <div class="lr-form-item-title">专业<font face="宋体">*</font></div>
         <input id="Major" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
     </div>
-    <div class="col-xs-12 lr-form-item"  data-table="PM_EducationExperience" >
+    <div class="col-xs-12 lr-form-item" data-table="PM_EducationExperience">
         <div class="lr-form-item-title">学历<font face="宋体">*</font></div>
-        <div id="Education" isvalid="yes" checkexpession="NotNull" ></div>
+        <div id="Education" isvalid="yes" checkexpession="NotNull"></div>
     </div>
-    <div class="col-xs-12 lr-form-item"  data-table="PM_EducationExperience" >
+    <div class="col-xs-12 lr-form-item" data-table="PM_EducationExperience">
         <div class="lr-form-item-title">学位</div>
-        <input id="AcademicDegree" type="text" class="form-control"  />
+        <input id="AcademicDegree" type="text" class="form-control" />
     </div>
-    <div class="col-xs-12 lr-form-item"  data-table="PM_EducationExperience" >
+    <div class="col-xs-12 lr-form-item" data-table="PM_EducationExperience">
         <div class="lr-form-item-title">学制</div>
-        <div id="EducationalSystem"  ></div>
+        <div id="EducationalSystem"></div>
     </div>
-    <div class="col-xs-12 lr-form-item"  data-table="PM_EducationExperience" >
+    <div class="col-xs-12 lr-form-item" data-table="PM_EducationExperience">
         <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 class="col-xs-12 lr-form-item"  data-table="PM_EducationExperience" >
+    <div class="col-xs-12 lr-form-item" data-table="PM_EducationExperience">
         <div class="lr-form-item-title">备注</div>
-        <textarea id="Remark" class="form-control" style="height:100px;"  ></textarea>
+        <textarea id="Remark" class="form-control" style="height:100px;"></textarea>
     </div>
 </div>
 @Html.AppendJsFile("/Areas/EducationalAdministration/Views/PM_EducationExperience/Form.js")

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/PM_EducationExperience/Index.js

@@ -111,10 +111,11 @@ var bootstrap = function ($, learun) {
         },
         // 初始化列表
         initGird: function () {
-            $('#gridtable').lrAuthorizeJfGrid({
+            $('#gridtable').jfGrid({
                 url: top.$.rootUrl + '/EducationalAdministration/PM_EducationExperience/GetPageList',
                 headData: [
-                    { label: "时间", name: "ETime", width: 130, align: "left" },
+                    { label: "开始时间", name: "ESTime", width: 130, align: "left" },
+                    { label: "结束时间", name: "ETime", width: 130, align: "left" },
                     { label: "学校", name: "School", width: 100, align: "left" },
                     { label: "专业", name: "Major", width: 100, align: "left" },
                     {

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/PM_Resume/Form.cshtml

@@ -4,8 +4,12 @@
 }
 <div class="lr-form-wrap">
     <div class="col-xs-12 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" />
+        <div class="lr-form-item-title">开始时间<font face="宋体">*</font></div>
+        <input id="RSTime" type="text" class="form-control "  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="RTime" type="text" class="form-control "  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>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/PM_Resume/Index.js

@@ -112,10 +112,11 @@ var bootstrap = function ($, learun) {
         },
         // 初始化列表
         initGird: function () {
-            $('#gridtable').lrAuthorizeJfGrid({
+            $('#gridtable').jfGrid({
                 url: top.$.rootUrl + '/EducationalAdministration/PM_Resume/GetPageList',
                 headData: [
-                    { label: "时间", name: "RTime", width: 130, align: "left" },
+                    { label: "开始时间", name: "RSTime", width: 130, align: "left" },
+                    { label: "结束时间", name: "RTime", 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" },

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/PM_EducationExperience/PM_EducationExperienceEntity.cs

@@ -28,7 +28,10 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         /// 时间
         /// </summary>
         [Column("ETIME")]
-        public DateTime? ETime { get; set; }
+        public string ETime { get; set; }
+
+        [Column("ESTIME")]
+        public string ESTime { get; set; }
         /// <summary>
         /// 学校
         /// </summary>

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/PM_Resume/PM_ResumeEntity.cs

@@ -28,7 +28,9 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         /// 时间
         /// </summary>
         [Column("RTIME")]
-        public DateTime? RTime { get; set; }
+        public string RTime { get; set; }
+        [Column("RSTIME")]
+        public string RSTime { get; set; }
         /// <summary>
         /// 工作单位
         /// </summary>