From 65dfb633e8f474162697676612be9c4be8742191 Mon Sep 17 00:00:00 2001
From: ndbs <nabs@LAPTOP-FJ5VQJ6J>
Date: Sat, 26 Feb 2022 17:59:02 +0800
Subject: [PATCH] =?UTF-8?q?=E6=95=99=E5=B8=88=E5=92=8C=E5=AD=A6=E7=94=9F?=
 =?UTF-8?q?=E4=B8=8B=E6=8B=89=E6=A1=86=E7=BB=91=E5=AE=9A=E5=A4=B1=E8=B4=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Views/EmpInfo/Form.js                     |  2 +-
 .../Views/StuInfoBasic/Form.cshtml            | 43 +++++++++----------
 .../Views/StuInfoBasic/Form.js                |  4 +-
 3 files changed, 24 insertions(+), 25 deletions(-)

diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Form.js
index cbcf0c500..ad89b6722 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Form.js	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Form.js	
@@ -139,7 +139,7 @@ var bootstrap = function ($, learun) {
             $('#ObtainWayOfInitialDegree').lrDataItemSelect({ code: 'ObtainWayOfDegree' });
             $('#ObtainWayOfHighestDegree').lrDataItemSelect({ code: 'ObtainWayOfDegree' });
             $('#PositionLevel').lrDataItemSelect({ code: 'PositionLevel' });
-            $('#JobRank').lrDataItemSelect({ code: 'TechnicalPost' });
+            $('#JobRank').lrDataItemSelect({ code: 'TeacherTitlePostLevel' });
             $('#WorkLevel').lrDataItemSelect({ code: 'WorkerTechnologyGrade' });
             $('#Marital').lrDataItemSelect({ code: 'MaritalType', allowSearch: true });
             //编制类别
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 0e8a9dd27..ed8f508fb 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	
@@ -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>
@@ -112,29 +112,28 @@
         <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 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>
         </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 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>
-        <div id="FamilyOriginNo"></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>
     <div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
         <div class="lr-form-item-title">分段培养方式</div>
         <div id="FiveYear"></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 67ea8c085..3405e0133 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	
@@ -108,8 +108,8 @@ var bootstrap = function ($, learun) {
             $('#F_SchoolId').lrDataSourceSelect({ code: 'company', value: 'f_companyid', text: 'f_fullname' });
             $('#NationalityNo').lrDataItemSelect({ code: 'National' });
             $('#GenderNo').lrDataItemSelect({ code: 'usersexbit' });
-            $('#PartyFaceNo').lrDataItemSelect({ code: 'BCdPartyFace' });
-            $('#HealthStatusNo').lrDataItemSelect({ code: 'BCdHealthStatus' });
+            $('#PartyFaceNo').lrDataItemSelect({ code: 'PolityStatus' });
+            $('#HealthStatusNo').lrDataItemSelect({ code: 'StuHealthType' });
             $('#Photo').lrUploader();
             $('#FamilyOriginNo').lrDataItemSelect({ code: 'BCdFamilyOrigin' });
             $('#OverseasChineseNo').lrDataItemSelect({ code: 'BCdOverseasChinese' });