From 4c98c7c4eb34c507e6ec5390e1bc9133ec67a936 Mon Sep 17 00:00:00 2001
From: ndbs <nabs@LAPTOP-FJ5VQJ6J>
Date: Mon, 14 Feb 2022 18:13:38 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AD=A6=E7=94=9F=E5=AD=A6=E7=B1=8D=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=20:=20=E6=B7=BB=E5=8A=A0=E7=9B=91=E6=8A=A4=E4=BA=BA,?=
 =?UTF-8?q?=E8=81=94=E7=B3=BB=E7=94=B5=E8=AF=9D,=E5=85=B3=E7=B3=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Views/StuInfoBasic/Form.cshtml            | 42 ++++++++++++-------
 .../Views/StuInfoBasic/Form.js                |  4 +-
 .../StuInfoBasic/StuInfoBasicEntity.cs        | 16 ++++++-
 3 files changed, 45 insertions(+), 17 deletions(-)

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 @@
     <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,22 +99,34 @@
         <div class="lr-form-item-title">档案所在地</div>
         <input id="MatherUnit" 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="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 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-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="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-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="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">家庭出身</div>
         <div id="FamilyOriginNo"></div>
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
         /// 省编学号
         /// </summary>
         [Column("PROVINCECODE")]
-
         public string ProvinceCode { get; set; }
+        /// <summary>
+        /// 监护人
+        /// </summary>
+        [Column("GUARDIAN")]
+        public string Guardian { get; set; }
+        /// <summary>
+        /// 监护人电话
+        /// </summary>
+        [Column("GUARDIANPHONE")]
+        public string GuardianPhone { get; set; }
+        /// <summary>
+        /// 监护人与被监护人的关系
+        /// </summary>
+        [Column("GUARDIANTYPE")]
+        public string GuardianType { get; set; }
 
         #endregion