From 752a651b28f23058bf600289c3c3345a7976c68e Mon Sep 17 00:00:00 2001
From: ndbs <nabs@LAPTOP-FJ5VQJ6J>
Date: Thu, 21 Apr 2022 15:28:20 +0800
Subject: [PATCH] =?UTF-8?q?=E6=95=99=E5=B8=88=E4=B8=AA=E4=BA=BA=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E6=B7=BB=E5=8A=A0=E5=B1=9E=E6=80=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Views/EmpInfo/Form.cshtml                   | 12 ++++++++++++
 .../Views/EmpInfo/Form.js                       |  3 ++-
 .../EmpInfo/EmpInfoEntity.cs                    | 17 ++++++++++++++++-
 3 files changed, 30 insertions(+), 2 deletions(-)

diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Form.cshtml
index 758784f29..3266a537a 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Form.cshtml	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Form.cshtml	
@@ -195,6 +195,18 @@
             <div class="lr-form-item-title">经费渠道</div>
             <div id="EmployType"></div>
         </div>
+        <div class="col-xs-4 lr-form-item" data-table="EmpInfo">
+            <div class="lr-form-item-title">证书编号</div>
+            <input id="TeacherQualificationsNo" type="text" class="form-control" />
+        </div>
+        <div class="col-xs-4 lr-form-item" data-table="EmpInfo">
+            <div class="lr-form-item-title">教师资格证种类</div>
+            <div id="TeacherQualifications"></div>
+        </div>
+        <div class="col-xs-4 lr-form-item" data-table="EmpInfo">
+            <div class="lr-form-item-title">其他职业资格证书</div>
+            <input id="OtherTeacherQualifications" type="text" class="form-control" />
+        </div>
         <div class="col-xs-4 lr-form-item" data-table="EmpInfo">
             <div class="lr-form-item-title">参加工作时间</div>
             <input id="AddWorkDate" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ dateFmt:'yyyy-MM-dd',onpicked: function () { $('#AddWorkDate').trigger('change'); } })" />
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Form.js
index 3d13b0704..259ab3a5d 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Form.js	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Form.js	
@@ -166,7 +166,8 @@ var bootstrap = function ($, learun) {
             $('#IsInActiveStatus').lrDataItemSelect({ code: 'JobStatus' });
             $('#ProfessionalTitle').lrDataItemSelect({ code: 'jszc' });
             $('#ProfessionalTitleLevel').lrDataItemSelect({ code: 'TeacherTitlePostLevel' });
-
+            $('#TeacherQualifications').lrDataItemSelect({ code: 'TeacherQualifications' });
+            
             //内容编辑器
             ue = UE.getEditor('editor');
 
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/EmpInfo/EmpInfoEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/EmpInfo/EmpInfoEntity.cs
index 4a428f19f..b91646a5f 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/EmpInfo/EmpInfoEntity.cs	
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/EmpInfo/EmpInfoEntity.cs	
@@ -606,7 +606,22 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         /// </summary>
         [Column("MARITAL")]
         public string Marital { get; set; }
-        
+        /// <summary>
+        /// 教师资格证种类
+        /// </summary>
+        [Column("TEACHERQUALIFICATIONS")]
+        public string TeacherQualifications { get; set; }
+        /// <summary>
+        /// 教师资格证种类编号
+        /// </summary>
+        [Column("TEACHERQUALIFICATIONSNO")]
+        public string TeacherQualificationsNo { get; set; }
+        /// <summary>
+        /// 其他教师资格种类
+        /// </summary>
+        [Column("OTHERTEACHERQUALIFICATIONS")]
+        public string OtherTeacherQualifications { get; set; }
+
         #endregion
 
         #region  扩展操作