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 b65a3c8ad..af473cdaa 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 @@ -135,6 +135,30 @@
港澳台侨
+
+
五年一贯制
+ +
+
+
是否单亲
+
+
+
+
是否留守
+
+
+
+
是否残疾
+
+
+
+
是否走读
+
+
+
+
是否困难家庭
+
+
年级*
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 71ab3eeaf..da8381873 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,7 +15,7 @@ var bootstrap = function ($, learun) { page.bind(); page.initData(); page.hide(); - }, + }, hide: function () { if (isStudent == "1") { $("#StuName").parent().hide(); @@ -100,8 +100,6 @@ var bootstrap = function ($, learun) { }); $('#Grade').lrselect({ url: top.$.rootUrl + '/PersonnelManagement/MP_ManagementPlan/GetAcademicYear', - - //url: top.$.rootUrl + '/EducationalAdministration/ClassInfo/GenerateNearByYear', value: 'value', text: 'text' }); @@ -172,6 +170,12 @@ var bootstrap = function ($, learun) { learun.alert.error('请先选择系和专业'); } }); + $('#IsSingle').lrDataItemSelect({ code: 'YesOrNoBit' }); + $('#IsLeft').lrDataItemSelect({ code: 'YesOrNoBit' }); + $('#IsDisability').lrDataItemSelect({ code: 'YesOrNoBit' }); + $('#IsRunSchool').lrDataItemSelect({ code: 'YesOrNoBit' }); + $('#IsDdifficulty').lrDataItemSelect({ code: 'YesOrNoBit' }); + }, initData: function () { if (!!keyValue) { 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 3c4318b21..ed32f556e 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 @@ -25,7 +25,7 @@
省编学号
- +
身份证号*
@@ -45,7 +45,7 @@
疫情状态
-
+
政治面貌
@@ -58,8 +58,8 @@
健康状况
-
-
+
+
户口分类
@@ -99,29 +99,65 @@
档案所在地
+
+
监护人姓名*
+ +
+
+
监护人联系方式*
+ +
+
+
与监护人关系*
+
+
+ @*
+
父亲姓名*
+ +
+
+
父亲电话*
+ +
+
+
母亲姓名*
+ +
+
+
母亲电话*
+ +
*@
-
父亲姓名*
- +
家庭出身
+
-
父亲电话*
- +
港澳台侨
+
-
母亲姓名*
- +
五年一贯制
+
-
母亲电话*
- +
是否单亲
+
-
家庭出身
-
+
是否留守
+
-
港澳台侨
-
+
是否残疾
+
+
+
+
是否走读
+
+
+
+
是否困难家庭
+
年级*
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 72297080d..50a6eba73 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 @@ -52,6 +52,7 @@ var bootstrap = function ($, learun) { $("#InSchoolAddress").parent().hide(); $("#InSchoolTelephone").parent().hide(); $("#JoinLeagueDate").parent().hide(); + $("#GuardianType").parent().hide(); } }, bind: function () { @@ -168,6 +169,12 @@ var bootstrap = function ($, learun) { learun.alert.error('请先选择系和专业'); } }); + $('#GuardianType').lrDataItemSelect({ code: 'GuardianType' }); + $('#IsSingle').lrDataItemSelect({ code: 'YesOrNoBit' }); + $('#IsLeft').lrDataItemSelect({ code: 'YesOrNoBit' }); + $('#IsDisability').lrDataItemSelect({ code: 'YesOrNoBit' }); + $('#IsRunSchool').lrDataItemSelect({ code: 'YesOrNoBit' }); + $('#IsDdifficulty').lrDataItemSelect({ code: 'YesOrNoBit' }); }, initData: function () { if (!!keyValue) { 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 4a7cb9218..a695f96a6 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 @@ -332,6 +332,7 @@ var bootstrap = function ($, learun) { }); } }, + { label: "年级", name: "Grade", width: 100, align: "left" }, { label: "系所", name: "DeptNo", width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) { @@ -371,7 +372,6 @@ var bootstrap = function ($, learun) { }); } }, - { label: "年级", name: "Grade", width: 100, align: "left" }, { label: "学制", name: "EduSystem", width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) { learun.clientdata.getAsync('dataItem', { @@ -412,6 +412,7 @@ var bootstrap = function ($, learun) { { label: "联系电话", name: "mobile", width: 100, align: "left" }, { label: "户口所在地", name: "FatherUnit", width: 100, align: "left" }, { label: "档案所在地", name: "MatherUnit", width: 100, align: "left" }, + { label: "五年一贯制", name: "IsFiveYears", width: 100, align: "left" }, //{ // label: "异动状态", name: "AbmormityMoveMark", width: 80, align: "center", // formatter: function (cellvalue) { diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuVolunteerPhone/server.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuVolunteerPhone/server.js index 6ffea3dc0..f983d3a35 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuVolunteerPhone/server.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuVolunteerPhone/server.js @@ -1,7 +1,9 @@ //api地址 var serverurl = "http://localhost:31173"; //当前项目地址 -var currentUrl = "http://192.168.50.127:8009"; +//var currentUrl = "http://192.168.50.127:8009";//本地 +var currentUrl = "http://219.139.155.38:443";//线上 + //地址栏传参 function request(d) { for (var c = location.search.slice(1).split("&"), a = 0; a < c.length; a++) { 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 57f5f154a..ef501ae3f 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 @@ -728,7 +728,36 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration /// [Column("GUARDIANTYPE")] public string GuardianType { get; set; } - + /// + /// 单亲 + /// + [Column("ISSINGLE")] + public bool? IsSingle { get; set; } + /// + /// 留守 + /// + [Column("ISLEFT")] + public bool? IsLeft { get; set; } + /// + /// 残疾 + /// + [Column("ISDISABILITY")] + public bool? IsDisability { get; set; } + /// + /// 走读 + /// + [Column("ISRUNSCHOOL")] + public bool? IsRunSchool { get; set; } + /// + /// 困难 + /// + [Column("ISDDIFFICULTY")] + public bool? IsDdifficulty { get; set; } + /// + /// 五年一贯制 + /// + [Column("FiveYear")] + public string FiveYear { get; set; } #endregion #region 扩展操作