diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuInfoBasicController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuInfoBasicController.cs index 998a321c6..58ac57fa6 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuInfoBasicController.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuInfoBasicController.cs @@ -392,14 +392,14 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers { if (model != null) { - return Fail("学号已存在！"); + return Fail("学生编号已存在！"); } } else { if (model != null && model.StuId != keyValue) { - return Fail("学号已存在！"); + return Fail("学生编号已存在！"); } entity.SyncFlag = true; //判断排课同步数据是否存在：若存在，清除同步数据； diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/Form.cshtml index 38864e88f..3a247219d 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/Form.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/Form.cshtml @@ -27,6 +27,14 @@
学号
+
+
国籍*
+
+
+
+
身份证件类型*
+
+
身份证号*
@@ -59,6 +67,38 @@
出生日期*
+
+
学生来源
+
+
+
+
招生对象
+
+
+
+
招生方式
+
+
+
+
联招合作类型
+
+
+
+
联招合作办学形式
+
+
+
+
联招学校代码
+ +
+
+
校外教学点
+ +
+
+
入学方式*
+
+
入学年月*
@@ -139,6 +179,16 @@
年级*
+
+
专业方向
+
+
+
专业简称
+ +
+
专业拼音全称
+ +
实习状态
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/Form.js index 1194c81c6..540885238 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/Form.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/Form.js @@ -103,7 +103,7 @@ var bootstrap = function ($, learun) { value: 'value', text: 'text' }); - $('#GuardianType').lrDataItemSelect({ code: 'GuardianType' }); + $('#GuardianType').lrDataItemSelect({ code: 'GuardianType' }); $('#HealthStatus').lrDataItemSelect({ code: 'QRCodeHealthStatus' }); $('#F_SchoolId').lrDataSourceSelect({ code: 'company', value: 'f_companyid', text: 'f_fullname' }); $('#NationalityNo').lrDataItemSelect({ code: 'National' }); @@ -178,8 +178,16 @@ var bootstrap = function ($, learun) { $('#FiveYear').lrDataItemSelect({ code: 'PieceCultivateWay' }); $('#InternshipStatus').lrDataItemSelect({ code: 'InternshipStatus' }); $('#IsRestudy').lrDataItemSelect({ code: 'YesOrNoInt' }); - - }, + $('#IdCardType').lrDataItemSelect({ code: 'IdCardType' }); + $('#RecruitObject').lrDataItemSelect({ code: 'RecruitObject' }); + $('#RecruitWay').lrDataItemSelect({ code: 'RecruitWay' }); + $('#RecruitCooperateType').lrDataItemSelect({ code: 'RecruitCooperateType' }); + $('#StuOrigin').lrDataItemSelect({ code: 'AdmissionsDataSource' }); + $('#EntranceWay').lrDataItemSelect({ code: 'EntranceWay' }); + $('#RecruitCooperateForm').lrDataItemSelect({ code: 'RecruitCooperateForm' }); + $('#MajorDetailNo').lrDataItemSelect({ code: 'MajorDetail' }); + $('#CountryNo').lrDataItemSelect({ code: 'Nationality' }); + }, initData: function () { if (!!keyValue) { $.lrSetForm(top.$.rootUrl + '/EducationalAdministration/StuInfoBasic/GetFormData?keyValue=' + keyValue, function (data) { diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/FormTran.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/FormTran.cshtml index 239376159..fefbccb52 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/FormTran.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/FormTran.cshtml @@ -27,6 +27,14 @@
学号
+
+
国籍*
+
+
+
+
身份证件类型*
+
+
身份证号*
@@ -59,6 +67,38 @@
出生日期*
+
+
学生来源
+
+
+
+
招生对象
+
+
+
+
招生方式
+
+
+
+
联招合作类型
+
+
+
+
联招合作办学形式
+
+
+
+
联招学校代码
+ +
+
+
校外教学点
+ +
+
+
入学方式*
+
+
入学年月*
@@ -139,6 +179,16 @@
年级*
+
+
专业方向
+
+
+
专业简称
+ +
+
专业拼音全称
+ +
实习状态
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/FormTran.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/FormTran.js index 26b3e4ad4..b8786c677 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/FormTran.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/FormTran.js @@ -178,6 +178,15 @@ var bootstrap = function ($, learun) { $('#FiveYear').lrDataItemSelect({ code: 'PieceCultivateWay' }); $('#InternshipStatus').lrDataItemSelect({ code: 'InternshipStatus' }); $('#IsRestudy').lrDataItemSelect({ code: 'YesOrNoInt' }); + $('#IdCardType').lrDataItemSelect({ code: 'IdCardType' }); + $('#RecruitObject').lrDataItemSelect({ code: 'RecruitObject' }); + $('#RecruitWay').lrDataItemSelect({ code: 'RecruitWay' }); + $('#RecruitCooperateType').lrDataItemSelect({ code: 'RecruitCooperateType' }); + $('#StuOrigin').lrDataItemSelect({ code: 'AdmissionsDataSource' }); + $('#EntranceWay').lrDataItemSelect({ code: 'EntranceWay' }); + $('#RecruitCooperateForm').lrDataItemSelect({ code: 'RecruitCooperateForm' }); + $('#MajorDetailNo').lrDataItemSelect({ code: 'MajorDetail' }); + $('#CountryNo').lrDataItemSelect({ code: 'Nationality' }); }, initData: function () { if (!!keyValue) { diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasic/StuInfoBasicEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasic/StuInfoBasicEntity.cs index dcef90fcd..483a17480 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasic/StuInfoBasicEntity.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasic/StuInfoBasicEntity.cs @@ -70,6 +70,11 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration [Column("MAJORDETAILNAME")] public string MajorDetailName { get; set; } /// + /// 专业拼音全称 + /// + [Column("MAJORDETAILSPELL")] + public string MajorDetailSpell { get; set; } + /// /// 年级 /// [Column("GRADE")]