学籍信息管理添加档案自带 属性调整

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

@@ -7,10 +7,6 @@
         <div class="lr-form-item-title">学校<font face="宋体">*</font></div>
         <div id="F_SchoolId" 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="StuNo" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
-    </div>
     <div class="col-xs-6 lr-form-item" data-table="StuInfoBasic" id="CodeId">
         <div class="lr-form-item-title">学籍号</div>
         <input id="StuCode" type="text" class="form-control" />
@@ -20,101 +16,141 @@
         <input id="ksh" 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="NoticeNo" 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="IdentityCardNo" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
+        <div class="lr-form-item-title">学号<font face="宋体">*</font></div>
+        <input id="StuNo" 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="NoticeNo" 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="StuName" 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>
-        <div id="NationalityNo" 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>
         <div id="GenderNo" isvalid="yes" checkexpession="NotNull"></div>
     </div>
     <div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
-        <div class="lr-form-item-title">疫情状态</div>
-        <div id="HealthStatus"></div>
+        <div class="lr-form-item-title">身份证号<font face="宋体">*</font></div>
+        <input id="IdentityCardNo" 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="Birthday" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ dateFmt: 'yyyy-MM-dd', onpicked: function() { $('#Birthday').trigger('change'); } })" 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>
+        <div id="NationalityNo" isvalid="yes" checkexpession="NotNull"></div>
     </div>
+    @*<div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
+            <div class="lr-form-item-title">疫情状态</div>
+            <div id="HealthStatus"></div>
+        </div>*@
     <div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
         <div class="lr-form-item-title">政治面貌</div>
         <div id="PartyFaceNo"></div>
     </div>
+    @*<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-6 lr-form-item" data-table="StuInfoBasic">
-        <div class="lr-form-item-title">出生日期<font face="宋体">*</font></div>
-        <input id="Birthday" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ dateFmt: 'yyyy-MM-dd', onpicked: function() { $('#Birthday').trigger('change'); } })" isvalid="yes" checkexpession="NotNull" />
+        <div class="lr-form-item-title">档案自带</div>
+        <div id="IsArchives"></div>
     </div>
     <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 class="lr-form-item-title">户口分类</div>
         <div id="ResidenceNo"></div>
     </div>
-    <div class="col-xs-12 lr-form-item" data-table="StuInfoBasic">
-        <div class="lr-form-item-title">籍贯</div>
-        <div class="col-xs-12 lr-form-area">
-            <div id="F_ProvinceId" placeholder="省" class="col-xs-4"></div>
-            <div id="F_CityId" placeholder="市" class="col-xs-4"></div>
-            <div id="F_CountyId" placeholder="县/区" class="col-xs-4"></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="DeptNo" isvalid="yes" checkexpession="NotNull"></div>
     </div>
-    <div class="col-xs-12 lr-form-item" data-table="StuInfoBasic">
-        <div class="lr-form-item-title">照片</div>
-        <div id="Photo"></div>
+    <div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
+        <div class="lr-form-item-title">专业<font face="宋体">*</font></div>
+        <div id="MajorNo" 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="mobile" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
+        <div class="lr-form-item-title">班级<font face="宋体">*</font></div>
+        <div id="ClassNo" isvalid="yes" checkexpession="NotNull"></div>
     </div>
     <div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
-        <div class="lr-form-item-title">E-mail</div>
-        <input id="EMail" type="text" class="form-control" />
+        <div class="lr-form-item-title">年级<font face="宋体">*</font></div>
+        <div id="Grade" 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>
-        <div id="DepositBank" isvalid="yes" checkexpession="NotNull"></div>
+        <div class="lr-form-item-title">学制</div>
+        <div id="EduSystem"></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="BankCard" type="text" class="form-control" isvalid="yes" checkexpession="BankCard" />
+        <div class="lr-form-item-title">学习形式</div>
+        <div id="StudyModality"></div>
     </div>
     <div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
-        <div class="lr-form-item-title">开户银行位置</div>
-        <input id="BankLocation" type="text" class="form-control" />
+        <div class="lr-form-item-title">入学年月<font face="宋体">*</font></div>
+        <input id="EntranceDate" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ dateFmt: 'yyyy-MM-dd', onpicked: function() { $('#EntranceDate').trigger('change'); } })" isvalid="yes" checkexpession="NotNull" />
     </div>
     <div class="col-xs-12 lr-form-item" data-table="StuInfoBasic">
-        <div class="lr-form-item-title">通信地址<font face="宋体">*</font></div>
+        <div class="lr-form-item-title">通讯地址<font face="宋体">*</font></div>
         <input id="MailAddress" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
     </div>
     <div class="col-xs-12 lr-form-item" data-table="StuInfoBasic">
-        <div class="lr-form-item-title">邮政编码<font face="宋体">*</font></div>
-        <input id="PostalCode" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
+        <div class="lr-form-item-title">照片</div>
+        <div id="Photo"></div>
     </div>
-    <div class="col-xs-12 lr-form-item" data-table="StuInfoBasic">
-        <div class="lr-form-item-title">户口所在地</div>
-        <input id="FatherUnit" type="text" class="form-control" />
+    <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>
-    <div class="col-xs-12 lr-form-item" data-table="StuInfoBasic">
-        <div class="lr-form-item-title">档案所在地</div>
-        <input id="MatherUnit" type="text" class="form-control" />
+    <div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
+        <div class="lr-form-item-title">生源地</div>
+        <div id="StuPlaceCode" type="text" class="form-control"></div>
     </div>
+    @*<div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
+            <div class="lr-form-item-title">E-mail</div>
+            <input id="EMail" type="text" class="form-control" />
+        </div>*@
+    @*<div class="col-xs-12 lr-form-item" data-table="StuInfoBasic">
+            <div class="lr-form-item-title">户口所在地</div>
+            <input id="FatherUnit" type="text" class="form-control" />
+        </div>
+        <div class="col-xs-12 lr-form-item" data-table="StuInfoBasic">
+            <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">户籍所在地</div>
         <input id="Domicile" type="text" class="form-control" />
     </div>
+    <div class="col-xs-12 lr-form-item" data-table="StuInfoBasic">
+        <div class="lr-form-item-title">籍贯</div>
+        <div class="col-xs-12 lr-form-area">
+            <div id="F_ProvinceId" placeholder="省" class="col-xs-4"></div>
+            <div id="F_CityId" placeholder="市" class="col-xs-4"></div>
+            <div id="F_CountyId" placeholder="县/区" class="col-xs-4"></div>
+        </div>
+    </div>
     <div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
-        <div class="lr-form-item-title">是否单亲</div>
-        <div id="IsSingle"></div>
+        <div class="lr-form-item-title">邮政编码<font face="宋体">*</font></div>
+        <input id="PostalCode" 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>
+        <div id="DepositBank" 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="BankCard" type="text" class="form-control" isvalid="yes" checkexpession="BankCard" />
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
+        <div class="lr-form-item-title">开户银行位置</div>
+        <input id="BankLocation" 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>
         <input id="FatherName" type="text" class="form-control" />
@@ -139,22 +175,22 @@
         <div class="lr-form-item-title">母亲电话</div>
         <input id="MatherPhone" type="text" class="form-control" />
     </div>
-    <div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
-        <div class="lr-form-item-title">户籍地址</div>
-        <input id="OneDomicile" type="text" class="form-control" />
-    </div>
-    <div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
-        <div class="lr-form-item-title">户籍地址</div>
-        <input id="TwoDomicile" type="text" class="form-control" />
-    </div>
-    <div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
-        <div class="lr-form-item-title">现住址</div>
-        <input id="OneAddress" type="text" class="form-control" />
-    </div>
-    <div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
-        <div class="lr-form-item-title">现住址</div>
-        <input id="TwoAddress" type="text" class="form-control" />
-    </div>
+    @*<div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
+            <div class="lr-form-item-title">户籍地址</div>
+            <input id="OneDomicile" type="text" class="form-control" />
+        </div>
+        <div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
+            <div class="lr-form-item-title">户籍地址</div>
+            <input id="TwoDomicile" type="text" class="form-control" />
+        </div>
+        <div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
+            <div class="lr-form-item-title">现住址</div>
+            <input id="OneAddress" type="text" class="form-control" />
+        </div>
+        <div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
+            <div class="lr-form-item-title">现住址</div>
+            <input id="TwoAddress" type="text" class="form-control" />
+        </div>*@
     <div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
         <div class="lr-form-item-title">监护人姓名</div>
         <input id="GuardianName" type="text" class="form-control" />
@@ -167,10 +203,10 @@
         <div class="lr-form-item-title">监护人电话</div>
         <input id="GuardianPhone" type="text" class="form-control" />
     </div>
-    <div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
-        <div class="lr-form-item-title">监护人户籍地址</div>
-        <input id="GuardianDomicile" type="text" class="form-control" />
-    </div>
+    @*<div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
+            <div class="lr-form-item-title">监护人户籍地址</div>
+            <input id="GuardianDomicile" type="text" class="form-control" />
+        </div>*@
     <div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
         <div class="lr-form-item-title">监护人现住址</div>
         <input id="GuardianAddress" type="text" class="form-control" />
@@ -184,77 +220,53 @@
         <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>
-        <div id="Grade" type="text" class="form-control" isvalid="yes" checkexpession="NotNull"></div>
+        <div class="lr-form-item-title">培养层次</div>
+        <div id="PieceCultivateWay"></div>
     </div>
+    @*<div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
+                <div class="lr-form-item-title">本专科</div>
+                <div id="GraduateNo"></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="RegisterDate" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ dateFmt: 'yyyy-MM-dd', onpicked: function() { $('#RegisterDate').trigger('change'); } })" 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="GraduateNo"></div>
-    </div>
-    <div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
-        <div class="lr-form-item-title">学制</div>
-        <div id="EduSystem"></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="RegisterDate" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ dateFmt: 'yyyy-MM-dd', onpicked: function() { $('#RegisterDate').trigger('change'); } })" 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="StudyModality"></div>
-    </div>
-    <div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
-        <div class="lr-form-item-title">毕业证号</div>
-        <input id="DiplomaNo" 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 class="lr-form-item-title">预计毕业日期</div>
         <input id="GraduateYear" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ dateFmt: 'yyyy-MM-dd', onpicked: function() { $('#GraduateYear').trigger('change'); } })" />
     </div>
-    <div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
-        <div class="lr-form-item-title">毕业证书备注</div>
-        <input id="DiplomaRemark" 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="DeptNo" isvalid="yes" checkexpession="NotNull"></div>
-    </div>
-    <div class="col-xs-4 lr-form-item" data-table="StuInfoBasic">
-        <div class="lr-form-item-title">专业<font face="宋体">*</font></div>
-        <div id="MajorNo" isvalid="yes" checkexpession="NotNull"></div>
-    </div>
-    <div class="col-xs-4 lr-form-item" data-table="StuInfoBasic">
-        <div class="lr-form-item-title">班级<font face="宋体">*</font></div>
-        <div id="ClassNo" isvalid="yes" checkexpession="NotNull"></div>
-    </div>
-    <div class="col-xs-4 lr-form-item" data-table="StuInfoBasic">
-        <div class="lr-form-item-title">入学年月<font face="宋体">*</font></div>
-        <input id="EntranceDate" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ dateFmt: 'yyyy-MM-dd', onpicked: function() { $('#EntranceDate').trigger('change'); } })" isvalid="yes" checkexpession="NotNull" />
-    </div>
-    <div class="col-xs-4 lr-form-item" data-table="StuInfoBasic">
-        <div class="lr-form-item-title">入党时间</div>
-        <input id="JoinPartyDate" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ dateFmt: 'yyyy-MM-dd', onpicked: function() { $('#JoinPartyDate').trigger('change'); } })" />
-    </div>
-    <div class="col-xs-4 lr-form-item" data-table="StuInfoBasic">
-        <div class="lr-form-item-title">入团时间</div>
-        <input id="JoinLeagueDate" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ dateFmt: 'yyyy-MM-dd', onpicked: function() { $('#JoinLeagueDate').trigger('change'); } })" />
-    </div>
-    <div class="col-xs-12 lr-form-item" data-table="StuInfoBasic">
-        <div class="lr-form-item-title">校内地址</div>
-        <input id="InSchoolAddress" type="text" class="form-control" />
-    </div>
-    <div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
-        <div class="lr-form-item-title">校内电话</div>
-        <input id="InSchoolTelephone" type="text" class="form-control" />
-    </div>
-    <div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
-        <div class="lr-form-item-title">QQ</div>
-        <input id="QQ" type="text" class="form-control" />
-    </div>
-    <div class="col-xs-12 lr-form-item" data-table="StuInfoBasic">
-        <div class="lr-form-item-title">特长</div>
-        <input id="GoodAt" type="text" class="form-control" />
-    </div>
+    @*<div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
+            <div class="lr-form-item-title">毕业证号</div>
+            <input id="DiplomaNo" type="text" class="form-control" />
+        </div>
+        <div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
+            <div class="lr-form-item-title">毕业证书备注</div>
+            <input id="DiplomaRemark" type="text" class="form-control" />
+        </div>
+        <div class="col-xs-4 lr-form-item" data-table="StuInfoBasic">
+            <div class="lr-form-item-title">入党时间</div>
+            <input id="JoinPartyDate" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ dateFmt: 'yyyy-MM-dd', onpicked: function() { $('#JoinPartyDate').trigger('change'); } })" />
+        </div>
+        <div class="col-xs-4 lr-form-item" data-table="StuInfoBasic">
+                <div class="lr-form-item-title">入团时间</div>
+                <input id="JoinLeagueDate" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ dateFmt: 'yyyy-MM-dd', onpicked: function() { $('#JoinLeagueDate').trigger('change'); } })" />
+            </div>
+            <div class="col-xs-12 lr-form-item" data-table="StuInfoBasic">
+                <div class="lr-form-item-title">校内地址</div>
+                <input id="InSchoolAddress" type="text" class="form-control" />
+            </div>
+            <div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
+                <div class="lr-form-item-title">校内电话</div>
+                <input id="InSchoolTelephone" type="text" class="form-control" />
+            </div>
+            <div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
+                <div class="lr-form-item-title">QQ</div>
+                <input id="QQ" type="text" class="form-control" />
+            </div>
+            <div class="col-xs-12 lr-form-item" data-table="StuInfoBasic">
+                <div class="lr-form-item-title">特长</div>
+                <input id="GoodAt" type="text" class="form-control" />
+            </div>*@
     <div class="col-xs-12 lr-form-item" data-table="StuInfoBasic">
         <div class="lr-form-item-title">备注</div>
         <textarea id="Remark" class="form-control" style="height: 100px;"></textarea>

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

@@ -72,6 +72,9 @@ var bootstrap = function ($, learun) {
         },
         bind: function () {
             $('#DepositBank').lrDataItemSelect({ code: 'DepositBank' });
+            $('#StuPlaceCode').lrDataSourceSelect({ code: 'DIC_PROVINCE', value: 'pcode', text: 'pname' });
+            $('#IsArchives').lrDataItemSelect({ code: 'YesOrNoInt' });
+            $('#PieceCultivateWay').lrDataItemSelect({ code: 'EducationLevel' });
             $('#F_ProvinceId').lrDataSourceSelect({
                 code: 'DIC_PROVINCE', value: 'pcode', text: 'pname',
                 select: function (item) {
@@ -119,7 +122,7 @@ var bootstrap = function ($, learun) {
                 value: 'value',
                 text: 'text'
             });
-            $('#HealthStatus').lrDataItemSelect({ code: 'QRCodeHealthStatus' });
+            $('#HealthStatus').lrDataItemSelect({ code: 'QRCodeHealthStatus' });            
             $('#F_SchoolId').lrDataSourceSelect({ code: 'company', value: 'f_companyid', text: 'f_fullname' });
             $('#NationalityNo').lrDataItemSelect({ code: 'National' });
             $('#GenderNo').lrDataItemSelect({ code: 'usersexbit' });

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/Index.js

@@ -235,10 +235,8 @@ var bootstrap = function ($, learun) {
             $('#gridtable').jfGrid({
                 url: top.$.rootUrl + '/EducationalAdministration/StuInfoBasic/GetPageList',
                 headData: [
-                    { label: "学号", name: "StuNo", width: 100, align: "left" },
-                    //{ label: "学籍号", name: "StuCode", width: 100, align: "left" },
                     { label: "考生号", name: "ksh", width: 100, align: "left" },
-                    { label: "通知书号", name: "NoticeNo", width: 100, align: "left" },
+                    { label: "学号", name: "StuNo", width: 100, align: "left" },
                     { label: "姓名", name: "StuName", width: 100, align: "left" },
                     {
                         label: "性别", name: "GenderNo", width: 80, align: "left",
@@ -334,14 +332,39 @@ var bootstrap = function ($, learun) {
                             });
                         }
                     },
-                    { label: "报到日期", name: "RegisterDate", width: 100, align: "left" },
+                    //{ label: "报到日期", name: "RegisterDate", width: 100, align: "left" },
                     { label: "入学年月", name: "EntranceDate", width: 100, align: "left" },
                     //{ label: "余额", name: "Balance", width: 100, align: "left" },
                     { label: "通讯地址", name: "MailAddress", width: 100, align: "left" },
                     { label: "联系电话", name: "mobile", width: 100, align: "left" },
-                    { label: "户口所在地", name: "FatherUnit", width: 100, align: "left" },
-                    { label: "档案所在地", name: "MatherUnit", width: 100, align: "left" },
+                    {
+                        label: "生源地", name: "StuPlaceCode", width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('custmerData', {
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'DIC_CITY',
+                                key: value,
+                                keyId: 'ccode',
+                                callback: function (_data) {
+                                    callback(_data['cname']);
+                                }
+                            });
+                        }
+                    },
+                    //{ label: "户口所在地", name: "FatherUnit", width: 100, align: "left" },
+                    //{ label: "档案所在地", name: "MatherUnit", width: 100, align: "left" },
                     { label: "户籍所在地", name: "Domicile", width: 100, align: "left" },
+                    {
+                        label: "档案是否自带", name: "IsArchives", width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('dataItem', {
+                                key: value,
+                                code: 'YesOrNoInt',
+                                callback: function (_data) {
+                                    callback(_data.text);
+                                }
+                            });
+                        }
+                    },
                     {
                         label: "户口分类", name: "ResidenceNo", width: 100, align: "left",
                         formatterAsync: function (callback, value, row, op, $cell) {
@@ -393,6 +416,7 @@ var bootstrap = function ($, learun) {
                             });
                         }
                     },
+                    { label: "邮政编码", name: "PostalCode", width: 100, align: "center" },
                     //{ label: "E-mail", name: "E-mail", width: 100, align: "center" },
                     {
                         label: "开户银行", name: "DepositBank", width: 100, align: "center",
@@ -408,32 +432,31 @@ var bootstrap = function ($, learun) {
                     },
                     { label: "开户卡账号", name: "BankCard", width: 100, align: "center" },
                     { label: "开户银行位置", name: "BankLocation", width: 100, align: "center" },
-                    { label: "邮政编码", name: "PostalCode", width: 100, align: "center" },
-                    {
-                        label: "是否单亲", name: "IsSingle", width: 100, align: "left",
-                        formatter: function (value, row) {
-                            if (value == true) {
-                                return '是';
-                            }
-                            else if (value == false) {
-                                return '否';
-                            }
-                        }
-                    },
+                    //{
+                    //    label: "是否单亲", name: "IsSingle", width: 100, align: "left",
+                    //    formatter: function (value, row) {
+                    //        if (value == true) {
+                    //            return '是';
+                    //        }
+                    //        else if (value == false) {
+                    //            return '否';
+                    //        }
+                    //    }
+                    //},
                     { label: "父亲姓名", name: "FatherName", width: 100, align: "center" },
                     { label: "身份证号", name: "OneIdCardNo", width: 100, align: "center" },
                     { label: "父亲电话", name: "FatherPhone", width: 100, align: "center" },
-                    { label: "户籍地址", name: "OneDomicile", width: 100, align: "center" },
-                    { label: "现住址", name: "OneAddress", width: 100, align: "center" },
+                    //{ label: "户籍地址", name: "OneDomicile", width: 100, align: "center" },
+                    //{ label: "现住址", name: "OneAddress", width: 100, align: "center" },
                     { label: "母亲姓名", name: "MatherName", width: 100, align: "center" },
                     { label: "身份证号", name: "TwoIdCardNo", width: 100, align: "center" },
                     { label: "母亲电话", name: "MatherPhone", width: 100, align: "center" },
-                    { label: "户籍地址", name: "TwoDomicile", width: 100, align: "center" },
-                    { label: "现住址", name: "TwoAddress", width: 100, align: "center" },
+                    //{ label: "户籍地址", name: "TwoDomicile", width: 100, align: "center" },
+                    //{ label: "现住址", name: "TwoAddress", width: 100, align: "center" },
                     { label: "监护人姓名", name: "GuardianName", width: 100, align: "center" },
                     { label: "身份证号", name: "GuardianIdCardNo", width: 100, align: "center" },
                     { label: "监护人电话", name: "GuardianPhone", width: 100, align: "center" },
-                    { label: "户籍地址", name: "GuardianDomicile", width: 100, align: "center" },
+                    //{ label: "户籍地址", name: "GuardianDomicile", width: 100, align: "center" },
                     { label: "现住址", name: "GuardianAddress", width: 100, align: "center" },
                     {
                         label: "家庭出身", name: "FamilyOriginNo", width: 100, align: "center",
@@ -460,24 +483,37 @@ var bootstrap = function ($, learun) {
                         }
                     },
                     {
-                        label: "本专科", name: "GraduateNo", width: 100, align: "center",
+                        label: "培养层次", name: "PieceCultivateWay", width: 100, align: "center",
                         formatterAsync: function (callback, value, row, op, $cell) {
                             learun.clientdata.getAsync('dataItem', {
                                 key: value,
-                                code: 'CollegeType',
+                                code: 'EducationLevel',
                                 callback: function (_data) {
                                     callback(_data.text);
                                 }
                             });
                         }
                     },
-                    { label: "毕业证号", name: "DiplomaNo", width: 100, align: "center" },
+
+                    //{
+                    //    label: "本专科", name: "GraduateNo", width: 100, align: "center",
+                    //    formatterAsync: function (callback, value, row, op, $cell) {
+                    //        learun.clientdata.getAsync('dataItem', {
+                    //            key: value,
+                    //            code: 'CollegeType',
+                    //            callback: function (_data) {
+                    //                callback(_data.text);
+                    //            }
+                    //        });
+                    //    }
+                    //},
                     {
                         label: "毕业日期", name: "GraduateYear", width: 100, align: "center",
                         formatter: function (cellvalue) {
                             return learun.formatDate(cellvalue, 'yyyy-MM-dd');
                         }
                     },
+                    { label: "毕业证号", name: "DiplomaNo", width: 100, align: "center" },
                     { label: "毕业证书备注", name: "DiplomaRemark", width: 100, align: "center" },
                     //{
                     //    label: "入党时间", name: "BankCard", width: 100, align: "center",
@@ -491,10 +527,10 @@ var bootstrap = function ($, learun) {
                     //        return learun.formatDate(cellvalue, 'yyyy-MM-dd');
                     //    }
                     //},
-                    { label: "校内地址", name: "InSchoolAddress", width: 100, align: "center" },
-                    { label: "校内电话", name: "InSchoolTelephone", width: 100, align: "center" },
-                    { label: "QQ", name: "QQ", width: 100, align: "center" },
-                    { label: "特长", name: "GoodAt", width: 100, align: "center" },
+                    //{ label: "校内地址", name: "InSchoolAddress", width: 100, align: "center" },
+                    //{ label: "校内电话", name: "InSchoolTelephone", width: 100, align: "center" },
+                    //{ label: "QQ", name: "QQ", width: 100, align: "center" },
+                    //{ label: "特长", name: "GoodAt", width: 100, align: "center" },
                     { label: "备注", name: "Remark", width: 200, align: "center" },
                     {
                         label: "异动状态", name: "MoveStatus", width: 80, align: "center",

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/IndexCenter.js

@@ -235,10 +235,8 @@ var bootstrap = function ($, learun) {
             $('#gridtable').jfGrid({
                 url: top.$.rootUrl + '/EducationalAdministration/StuInfoBasic/GetPageList',
                 headData: [
-                    { label: "学号", name: "StuNo", width: 100, align: "left" },
                     { label: "学籍号", name: "StuCode", width: 100, align: "left" },
-                    //{ label: "考生号", name: "ksh", width: 100, align: "left" },
-                    { label: "通知书号", name: "NoticeNo", width: 100, align: "left" },
+                    { label: "学号", name: "StuNo", width: 100, align: "left" },
                     { label: "姓名", name: "StuName", width: 100, align: "left" },
                     {
                         label: "性别", name: "GenderNo", width: 80, align: "left",
@@ -334,14 +332,39 @@ var bootstrap = function ($, learun) {
                             });
                         }
                     },
-                    { label: "报到日期", name: "RegisterDate", width: 100, align: "left" },
+                    //{ label: "报到日期", name: "RegisterDate", width: 100, align: "left" },
                     { label: "入学年月", name: "EntranceDate", width: 100, align: "left" },
                     //{ label: "余额", name: "Balance", width: 100, align: "left" },
                     { label: "通讯地址", name: "MailAddress", width: 100, align: "left" },
                     { label: "联系电话", name: "mobile", width: 100, align: "left" },
-                    { label: "户口所在地", name: "FatherUnit", width: 100, align: "left" },
-                    { label: "档案所在地", name: "MatherUnit", width: 100, align: "left" },
+                    {
+                        label: "生源地", name: "StuPlaceCode", width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('custmerData', {
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'DIC_CITY',
+                                key: value,
+                                keyId: 'ccode',
+                                callback: function (_data) {
+                                    callback(_data['cname']);
+                                }
+                            });
+                        }
+                    },
+                    //{ label: "户口所在地", name: "FatherUnit", width: 100, align: "left" },
+                    //{ label: "档案所在地", name: "MatherUnit", width: 100, align: "left" },
                     { label: "户籍所在地", name: "Domicile", width: 100, align: "left" },
+                    {
+                        label: "档案是否自带", name: "IsArchives", width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('dataItem', {
+                                key: value,
+                                code: 'YesOrNoInt',
+                                callback: function (_data) {
+                                    callback(_data.text);
+                                }
+                            });
+                        }
+                    },
                     {
                         label: "户口分类", name: "ResidenceNo", width: 100, align: "left",
                         formatterAsync: function (callback, value, row, op, $cell) {
@@ -393,6 +416,7 @@ var bootstrap = function ($, learun) {
                             });
                         }
                     },
+                    { label: "邮政编码", name: "PostalCode", width: 100, align: "center" },
                     //{ label: "E-mail", name: "E-mail", width: 100, align: "center" },
                     {
                         label: "开户银行", name: "DepositBank", width: 100, align: "center",
@@ -408,32 +432,31 @@ var bootstrap = function ($, learun) {
                     },
                     { label: "开户卡账号", name: "BankCard", width: 100, align: "center" },
                     { label: "开户银行位置", name: "BankLocation", width: 100, align: "center" },
-                    { label: "邮政编码", name: "PostalCode", width: 100, align: "center" },
-                    {
-                        label: "是否单亲", name: "IsSingle", width: 100, align: "left",
-                        formatter: function (value, row) {
-                            if (value == true) {
-                                return '是';
-                            }
-                            else if (value == false) {
-                                return '否';
-                            }
-                        }
-                    },
+                    //{
+                    //    label: "是否单亲", name: "IsSingle", width: 100, align: "left",
+                    //    formatter: function (value, row) {
+                    //        if (value == true) {
+                    //            return '是';
+                    //        }
+                    //        else if (value == false) {
+                    //            return '否';
+                    //        }
+                    //    }
+                    //},
                     { label: "父亲姓名", name: "FatherName", width: 100, align: "center" },
                     { label: "身份证号", name: "OneIdCardNo", width: 100, align: "center" },
                     { label: "父亲电话", name: "FatherPhone", width: 100, align: "center" },
-                    { label: "户籍地址", name: "OneDomicile", width: 100, align: "center" },
-                    { label: "现住址", name: "OneAddress", width: 100, align: "center" },
+                    //{ label: "户籍地址", name: "OneDomicile", width: 100, align: "center" },
+                    //{ label: "现住址", name: "OneAddress", width: 100, align: "center" },
                     { label: "母亲姓名", name: "MatherName", width: 100, align: "center" },
                     { label: "身份证号", name: "TwoIdCardNo", width: 100, align: "center" },
                     { label: "母亲电话", name: "MatherPhone", width: 100, align: "center" },
-                    { label: "户籍地址", name: "TwoDomicile", width: 100, align: "center" },
-                    { label: "现住址", name: "TwoAddress", width: 100, align: "center" },
+                    //{ label: "户籍地址", name: "TwoDomicile", width: 100, align: "center" },
+                    //{ label: "现住址", name: "TwoAddress", width: 100, align: "center" },
                     { label: "监护人姓名", name: "GuardianName", width: 100, align: "center" },
                     { label: "身份证号", name: "GuardianIdCardNo", width: 100, align: "center" },
                     { label: "监护人电话", name: "GuardianPhone", width: 100, align: "center" },
-                    { label: "户籍地址", name: "GuardianDomicile", width: 100, align: "center" },
+                    //{ label: "户籍地址", name: "GuardianDomicile", width: 100, align: "center" },
                     { label: "现住址", name: "GuardianAddress", width: 100, align: "center" },
                     {
                         label: "家庭出身", name: "FamilyOriginNo", width: 100, align: "center",
@@ -460,24 +483,36 @@ var bootstrap = function ($, learun) {
                         }
                     },
                     {
-                        label: "本专科", name: "GraduateNo", width: 100, align: "center",
+                        label: "培养层次", name: "PieceCultivateWay", width: 100, align: "center",
                         formatterAsync: function (callback, value, row, op, $cell) {
                             learun.clientdata.getAsync('dataItem', {
                                 key: value,
-                                code: 'CollegeType',
+                                code: 'EducationLevel',
                                 callback: function (_data) {
                                     callback(_data.text);
                                 }
                             });
                         }
                     },
-                    { label: "毕业证号", name: "DiplomaNo", width: 100, align: "center" },
+                    //{
+                    //    label: "本专科", name: "GraduateNo", width: 100, align: "center",
+                    //    formatterAsync: function (callback, value, row, op, $cell) {
+                    //        learun.clientdata.getAsync('dataItem', {
+                    //            key: value,
+                    //            code: 'CollegeType',
+                    //            callback: function (_data) {
+                    //                callback(_data.text);
+                    //            }
+                    //        });
+                    //    }
+                    //},
                     {
                         label: "毕业日期", name: "GraduateYear", width: 100, align: "center",
                         formatter: function (cellvalue) {
                             return learun.formatDate(cellvalue, 'yyyy-MM-dd');
                         }
                     },
+                    { label: "毕业证号", name: "DiplomaNo", width: 100, align: "center" },
                     { label: "毕业证书备注", name: "DiplomaRemark", width: 100, align: "center" },
                     //{
                     //    label: "入党时间", name: "BankCard", width: 100, align: "center",
@@ -491,10 +526,10 @@ var bootstrap = function ($, learun) {
                     //        return learun.formatDate(cellvalue, 'yyyy-MM-dd');
                     //    }
                     //},
-                    { label: "校内地址", name: "InSchoolAddress", width: 100, align: "center" },
-                    { label: "校内电话", name: "InSchoolTelephone", width: 100, align: "center" },
-                    { label: "QQ", name: "QQ", width: 100, align: "center" },
-                    { label: "特长", name: "GoodAt", width: 100, align: "center" },
+                    //{ label: "校内地址", name: "InSchoolAddress", width: 100, align: "center" },
+                    //{ label: "校内电话", name: "InSchoolTelephone", width: 100, align: "center" },
+                    //{ label: "QQ", name: "QQ", width: 100, align: "center" },
+                    //{ label: "特长", name: "GoodAt", width: 100, align: "center" },
                     { label: "备注", name: "Remark", width: 200, align: "center" },
                     {
                         label: "异动状态", name: "MoveStatus", width: 80, align: "center",

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasic/StuInfoBasicEntity.cs

@@ -377,6 +377,11 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         [Column("MATHERNAME")]
         public string MatherName { get; set; }
         /// <summary>
+        /// 档案是否自带
+        /// </summary>
+        [Column("ISARCHIVES")]
+        public string IsArchives { get; set; }
+        /// <summary>
         /// 档案所在地
         /// </summary>
         [Column("MATHERUNIT")]