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 5674e9d8a..b65a3c8ad 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 @@ -58,8 +58,8 @@
健康状况
-
-
+
+
户口分类
@@ -99,22 +99,34 @@
档案所在地
-
-
父亲姓名*
- -
-
-
父亲电话*
- +
+
监护人姓名*
+
-
-
母亲姓名*
- +
+
监护人联系方式*
+
-
-
母亲电话*
- +
+
与监护人关系*
+
+ @*
+
父亲姓名*
+ +
+
+
父亲电话*
+ +
+
+
母亲姓名*
+ +
+
+
母亲电话*
+ +
*@
家庭出身
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 84d2ef63c..71ab3eeaf 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 @@ -15,10 +15,11 @@ var bootstrap = function ($, learun) { page.bind(); page.initData(); page.hide(); - }, + }, hide: function () { if (isStudent == "1") { $("#StuName").parent().hide(); + $("#GuardianType").parent().hide(); $("#IdentityCardNo").parent().hide(); $("#StuNo").parent().hide(); $("#ClassNo").parent().hide(); @@ -104,6 +105,7 @@ var bootstrap = function ($, learun) { value: 'value', text: 'text' }); + $('#GuardianType').lrDataItemSelect({ code: 'GuardianType' }); $('#HealthStatus').lrDataItemSelect({ code: 'QRCodeHealthStatus' }); $('#F_SchoolId').lrDataSourceSelect({ code: 'company', value: 'f_companyid', text: 'f_fullname' }); $('#NationalityNo').lrDataItemSelect({ code: 'National' }); 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 2daf2e7f4..57f5f154a 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 @@ -712,8 +712,22 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration /// 省编学号 /// [Column("PROVINCECODE")] - public string ProvinceCode { get; set; } + /// + /// 监护人 + /// + [Column("GUARDIAN")] + public string Guardian { get; set; } + /// + /// 监护人电话 + /// + [Column("GUARDIANPHONE")] + public string GuardianPhone { get; set; } + /// + /// 监护人与被监护人的关系 + /// + [Column("GUARDIANTYPE")] + public string GuardianType { get; set; } #endregion