给学生学籍管理添加属性 五年一贯制

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/Form.cshtml

@@ -135,6 +135,30 @@
         <div class="lr-form-item-title">港澳台侨</div>
         <div id="OverseasChineseNo"></div>
     </div>
+    <div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
+        <div class="lr-form-item-title">五年一贯制</div>
+        <input id="FiveYear" type="text" class="form-control" />
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
+        <div class="lr-form-item-title">是否单亲</div>
+        <div id="IsSingle"></div>
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
+        <div class="lr-form-item-title">是否留守</div>
+        <div id="IsLeft"></div>
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
+        <div class="lr-form-item-title">是否残疾</div>
+        <div id="IsDisability"></div>
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
+        <div class="lr-form-item-title">是否走读</div>
+        <div id="IsRunSchool"></div>
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
+        <div class="lr-form-item-title">是否困难家庭</div>
+        <div id="IsDdifficulty"></div>
+    </div>
     <div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
         <div class="lr-form-item-title">年级<font face="宋体">*</font></div>
         <div id="Grade" type="text" class="form-control" isvalid="yes" checkexpession="NotNull"></div>

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) {

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/FormTran.cshtml

@@ -25,7 +25,7 @@
     </div>
     <div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
         <div class="lr-form-item-title">省编学号</div>
-        <input id="ProvinceCode" type="text" class="form-control"/>
+        <input id="ProvinceCode" type="text" class="form-control" />
     </div>
     <div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
         <div class="lr-form-item-title">身份证号<font face="宋体">*</font></div>
@@ -45,7 +45,7 @@
     </div>
     <div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
         <div class="lr-form-item-title">疫情状态</div>
-        <div id="HealthStatus" ></div>
+        <div id="HealthStatus"></div>
     </div>
     <div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
         <div class="lr-form-item-title">政治面貌</div>
@@ -58,8 +58,8 @@
     <div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
         <div class="lr-form-item-title">健康状况</div>
         <div id="HealthStatusNo"></div>
-    </div> 
-      <div class="col-xs-12 lr-form-item" data-table="StuInfoBasic">
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="StuInfoBasic">
         <div class="lr-form-item-title">户口分类</div>
         <div id="ResidenceNo"></div>
     </div>
@@ -99,29 +99,65 @@
         <div class="lr-form-item-title">档案所在地</div>
         <input id="MatherUnit" type="text" class="form-control" />
     </div>
+    <div class="col-xs-4 lr-form-item" data-table="StuInfoBasic">
+        <div class="lr-form-item-title">监护人姓名<font face="宋体">*</font></div>
+        <input id="Guardian" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
+    </div>
+    <div class="col-xs-4 lr-form-item" data-table="StuInfoBasic">
+        <div class="lr-form-item-title">监护人联系方式<font face="宋体">*</font></div>
+        <input id="GuardianPhone" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
+    </div>
+    <div class="col-xs-4 lr-form-item" data-table="StuInfoBasic">
+        <div class="lr-form-item-title">与监护人关系<font face="宋体">*</font></div>
+        <div id="GuardianType" type="text" class="form-control" isvalid="yes" checkexpession="NotNull"></div>
+    </div>
+    @*<div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
+            <div class="lr-form-item-title">父亲姓名<font face="宋体">*</font></div>
+            <input id="FatherName" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
+        </div>
+        <div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
+            <div class="lr-form-item-title">父亲电话<font face="宋体">*</font></div>
+            <input id="FatherPhone" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
+        </div>
+        <div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
+            <div class="lr-form-item-title">母亲姓名<font face="宋体">*</font></div>
+            <input id="MatherName" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
+        </div>
+        <div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
+            <div class="lr-form-item-title">母亲电话<font face="宋体">*</font></div>
+            <input id="MatherPhone" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
+        </div>*@
     <div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
-        <div class="lr-form-item-title">父亲姓名<font face="宋体">*</font></div>
-        <input id="FatherName" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
+        <div class="lr-form-item-title">家庭出身</div>
+        <div id="FamilyOriginNo"></div>
     </div>
     <div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
-        <div class="lr-form-item-title">父亲电话<font face="宋体">*</font></div>
-        <input id="FatherPhone" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
+        <div class="lr-form-item-title">港澳台侨</div>
+        <div id="OverseasChineseNo"></div>
     </div>
     <div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
-        <div class="lr-form-item-title">母亲姓名<font face="宋体">*</font></div>
-        <input id="MatherName" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
+        <div class="lr-form-item-title">五年一贯制</div>
+        <input id="FiveYear" type="text" class="form-control" />
     </div>
     <div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
-        <div class="lr-form-item-title">母亲电话<font face="宋体">*</font></div>
-        <input id="MatherPhone" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
+        <div class="lr-form-item-title">是否单亲</div>
+        <div id="IsSingle"></div>
     </div>
     <div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
-        <div class="lr-form-item-title">家庭出身</div>
-        <div id="FamilyOriginNo"></div>
+        <div class="lr-form-item-title">是否留守</div>
+        <div id="IsLeft"></div>
     </div>
     <div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
-        <div class="lr-form-item-title">港澳台侨</div>
-        <div id="OverseasChineseNo"></div>
+        <div class="lr-form-item-title">是否残疾</div>
+        <div id="IsDisability"></div>
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
+        <div class="lr-form-item-title">是否走读</div>
+        <div id="IsRunSchool"></div>
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
+        <div class="lr-form-item-title">是否困难家庭</div>
+        <div id="IsDdifficulty"></div>
     </div>
     <div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
         <div class="lr-form-item-title">年级<font face="宋体">*</font></div>

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) {

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) {

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++) {

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
         /// </summary>
         [Column("GUARDIANTYPE")]
         public string GuardianType { get; set; }
-
+        /// <summary>
+        /// 单亲
+        /// </summary>
+        [Column("ISSINGLE")]
+        public bool? IsSingle { get; set; }
+        /// <summary>
+        /// 留守
+        /// </summary>
+        [Column("ISLEFT")]
+        public bool? IsLeft { get; set; }
+        /// <summary>
+        /// 残疾
+        /// </summary>
+        [Column("ISDISABILITY")]
+        public bool? IsDisability { get; set; }
+        /// <summary>
+        /// 走读
+        /// </summary>
+        [Column("ISRUNSCHOOL")]
+        public bool? IsRunSchool { get; set; }
+        /// <summary>
+        /// 困难
+        /// </summary>
+        [Column("ISDDIFFICULTY")]
+        public bool? IsDdifficulty { get; set; }
+        /// <summary>
+        /// 五年一贯制
+        /// </summary>
+        [Column("FiveYear")]
+        public string FiveYear { get; set; }
         #endregion
 
         #region  扩展操作