diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/Index.js
index cf9c38a08..483310e74 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/Index.js
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/Index.js
@@ -505,16 +505,16 @@ var bootstrap = function ($, learun) {
});
}
},
- { label: "乘火车区间", name: "TrainInterval", width: 100, align: "left", ishide: true,},
- { label: "是否随迁子女", name: "IsTrailChildren", width: 100, align: "left" ,ishide: true, },
- { label: "生源地行政区划码", name: "StuPlaceCode", width: 100, align: "left" ,ishide: true, },
- { label: "出生地行政区划码", name: "BirthPlaceCode", width: 100, align: "left" ,ishide: true, },
- { label: "籍贯地行政区划码", name: "NativePlaceCode", width: 100, align: "left" ,ishide: true, },
- { label: "所属派出所", name: "BelongPolice", width: 100, align: "left" ,ishide: true, },
- { label: "户口所在地行政区划码", name: "ResidencePlaceCode", width: 100, align: "left" ,ishide: true, },
- { label: "是否农户", name: "ResidenceNo", width: 100, align: "left" ,ishide: true, },
+ { label: "乘火车区间", name: "TrainInterval", width: 100, align: "left", ishide: true, },
+ { label: "是否随迁子女", name: "IsTrailChildren", width: 100, align: "left", ishide: true, },
+ { label: "生源地行政区划码", name: "StuPlaceCode", width: 100, align: "left", ishide: true, },
+ { label: "出生地行政区划码", name: "BirthPlaceCode", width: 100, align: "left", ishide: true, },
+ { label: "籍贯地行政区划码", name: "NativePlaceCode", width: 100, align: "left", ishide: true, },
+ { label: "所属派出所", name: "BelongPolice", width: 100, align: "left", ishide: true, },
+ { label: "户口所在地行政区划码", name: "ResidencePlaceCode", width: 100, align: "left", ishide: true, },
+ { label: "是否农户", name: "ResidenceNo", width: 100, align: "left", ishide: true, },
{
- label: "学生居住地类型", name: "StuLivePlaceType", width: 100, align: "left" ,ishide: true,
+ label: "学生居住地类型", name: "StuLivePlaceType", width: 100, align: "left", ishide: true,
formatterAsync: function (callback, value, row, op, $cell) {
learun.clientdata.getAsync('dataItem', {
key: value,
@@ -526,7 +526,7 @@ var bootstrap = function ($, learun) {
}
},
{
- label: "健康状况", name: "HealthStatusNo", width: 100, align: "left" ,ishide: true,
+ label: "健康状况", name: "HealthStatusNo", width: 100, align: "left", ishide: true,
formatterAsync: function (callback, value, row, op, $cell) {
learun.clientdata.getAsync('dataItem', {
key: value,
@@ -537,11 +537,11 @@ var bootstrap = function ($, learun) {
});
}
},
- { label: "学生来源", name: "StuOrigin", width: 100, align: "left" ,ishide: true, },
- { label: "招生对象", name: "RecruitObject", width: 100, align: "left" ,ishide: true, },
- { label: "贫困户否建档立卡贫困户", name: "PoorIsRecord", width: 100, align: "left" ,ishide: true, },
+ { label: "学生来源", name: "StuOrigin", width: 100, align: "left", ishide: true, },
+ { label: "招生对象", name: "RecruitObject", width: 100, align: "left", ishide: true, },
+ { label: "贫困户否建档立卡贫困户", name: "PoorIsRecord", width: 100, align: "left", ishide: true, },
{
- label: "招生方式", name: "RecruitWay", width: 100, align: "left" ,ishide: true,
+ label: "招生方式", name: "RecruitWay", width: 100, align: "left", ishide: true,
formatterAsync: function (callback, value, row, op, $cell) {
learun.clientdata.getAsync('dataItem', {
key: value,
@@ -553,7 +553,7 @@ var bootstrap = function ($, learun) {
}
},
{
- label: "联招合作类型", name: "RecruitCooperateType", width: 100, align: "left" ,ishide: true,
+ label: "联招合作类型", name: "RecruitCooperateType", width: 100, align: "left", ishide: true,
formatterAsync: function (callback, value, row, op, $cell) {
learun.clientdata.getAsync('dataItem', {
key: value,
@@ -564,18 +564,19 @@ var bootstrap = function ($, learun) {
});
}
},
- { label: "准考证号", name: "AdmissionNo", width: 100, align: "left" ,ishide: true, },
- { label: "考生号", name: "ksh", width: 100, align: "left" ,ishide: true, },
- { label: "考试总分", name: "ExamScore", width: 100, align: "left" ,ishide: true, },
- { label: "联招合作办学形式", name: "RecruitCooperateForm", width: 100, align: "left" ,ishide: true, },
- { label: "联招合作学校代码", name: "RecruitCooperateSchoolNo", width: 100, align: "left" ,ishide: true, },
- { label: "校外教学点", name: "SchoolOutsidePlace", width: 100, align: "left" ,ishide: true, },
- { label: "英文姓名", name: "EnglishName", width: 100, align: "left" ,ishide: true, },
- { label: "家庭邮政编码", name: "PostalCode", width: 100, align: "left" ,ishide: true, },
- { label: "其他联系方式", name: "OtherContact", width: 100, align: "left" ,ishide: true, },
- { label: "成员1姓名", name: "OneName", width: 100, align: "left" ,ishide: true, },
+ { label: "准考证号", name: "AdmissionNo", width: 100, align: "left", ishide: true, },
+ { label: "考生号", name: "ksh", width: 100, align: "left", ishide: true, },
+ { label: "考试总分", name: "ExamScore", width: 100, align: "left", ishide: true, },
+ { label: "联招合作办学形式", name: "RecruitCooperateForm", width: 100, align: "left", ishide: true, },
+ { label: "联招合作学校代码", name: "RecruitCooperateSchoolNo", width: 100, align: "left", ishide: true, },
+ { label: "校外教学点", name: "SchoolOutsidePlace", width: 100, align: "left", ishide: true, },
+ { label: "英文姓名", name: "EnglishName", width: 100, align: "left", ishide: true, },
+ { label: "家庭邮政编码", name: "PostalCode", width: 100, align: "left", ishide: true, },
+ { label: "其他联系方式", name: "OtherContact", width: 100, align: "left", ishide: true, },
+ { label: "成员1姓名", name: "OneName", width: 100, align: "left", ishide: true, },
+ { label: "成员1联系电话", name: "OneMobile", width: 100, align: "left" },
{
- label: "成员1关系", name: "OneMembership", width: 100, align: "left" ,ishide: true,
+ label: "成员1关系", name: "OneMembership", width: 100, align: "left", ishide: true,
formatterAsync: function (callback, value, row, op, $cell) {
learun.clientdata.getAsync('dataItem', {
key: value,
@@ -586,16 +587,15 @@ var bootstrap = function ($, learun) {
});
}
},
- { label: "成员1是否监护人", name: "OneIsGuardian", width: 100, align: "left" ,ishide: true, },
- { label: "成员1联系电话", name: "PieceCultivateWay", width: 100, align: "left" ,ishide: true, },
+ { label: "成员1是否监护人", name: "OneIsGuardian", width: 100, align: "left", ishide: true, },
{
- label: "成员1出生年月", name: "OneBirthday", width: 100, align: "left" ,ishide: true,
+ label: "成员1出生年月", name: "OneBirthday", width: 100, align: "left", ishide: true,
formatter: function (value) {
return learun.formatDate(value, 'yyyy-MM-dd');
}
},
{
- label: "成员1身份证件类型", name: "OneIdCardType", width: 100, align: "left" ,ishide: true,
+ label: "成员1身份证件类型", name: "OneIdCardType", width: 100, align: "left", ishide: true,
formatterAsync: function (callback, value, row, op, $cell) {
learun.clientdata.getAsync('dataItem', {
key: value,
@@ -606,9 +606,9 @@ var bootstrap = function ($, learun) {
});
}
},
- { label: "成员1身份证件号", name: "OneIdCardNo", width: 100, align: "left" ,ishide: true, },
+ { label: "成员1身份证件号", name: "OneIdCardNo", width: 100, align: "left", ishide: true, },
{
- label: "成员1民族", name: "OneNationalityNo", width: 100, align: "left" ,ishide: true,
+ label: "成员1民族", name: "OneNationalityNo", width: 100, align: "left", ishide: true,
formatterAsync: function (callback, value, row, op, $cell) {
learun.clientdata.getAsync('dataItem', {
key: value,
@@ -620,7 +620,7 @@ var bootstrap = function ($, learun) {
}
},
{
- label: "成员1健康状况", name: "OneHealthStatus", width: 100, align: "left" ,ishide: true,
+ label: "成员1健康状况", name: "OneHealthStatus", width: 100, align: "left", ishide: true,
formatterAsync: function (callback, value, row, op, $cell) {
learun.clientdata.getAsync('dataItem', {
key: value,
@@ -631,11 +631,11 @@ var bootstrap = function ($, learun) {
});
}
},
- { label: "成员1工作或学习单位", name: "OneJob", width: 100, align: "left" ,ishide: true, },
- { label: "成员2职务", name: "TwoPosition", width: 100, align: "left" ,ishide: true, },
- { label: "成员2姓名", name: "TwoName", width: 100, align: "left" ,ishide: true, },
+ { label: "成员1工作或学习单位", name: "OneJob", width: 100, align: "left", ishide: true, },
+ { label: "成员2姓名", name: "TwoName", width: 100, align: "left", ishide: true, },
+ { label: "成员2联系电话", name: "TwoMobile", width: 100, align: "left" },
{
- label: "成员2关系", name: "TwoMembership", width: 100, align: "left" ,ishide: true,
+ label: "成员2关系", name: "TwoMembership", width: 100, align: "left", ishide: true,
formatterAsync: function (callback, value, row, op, $cell) {
learun.clientdata.getAsync('dataItem', {
key: value,
@@ -646,16 +646,15 @@ var bootstrap = function ($, learun) {
});
}
},
- { label: "成员2是否监护人", name: "TwoIsGuardian", width: 100, align: "left" ,ishide: true, },
- { label: "成员2联系电话", name: "PieceCultivateWay", width: 100, align: "left" ,ishide: true, },
+ { label: "成员2是否监护人", name: "TwoIsGuardian", width: 100, align: "left", ishide: true, },
{
- label: "成员2出生年月", name: "TwoBirthday", width: 100, align: "left" ,ishide: true,
+ label: "成员2出生年月", name: "TwoBirthday", width: 100, align: "left", ishide: true,
formatter: function (value) {
return learun.formatDate(value, 'yyyy-MM-dd');
}
},
{
- label: "成员2身份证件类型", name: "TwoIdCardType", width: 100, align: "left" ,ishide: true,
+ label: "成员2身份证件类型", name: "TwoIdCardType", width: 100, align: "left", ishide: true,
formatterAsync: function (callback, value, row, op, $cell) {
learun.clientdata.getAsync('dataItem', {
key: value,
@@ -666,9 +665,9 @@ var bootstrap = function ($, learun) {
});
}
},
- { label: "成员2身份证件号", name: "TwoIdCardNo", width: 100, align: "left" ,ishide: true, },
+ { label: "成员2身份证件号", name: "TwoIdCardNo", width: 100, align: "left", ishide: true, },
{
- label: "成员2民族", name: "TwoNationalityNo", width: 100, align: "left" ,ishide: true,
+ label: "成员2民族", name: "TwoNationalityNo", width: 100, align: "left", ishide: true,
formatterAsync: function (callback, value, row, op, $cell) {
learun.clientdata.getAsync('dataItem', {
key: value,
@@ -680,7 +679,7 @@ var bootstrap = function ($, learun) {
}
},
{
- label: "成员2健康状况", name: "TwoHealthStatus", width: 100, align: "left" ,ishide: true,
+ label: "成员2健康状况", name: "TwoHealthStatus", width: 100, align: "left", ishide: true,
formatterAsync: function (callback, value, row, op, $cell) {
learun.clientdata.getAsync('dataItem', {
key: value,
@@ -691,8 +690,8 @@ var bootstrap = function ($, learun) {
});
}
},
- { label: "成员2工作或学习单位", name: "TwoJob", width: 100, align: "left" ,ishide: true, },
- { label: "成员2职务", name: "TwoPosition", width: 100, align: "left" ,ishide: true, },
+ { label: "成员2工作或学习单位", name: "TwoJob", width: 100, align: "left", ishide: true, },
+ { label: "成员2职务", name: "TwoPosition", width: 100, align: "left", ishide: true, },
],
mainId: 'StuId',
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 79a9b2230..9204370c9 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
@@ -789,6 +789,16 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
///
[Column("OTHERCONTACT")]
public string OtherContact { get; set; }
+ ///
+ /// 成员1联系方式
+ ///
+ [Column("ONEMOBILE")]
+ public string OneMobile { get; set; }
+ ///
+ /// 成员2联系方式
+ ///
+ [Column("TWOMOBILE")]
+ public string TwoMobile { get; set; }
#endregion
#region 扩展操作