From dc3a87d4fee19d939a8efc22067bf6402a914c10 Mon Sep 17 00:00:00 2001
From: ndbs <nabs@LAPTOP-FJ5VQJ6J>
Date: Tue, 28 Jun 2022 17:06:53 +0800
Subject: [PATCH] =?UTF-8?q?=E6=95=99=E5=B8=88=E8=81=8C=E7=A7=B0=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=20=E6=B7=BB=E5=8A=A0=E8=81=98=E4=BB=BB=E6=97=B6?=
 =?UTF-8?q?=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Views/TeacherTitleEvaluation/Form.cshtml                | 4 ++++
 .../Views/TeacherTitleEvaluation/Index.js                   | 6 ++++++
 .../TeacherTitleEvaluation/TeacherTitleEvaluationEntity.cs  | 6 ++++++
 3 files changed, 16 insertions(+)

diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/TeacherTitleEvaluation/Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/TeacherTitleEvaluation/Form.cshtml
index fba400918..53be87893 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/TeacherTitleEvaluation/Form.cshtml	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/TeacherTitleEvaluation/Form.cshtml	
@@ -15,6 +15,10 @@
         <div class="lr-form-item-title">教师姓名<font face="宋体">*</font></div>
         <div id="EID" isvalid="yes" checkexpession="NotNull"></div>
     </div>
+    <div class="col-xs-12 lr-form-item" data-table="TeacherTitleEvaluation">
+        <div class="lr-form-item-title">聘任时间</div>
+        <input id="TTInSchoolDate" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ dateFmt:'yyyy-MM-dd',onpicked: function () { $('#TTTime').trigger('change'); } })" />
+    </div>
     <div class="col-xs-12 lr-form-item" data-table="TeacherTitleEvaluation">
         <div class="lr-form-item-title">评定时间<font face="宋体">*</font></div>
         <input id="TTTime" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ dateFmt:'yyyy-MM-dd',onpicked: function () { $('#TTTime').trigger('change'); } })" isvalid="yes" checkexpession="NotNull" />
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/TeacherTitleEvaluation/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/TeacherTitleEvaluation/Index.js
index 1753e738e..99ba6b66f 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/TeacherTitleEvaluation/Index.js	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/TeacherTitleEvaluation/Index.js	
@@ -167,6 +167,12 @@ var bootstrap = function ($, learun) {
                             });
                         }
                     },
+                    {
+                        label: "聘任时间", name: "TTInSchoolDate", width: 120, align: "left",
+                        formatter: function (cellvalue) {
+                            return learun.formatDate(cellvalue, 'yyyy-MM-dd');
+                        }
+                    },
                     {
                         label: "性别", name: "Sex", width: 100, align: "left", formatter: function (cellvalue) {
                             return cellvalue == 1 ? "男" : "女"
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/TeacherTitleEvaluation/TeacherTitleEvaluationEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/TeacherTitleEvaluation/TeacherTitleEvaluationEntity.cs
index f6ab38f65..af8bc6e8b 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/TeacherTitleEvaluation/TeacherTitleEvaluationEntity.cs	
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/TeacherTitleEvaluation/TeacherTitleEvaluationEntity.cs	
@@ -90,6 +90,12 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement
         /// </summary>
         [Column("CHECKUSER")]
         public string CheckUser { get; set; }
+        /// <summary>
+        /// 聘任时间
+        /// </summary>
+        [Column("TTINSCHOOLDATE")]
+        public DateTime? TTInSchoolDate { get; set; }
+        
 
         #endregion