update

Former-commit-id: f8851c79c7748d744057f155479464cc57debf01
Former-commit-id: ee68ea9ddc6118c39b5c16aba95f4b4dc4d2e1ce

labs/Teacher/Infrastructure/Views/Shared/EditorTemplates/SelectList.cshtml

@@ -32,6 +32,13 @@
     else
     {
         list = (ViewData[ViewData.ModelMetadata.PropertyName + "SelectList"] as SelectList) ?? new SelectList(new List<SelectListItem>());
+        var value = Model as object;
+        if(value is not null&&value is string selected)
+        {
+            var items = list.Items.Cast<SelectListItem>().ToList();
+            items.Add(new SelectListItem { Value=selected,Text=selected});
+            list = new SelectList(items, "Value", "Text", Model);
+        }
         @Html.DropDownList("", list, "请选择", new { @class = select2Class })
     }
 }

labs/Teacher/Infrastructure/Web/SelectListAttribute.cs

@@ -15,10 +15,15 @@ namespace System.ComponentModel.DataAnnotations
         public string Action { get; }
         public string Controller { get; }
         public string Area { get; }
+        public bool AllowInput { get; }
 
         public SelectListAttribute() : base("SelectList")
         {
         }
+        public SelectListAttribute(bool allowInput) : base("SelectList")
+        {
+            this.AllowInput = allowInput;
+        }
         public SelectListAttribute(string target,string action, string controller="Ajax", string area = "") : base("SelectList")
         {
             this.Target = target;
@@ -28,20 +33,23 @@ namespace System.ComponentModel.DataAnnotations
         }
         public void AddValidation(ClientModelValidationContext context)
         {
-            if(!string.IsNullOrEmpty(this.Action))
+            var attributes = context.Attributes;
+            var list = new Dictionary<string, string>();
+            if (!string.IsNullOrEmpty(this.Action))
+            {
+                list.Add("data-remote-source", context.ModelMetadata.PropertyName);
+                list.Add("data-remote-url", GetUrl(context));
+                list.Add("data-remote-target", Target);    
+            }
+            if(AllowInput)
+            {
+                list.Add("data-allow-input", true.ToString());
+            }
+            foreach (var item in list)
             {
-                var attributes = context.Attributes;
-                var list = new Dictionary<string, string>() {
-                    { "data-remote-source",context.ModelMetadata.PropertyName},
-                    { "data-remote-url",GetUrl(context)},
-                    { "data-remote-target",Target}
-                };
-                foreach (var item in list)
+                if (!attributes.ContainsKey(item.Key))
                 {
-                    if (!attributes.ContainsKey(item.Key))
-                    {
-                        attributes.Add(item.Key, item.Value);
-                    }
+                    attributes.Add(item.Key, item.Value);
                 }
             }
         }

labs/Teacher/TeacherExt/Controllers/HomeController.cs

@@ -64,6 +64,22 @@ namespace TeacherExt.Controllers
             ViewData.SelectList(o => model.PostType, () => this.GetPost(model.PostType));
             ViewData.SelectList(o => model.PostGrade, () => this.GetPostGrade(model.PostGrade));
             ViewData.SelectList(o => model.EducationGrade, () => this.GetEducationGrade(model.EducationGrade));
+            ViewData.SelectList(o => model.FullTimeSchoolType, () => this.GetFullTimeSchoolType(model.FullTimeSchoolType));
+            ViewData.SelectList(o => model.FullTimeSchoolEducation, () => this.GetEducation(model.FullTimeSchoolEducation));
+            ViewData.SelectList(o => model.JobTimeSchoolType, () => this.GetFullTimeSchoolType(model.JobTimeSchoolType));
+            ViewData.SelectList(o => model.JobTimeSchoolEducation, () => this.GetEducation(model.JobTimeSchoolEducation));
+            ViewData.SelectList(o => model.MaxEducation, () => this.GetEducation(model.MaxEducation));
+            ViewData.SelectList(o => model.MaxDegree, () => this.GetDegree(model.MaxDegree));
+            ViewData.SelectList(o => model.MainTeachPeriod, () => this.GetTeachPeriod(model.MainTeachPeriod));
+            ViewData.SelectList(o => model.MainTeachSubject, () => this.GetTeachSubject(model.MainTeachSubject));
+            ViewData.SelectList(o => model.MainTeachGrade, () => this.GetTeachGrade(model.MainTeachGrade));
+            ViewData.SelectList(o => model.OtherTeachPeriod, () => this.GetTeachPeriod(model.OtherTeachPeriod));
+            ViewData.SelectList(o => model.OtherTeachSubject, () => this.GetTeachSubject(model.OtherTeachSubject));
+            ViewData.SelectList(o => model.Position, () => this.GetPosition(model.Position));
+            ViewData.SelectList(o => model.TeacherCardType, () => this.GetTeacherCardType(model.TeacherCardType));
+            ViewData.SelectList(o => model.TeacherCardLangLevel, () => this.GetLangLevel(model.TeacherCardLangLevel));
+            ViewData.SelectList(o => model.CurrentAddressArea, () => this.GetAddressArea(model.CurrentAddressArea));
+
         }
 
 
@@ -214,8 +230,138 @@ namespace TeacherExt.Controllers
         {
             return new string[] {
                 "专技十一级",
-                "专技十二级"
+                "专技十二级",
+            }.ToSelectList(selected);
+        }
+        private SelectList GetFullTimeSchoolType(string selected)
+        {
+            return new string[] {
+               "师范院校师范专业",
+               "师范院校非师范专业",
+               "非师范院校师范专业",
+               "非师范院校非师范专业",
+            }.ToSelectList(selected);
+        }
+        private SelectList GetEducation(string selected)
+        {
+            return new string[] {
+                "研究生博士教育",
+                "研究生硕士教育",
+                "大学本科教育",
+                "大学专科教育",
+                "中等专业教育",
+                "普通高级中学教育",
+                "初级中学教育",
+                "小学教育",
+                "其他",
+            }.ToSelectList(selected);
+        }
+        private SelectList GetDegree(string selected)
+        {
+            return new string[] {
+                "学士学位",
+                "硕士学位",
+                "博士学位",
+            }.ToSelectList(selected);
+        }
+        private SelectList GetTeachPeriod(string selected)
+        {
+            return new string[] {
+                "学前教育",
+                "小学",
+                "普通初中",
+            }.ToSelectList(selected);
+        }
+        private SelectList GetTeachSubject(string selected)
+        {
+            return new string[] {
+                "语文",
+                "数学",
+                "英语",
+                "音乐",
+                "体育",
+                "美术",
+                "科学",
+                "书法",
+                "信息技术",
+                "政治",
+                "历史",
+                "地理",
+                "物理",
+                "化学",
+                "生物",
+                "幼教全科",
+                "心理健康",
+                "综合实践课",
+                "无",
+            }.ToSelectList(selected);
+        }
+        private SelectList GetTeachGrade(string selected)
+        {
+            return new string[] {
+                "九年级",
+                "八年级",
+                "七年级",
+                "六年级",
+                "五年级",
+                "四年级",
+                "三年级",
+                "二年级",
+                "一年级",
+                "幼儿园大班",
+                "幼儿园中班",
+                "幼儿园小班",
+            }.ToSelectList(selected);
+        }
+        private SelectList GetPosition(string selected)
+        {
+            return new string[] {
+                "校长",
+                "副校长",
+                "党支部副书记",
+                "办公室主任",
+                "办公室副主任",
+                "教导处主任",
+                "教导处副主任",
+                "德育主任",
+                "团支部书记",
+                "大队辅导员",
+                "工会主席",
+                "总务主任",
+                "总务副主任",
+            }.ToSelectList(selected);
+        }
+        private SelectList GetTeacherCardType(string selected)
+        {
+            return new string[] {
+                "幼儿园教师资格",
+                "小学教师资格",
+                "初级中学教师资格",
+                "高级中学教师资格",
+                "中等职业学校教师资格",
+                "中等职业学校实习指导教师资格",
+                "高等学校教师资格",
+            }.ToSelectList(selected);
+        }
+        private SelectList GetLangLevel(string selected)
+        {
+            return new string[] {
+                "一级甲等",
+                "一级乙等",
+                "二级甲等",
+                "二级乙等",
+                "三级甲等",           
+            }.ToSelectList(selected);
+        }
+        private SelectList GetAddressArea(string selected)
+        {
+            return new string[] {
+                "城中区",
+                "城北区",
+                "城西区",
+                "城东区",
             }.ToSelectList(selected);
         }
+        
     }
 }

labs/Teacher/TeacherExt/Entities/Teacher.cs

@@ -106,92 +106,84 @@ namespace TeacherExt.Entities
 
         public bool EducationGradeChecked { get; set; }
 
-        [Required(ErrorMessage = "必填项")]
+        [Required]
         public DateTime EducationGradeDate { get; set; }
 
         public bool EducationGradeDateChecked { get; set; }
 
-        [Required(ErrorMessage = "必填项")]
+        [Required]
         public string FullTimeSchoolType { get; set; }
 
-        [Required(ErrorMessage = "必填项")]
+        [Required]
         public string FullTimeSchool { get; set; }
 
-        [Required(ErrorMessage = "必填项")]
+        [Required]
         public string FullTimeSchoolMajor { get; set; }
 
-        [Required(ErrorMessage = "必填项")]
+        [Required]
         public string FullTimeSchoolEducation { get; set; }
 
-        [Required(ErrorMessage = "必填项")]
+        [Required]
         public string JobTimeSchoolEducationDate { get; set; }
 
-        [Required(ErrorMessage = "必填项")]
+        [Required]
         public string JobTimeSchoolType { get; set; }
 
-        [Required(ErrorMessage = "必填项")]
+        [Required]
         public string JobTimeSchool { get; set; }
 
-        [Required(ErrorMessage = "必填项")]
+        [Required]
         public string JobTimeSchoolMajor { get; set; }
 
-        [Required(ErrorMessage = "必填项")]
+        [Required]
         public string JobTimeSchoolEducation { get; set; }
 
-        [Required(ErrorMessage = "必填项")]
+        [Required]
         public string FullTimeSchoolEducationDate { get; set; }
 
-        [Required(ErrorMessage = "必填项")]
+        [Required]
         public string MaxEducation { get; set; }
 
-        [Required(ErrorMessage = "必填项")]
+        [Required]
         public string MaxDegree { get; set; }
 
         public bool IsClassTeacher { get; set; }
 
         public bool IsClassTeacherChecked { get; set; }
 
-        [Required(ErrorMessage = "必填项")]
+        [Required]
         public string MainTeachPeriod { get; set; }
 
         public bool MainTeachPeriodChecked { get; set; }
 
-        [Required(ErrorMessage = "必填项")]
+        [Required]
         public string MainTeachSubject { get; set; }
 
-        [Required(ErrorMessage = "必填项")]
-        public string CustomMainTeachSubject { get; set; }
-
         public bool MainTeachSubjectChecked { get; set; }
 
-        [Required(ErrorMessage = "必填项")]
+        [Required]
         public string MainTeachGrade { get; set; }
 
         public bool MainTeachGradeChecked { get; set; }
 
-        [Required(ErrorMessage = "必填项")]
+        [Required]
         public string OtherTeachPeriod { get; set; }
 
         public bool OtherTeachPeriodChecked { get; set; }
 
-        [Required(ErrorMessage = "必填项")]
+        [Required]
         public string OtherTeachSubject { get; set; }
 
-        [Required(ErrorMessage = "必填项")]
-        public string CustomOtherTeachSubject { get; set; }
-
         public bool OtherTeachSubjectChecked { get; set; }
 
         public bool HasPosition { get; set; }
 
         public bool IsMiddleLevel { get; set; }
 
-        [Required(ErrorMessage = "必填项")]
         public string Position { get; set; }
 
         public bool PositionChecked { get; set; }
 
-        [Required(ErrorMessage = "必填项")]
         public DateTime PositionStart { get; set; }
 
         public bool PositionStartChecked { get; set; }
@@ -202,7 +194,6 @@ namespace TeacherExt.Entities
 
         public bool NotOnPostReasonChecked { get; set; }
 
-        [Required(ErrorMessage = "必填项")]
         public DateTime NotOnPostReasonDate { get; set; }
 
         public bool NotOnPostReasonDateChecked { get; set; }

labs/Teacher/TeacherExt/Models/EditTeacherModel.cs

@@ -252,10 +252,10 @@ namespace TeacherExt.Models
         public string PostGrade { get; set; }
 
         [SkipSearch, SkipList]
-        [Display(Order = 251, Name = "现岗位等级-已审核")]
+        [Display(Order = 251, Name = "已审核")]
         public bool PostGradeChecked { get; set; }
 
-        [Description("是否提示[以文件为准]")]
+        [Description("是否提示【以文件为准】")]
         [SkipSearch, SkipList]
         [DataType(DataType.Date)]
         [Required(ErrorMessage = "必填项")]
@@ -263,7 +263,7 @@ namespace TeacherExt.Models
         public DateTime? CurrentPostGradeStart { get; set; }
 
         [SkipSearch, SkipList]
-        [Display(Order = 261, Name = "变更至现岗位等级时间-已审核")]
+        [Display(Order = 261, Name = "已审核")]
         public bool CurrentPostGradeStartChecked { get; set; }
 
         [SkipSearch, SkipList]
@@ -273,10 +273,10 @@ namespace TeacherExt.Models
         public string EducationGrade { get; set; }
 
         [SkipSearch, SkipList]
-        [Display(Order = 271, Name = "享受学历待遇等级-已审核")]
+        [Display(Order = 271, Name = "已审核")]
         public bool EducationGradeChecked { get; set; }
 
-        [Description("是否提示[以文件为准]")]
+        [Description("是否提示【以文件为准】")]
         [SkipSearch, SkipList]
         [DataType(DataType.Date)]
         [Required(ErrorMessage = "必填项")]
@@ -284,69 +284,79 @@ namespace TeacherExt.Models
         public DateTime? EducationGradeDate { get; set; }
 
         [SkipSearch, SkipList]
-        [Display(Order = 281, Name = "享受学历待遇等级时间-已审核")]
+        [Display(Order = 281, Name = "已审核")]
         public bool EducationGradeDateChecked { get; set; }
 
 
         [SkipSearch, SkipList]
         [SelectList]
         [Required(ErrorMessage = "必填项")]
-        [Display(Order = 290, Name = "全日制教育-毕业院校分类")]
+        [Header("全日制教育-毕业院校分类")]
+        [Display(Order = 290, Name = "全日制毕业院校分类")]
         public string FullTimeSchoolType { get; set; }
 
+        [Description("是否提示【填写毕业院校全称】")]
         [SkipSearch, SkipList]
         [Required(ErrorMessage = "必填项")]
-        [Description("填写毕业院校全称")]
-        [Display(Order = 300, Name = "全日制教育-毕业院校")]
+        [Header("全日制教育-毕业院校")]
+        [Display(Order = 300, Name = "全日制毕业院校")]
         public string FullTimeSchool { get; set; }
 
+        [Description("是否提示【严格按照毕业证书填写】")]
         [SkipSearch, SkipList]
         [Required(ErrorMessage = "必填项")]
-        [Description("严格按照毕业证书填写")]
-        [Display(Order = 310, Name = "全日制教育-毕业证书专业")]
+        [Header("全日制教育-毕业证书专业")]
+        [Display(Order = 310, Name = "全日制毕业证书专业")]
         public string FullTimeSchoolMajor { get; set; }
 
         [SkipSearch, SkipList]
         [SelectList]
         [Required(ErrorMessage = "必填项")]
-        [Display(Order = 320, Name = "全日制教育-学历")]
+        [Header("全日制教育-学历")]
+        [Display(Order = 320, Name = "全日制学历")]
         public string FullTimeSchoolEducation { get; set; }
 
         [SkipSearch, SkipList]
-        [SelectList]
         [Required(ErrorMessage = "必填项")]
-        [Display(Order = 330, Name = "全日制教育-学历取得时间")]
-        public string JobTimeSchoolEducationDate { get; set; }
+        [Header("全日制教育-学历取得时间")]
+        [Display(Order = 330, Name = "全日制学历取得时间")]
+        [DataType(DataType.Date)]
+        public DateTime? JobTimeSchoolEducationDate { get; set; }
 
         [SkipSearch, SkipList]
         [SelectList]
         [Required(ErrorMessage = "必填项")]
-        [Display(Order = 340, Name = "在职教育-毕业院校分类")]
+        [Header("在职教育-毕业院校分类")]
+        [Display(Order = 340, Name = "在职毕业院校分类")]
         public string JobTimeSchoolType { get; set; }
 
+        [Description("是否提示【填写毕业院校全称】")]
         [SkipSearch, SkipList]
         [Required(ErrorMessage = "必填项")]
-        [Description("填写毕业院校全程")]
-        [Display(Order = 350, Name = "在职教育-毕业院校")]
+        [Header("在职教育-毕业院校")]
+        [Display(Order = 350, Name = "在职毕业院校")]
         public string JobTimeSchool { get; set; }
 
+        [Description("是否提示【严格按照毕业证书填写】")]
         [SkipSearch, SkipList]
         [Required(ErrorMessage = "必填项")]
-        [Description("严格按照毕业证书填写")]
-        [Display(Order = 360, Name = "在职教育-毕业证书专业")]
+        [Header("在职教育-毕业证书专业")]
+        [Display(Order = 360, Name = "在职毕业证书专业")]
         public string JobTimeSchoolMajor { get; set; }
 
         [SkipSearch, SkipList]
         [SelectList]
         [Required(ErrorMessage = "必填项")]
-        [Display(Order = 370, Name = "在职教育-学历")]
+        [Header("在职教育-学历")]
+        [Display(Order = 370, Name = "在职学历")]
         public string JobTimeSchoolEducation { get; set; }
 
         [SkipSearch, SkipList]
-        [SelectList]
         [Required(ErrorMessage = "必填项")]
-        [Display(Order = 380, Name = "在职教育-学历取得时间")]
-        public string FullTimeSchoolEducationDate { get; set; }
+        [Header("在职教育-学历取得时间")]
+        [Display(Order = 380, Name = "在职学历取得时间")]
+        [DataType(DataType.Date)]
+        public DateTime? FullTimeSchoolEducationDate { get; set; }
 
         [SkipSearch, SkipList]
         [SelectList]
@@ -365,7 +375,7 @@ namespace TeacherExt.Models
         public bool IsClassTeacher { get; set; }
 
         [SkipSearch, SkipList]
-        [Display(Order = 411, Name = "是否担任班主任-已审核")]
+        [Display(Order = 411, Name = "已审核")]
         public bool IsClassTeacherChecked { get; set; }
 
         [SkipSearch, SkipList]
@@ -375,23 +385,18 @@ namespace TeacherExt.Models
         public string MainTeachPeriod { get; set; }
 
         [SkipSearch, SkipList]
-        [Display(Order = 421, Name = "主要任教学段-已审核")]
+        [Display(Order = 421, Name = "已审核")]
         public bool MainTeachPeriodChecked { get; set; }
 
+        [Description("是否提示【选择项中没有则手动填写】")]
         [SkipSearch, SkipList]
-        [SelectList]
+        [SelectList(true)]
         [Required(ErrorMessage = "必填项")]
-        [Description("若填写其他需要填写学科")]
         [Display(Order = 430, Name = "主要任教学科")]
         public string MainTeachSubject { get; set; }
 
         [SkipSearch, SkipList]
-        [Required(ErrorMessage = "必填项")]
-        [Display(Order = 431, Name = "自定义主要任教学科")]
-        public string CustomMainTeachSubject { get; set; }
-
-        [SkipSearch, SkipList]
-        [Display(Order = 432, Name = "主要任教学科-已审核")]
+        [Display(Order = 432, Name = "已审核")]
         public bool MainTeachSubjectChecked { get; set; }
 
         [SkipSearch, SkipList]
@@ -401,7 +406,7 @@ namespace TeacherExt.Models
         public string MainTeachGrade { get; set; }
 
         [SkipSearch, SkipList]
-        [Display(Order = 441, Name = "主要任教年级-已审核")]
+        [Display(Order = 441, Name = "已审核")]
         public bool MainTeachGradeChecked { get; set; }
 
         [SkipSearch, SkipList]
@@ -411,98 +416,110 @@ namespace TeacherExt.Models
         public string OtherTeachPeriod { get; set; }
 
         [SkipSearch, SkipList]
-        [Display(Order = 451, Name = "兼职任教学段-已审核")]
+        [Display(Order = 451, Name = "已审核")]
         public bool OtherTeachPeriodChecked { get; set; }
 
+        [Description("选择项中没有则手动填写")]
         [SkipSearch, SkipList]
         [SelectList]
         [Required(ErrorMessage = "必填项")]
-        [Description("若填写其他需要填写学科")]
         [Display(Order = 460, Name = "兼职任教学科")]
         public string OtherTeachSubject { get; set; }
 
         [SkipSearch, SkipList]
-        [Required(ErrorMessage = "必填项")]
-        [Display(Order = 461, Name = "自定义兼职任教学科")]
-        public string CustomOtherTeachSubject { get; set; }
-
-        [SkipSearch, SkipList]
-        [Display(Order = 462, Name = "兼职任教学科-已审核")]
+        [Display(Order = 462, Name = "已审核")]
         public bool OtherTeachSubjectChecked { get; set; }
 
         [SkipSearch, SkipList]
+        [SelectList]
         [Display(Order = 463, Name = "在编在岗")]
-        public bool HasPosition { get; set; }
+        public bool? HasPosition { get; set; }
 
+        [HtmlData("HasPosition1")]
         [SkipSearch, SkipList]
+        [SelectList]
         [Display(Order = 464, Name = "是否中层")]
-        public bool IsMiddleLevel { get; set; }
+        public bool? IsMiddleLevel { get; set; }
 
+        [Description("是否提示【选择项中没有则手动填写】")]
+        [HtmlData("HasPosition11")]
         [SkipSearch, SkipList]
-        [SelectList]
+        [SelectList(true)]
         [Required(ErrorMessage = "必填项")]
-        [Display(Order = 470, Name = "在编人员在岗情况-在编在岗-是-职务")]
+        [Header("在编人员在岗情况-在编在岗-是-职务")]
+        [Display(Order = 470, Name = "职务")]
         public string Position { get; set; }
 
         [SkipSearch, SkipList]
-        [Display(Order = 471, Name = "在编人员在岗情况-在编在岗-是-职务-已审核")]
+        [Display(Order = 471, Name = "已审核")]
         public bool PositionChecked { get; set; }
 
+        [HtmlData("HasPosition11")]
         [SkipSearch, SkipList]
         [DataType(DataType.Date)]
         [Required(ErrorMessage = "必填项")]
-        [Display(Order = 480, Name = "在编人员在岗情况-在编在岗-是-任命时间")]
+        [Header("在编人员在岗情况-在编在岗-是-任命时间")]
+        [Display(Order = 480, Name = "任命时间")]
         public DateTime? PositionStart { get; set; }
 
         [SkipSearch, SkipList]
-        [Display(Order = 481, Name = "在编人员在岗情况-在编在岗-是-任命时间-已审核")]
+        [Display(Order = 481, Name = "已审核")]
         public bool PositionStartChecked { get; set; }
 
+        [Description("是否显示【填写所教学科全称】")]
+        [HtmlData("HasPosition12")]
         [SkipSearch, SkipList]
-        [Description("填写所教学科全称")]
-        [Display(Order = 491, Name = "在编人员在岗情况-在编在岗-否 (一线教师)")]
+        [Header("在编人员在岗情况-在编在岗-否 （一线教师")]
+        [Display(Order = 491, Name = "在编在岗一线教师")]
         public string FrontTeacher { get; set; }
 
+        [HtmlData("HasPosition2")]
         [SkipSearch, SkipList]
-        [SelectList]//长期病假 产假 挂职 支教 其他（请写出具体原因）
-        [Description("填写所教学科全称")]
-        [Display(Order = 500, Name = "在编人员在岗情况-在编不在岗-原由")]
+        [Description("是否显示【长期病假 产假 挂职 支教 其他（请写出具体原因）】")]
+        [Header("在编人员在岗情况-在编不在岗-原由")]
+        [Display(Order = 500, Name = "在编不在岗原由")]
         public string NotOnPostReason { get; set; }
 
         [SkipSearch, SkipList]
-        [Display(Order = 501, Name = "在编人员在岗情况-在编不在岗-原由-已审核")]
+        [Display(Order = 501, Name = "已审核")]
         public bool NotOnPostReasonChecked { get; set; }
 
+        [HtmlData("HasPosition2")]
         [SkipSearch, SkipList]
         [DataType(DataType.Date)]
         [Required(ErrorMessage = "必填项")]
-        [Display(Order = 510, Name = "在编人员在岗情况-在编在不岗-不在岗 起始时间")]
+        [Header("在编人员在岗情况-在编在不岗-不在岗 起始时间")]
+        [Display(Order = 510, Name = "在编在不岗起始时间")]
         public DateTime? NotOnPostReasonDate { get; set; }
 
         [SkipSearch, SkipList]
-        [Display(Order = 511, Name = "在编人员在岗情况-在编在不岗-不在岗 起始时间-已审核")]
+        [Display(Order = 511, Name = "已审核")]
         public bool NotOnPostReasonDateChecked { get; set; }
 
         [SkipSearch, SkipList]
         [SelectList]
-        [Display(Order = 520, Name = "教师资格证 种类")]
+        [Header("教师资格证 种类")]
+        [Display(Order = 520, Name = "教师资格证种类")]
         public string TeacherCardType { get; set; }
 
+        [Description("是否提示【严格按照资格证书填写】")]
         [SkipSearch, SkipList]
-        [Description("严格按照资格证书填写")]
         [Display(Order = 530, Name = "任教学科")]
         public string TeacherCardSubject { get; set; }
 
         [SkipSearch, SkipList]
+        [SelectList]
         [Display(Order = 540, Name = "普通话等级")]
         public string TeacherCardLangLevel { get; set; }
 
         [SkipSearch, SkipList]
-        [SelectList]
+        [SelectList(true)]
+        [Required(ErrorMessage = "必填项")]
         [Display(Order = 550, Name = "现家庭详细地址-区县")]
         public string CurrentAddressArea { get; set; }
 
         [SkipSearch, SkipList]
+        [Required(ErrorMessage = "必填项")]
         [Display(Order = 560, Name = "现家庭详细地址（街道-门牌号）")]
         public string CurrentAddressStreat { get; set; }
 

labs/Teacher/TeacherExt/Views/Home/_Script.cshtml

@@ -21,4 +21,30 @@
             $("#EducationGradeDate").val('').parents('.form-group').hide();
         }
     });
+    //
+    $("[data-my-group='HasPosition1']").parents('.form-group').hide();
+    $("[data-my-group='HasPosition2']").parents('.form-group').hide();
+    $('#HasPosition').change(function () {
+        if ($(this).val() === "true") {
+            $("[data-my-group='HasPosition2']").parents('.form-group').hide();
+            $("[data-my-group='HasPosition1']").parents('.form-group').show();
+        }
+        else {
+            $("[data-my-group='HasPosition1']").parents('.form-group').hide();
+            $("[data-my-group='HasPosition2']").parents('.form-group').show();
+        }
+    });
+    //
+    $("[data-my-group='HasPosition11']").parents('.form-group').hide();
+    $("[data-my-group='HasPosition12']").parents('.form-group').hide();
+    $('#IsMiddleLevel').change(function () {
+        if ($(this).val() === "true") {
+            $("[data-my-group='HasPosition12']").parents('.form-group').hide();
+            $("[data-my-group='HasPosition11']").parents('.form-group').show();
+        }
+        else {
+            $("[data-my-group='HasPosition11']").parents('.form-group').hide();
+            $("[data-my-group='HasPosition12']").parents('.form-group').show();
+        }
+    });
 </script>

labs/Teacher/TeacherExt/wwwroot/js/site.js

@@ -156,11 +156,24 @@ function InitControls() {
         $(this).treeMultiselect({ enableSelectAll: true, searchable: true, selectAllText: "全选", unselectAllText: "反选" });
     });
     //
-    $('select.select2bs4').select2({
-        theme: "bootstrap4",
-        language: "zh-CN",
-        placeholder: '请选择',
-        allowClear: true
+    $('select.select2bs4').each(function () {
+        if ($(this).attr('data-allow-input')) {
+            $(this).select2({
+                tags: true,
+                theme: "bootstrap4",
+                language: "zh-CN",
+                placeholder: '请选择',
+                allowClear: true
+            });
+        }
+        else {
+            $(this).select2({
+                theme: "bootstrap4",
+                language: "zh-CN",
+                placeholder: '请选择',
+                allowClear: true
+            });
+        }
     });
     $('select.select2bs4.search').each(function () {
         var url = $(this).attr('data-search-url');