From bf5f752607fc122331210a48abe604f18867c13f Mon Sep 17 00:00:00 2001
From: ndbs <nabs@LAPTOP-FJ5VQJ6J>
Date: Thu, 10 Mar 2022 10:28:41 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E7=94=9F=E4=BF=A1=E6=81=AF=E4=B8=8B?=
 =?UTF-8?q?=E6=8B=89=E6=A1=86=E6=95=B0=E6=8D=AE=E7=BB=91=E5=AE=9A=E6=9C=89?=
 =?UTF-8?q?=E8=AF=AF=20=E8=B0=83=E6=95=B4=E5=AD=A6=E7=94=9F=E5=AD=A6?=
 =?UTF-8?q?=E7=B1=8D=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Views/StuInfoBasic/Form.cshtml            | 22 +++++++++----------
 .../Views/StuInfoBasic/FormTran.cshtml        | 22 +++++++++----------
 .../Views/StuInfoFresh/Form.js                |  6 ++---
 3 files changed, 25 insertions(+), 25 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 503e74e0d..f78d6348d 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	
@@ -19,10 +19,10 @@
         <div class="lr-form-item-title">考生号<font face="宋体">*</font></div>
         <input id="ksh" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
     </div>
-    <div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
+    @*<div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
         <div class="lr-form-item-title">通知书号<font face="宋体">*</font></div>
         <input id="NoticeNo" 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">学号</div>
         <input id="ProvinceCode" type="text" class="form-control" />
@@ -76,8 +76,8 @@
         <div id="Photo"></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="mobile" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
+        <div class="lr-form-item-title">联系电话</div>
+        <input id="mobile" type="text" class="form-control" />
     </div>
     <div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
         <div class="lr-form-item-title">E-mail</div>
@@ -100,23 +100,23 @@
         <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 class="lr-form-item-title">监护人姓名</div>
+        <input id="Guardian" 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="GuardianPhone" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
+        <div class="lr-form-item-title">监护人联系方式</div>
+        <input id="GuardianPhone" 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>
-        <div id="GuardianType" type="text" class="form-control" isvalid="yes" checkexpession="NotNull"></div>
+        <div class="lr-form-item-title">与监护人关系</div>
+        <div id="GuardianType" type="text" class="form-control"></div>
     </div>
     <div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
         <div class="lr-form-item-title">实习状态</div>
         <div id="InternshipStatus" type="text" class="form-control"></div>
     </div>
     <div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
-        <div class="lr-form-item-title">是否实习</div>
+        <div class="lr-form-item-title">是否复读</div>
         <div id="IsRestudy" type="text" class="form-control"></div>
     </div>
     @*<div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
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 64df372fa..5afdf383e 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	
@@ -19,10 +19,10 @@
         <div class="lr-form-item-title">考生号<font face="宋体">*</font></div>
         <input id="ksh" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
     </div>
-    <div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
+    @*<div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
         <div class="lr-form-item-title">通知书号<font face="宋体">*</font></div>
         <input id="NoticeNo" 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">学号</div>
         <input id="ProvinceCode" type="text" class="form-control" />
@@ -76,8 +76,8 @@
         <div id="Photo"></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="mobile" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
+        <div class="lr-form-item-title">联系电话</div>
+        <input id="mobile" type="text" class="form-control" />
     </div>
     <div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
         <div class="lr-form-item-title">E-mail</div>
@@ -100,23 +100,23 @@
         <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 class="lr-form-item-title">监护人姓名</div>
+        <input id="Guardian" 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="GuardianPhone" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
+        <div class="lr-form-item-title">监护人联系方式</div>
+        <input id="GuardianPhone" 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>
-        <div id="GuardianType" type="text" class="form-control" isvalid="yes" checkexpession="NotNull"></div>
+        <div class="lr-form-item-title">与监护人关系</div>
+        <div id="GuardianType" type="text" class="form-control"></div>
     </div>
     <div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
         <div class="lr-form-item-title">实习状态</div>
         <div id="InternshipStatus" type="text" class="form-control"></div>
     </div>
     <div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
-        <div class="lr-form-item-title">是否实习</div>
+        <div class="lr-form-item-title">是否复读</div>
         <div id="IsRestudy" type="text" class="form-control"></div>
     </div>
     @*<div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/Form.js
index abbfefd90..66b1f454d 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/Form.js	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/Form.js	
@@ -16,13 +16,13 @@ var bootstrap = function ($, learun) {
         },
         bind: function () {
             $("#GenderNo").lrDataItemSelect({ code: 'usersex' });
-            $("#PartyFaceNo").lrDataItemSelect({ code: 'BCdPartyFace' });
-            $("#FamilyOriginNo").lrDataItemSelect({ code: 'ExamineeCategory' });
+            $('#PartyFaceNo').lrDataSourceSelect({ code: 'BCdPartyFace', value: 'partyfaceno', text: 'partyface' });
+            $('#FamilyOriginNo').lrDataItemSelect({ code: 'stuType' });
             $("#NationalityNo").lrDataItemSelect({ code: 'National' });
             $("#TestStuSortNo").lrDataItemSelect({ code: 'ExamineeType' });
             $("#TestStuSubjectNo").lrDataItemSelect({ code: 'SubjectType' });
             $("#HighTestSortNo").lrDataItemSelect({ code: 'GraduateCategory' });
-            $("#MatriculateSort").lrDataItemSelect({ code: 'EnrollStyle' });
+            $("#MatriculateSort").lrDataItemSelect({ code: 'enrollType' });
             $('#ResidenceNo').lrDataItemSelect({ code: 'ResidenceNo' });
             $('#IsPoor').lrDataItemSelect({ code: 'YesOrNoInt' });