Merge branch '长阳分支中职' of http://123.57.209.16:3000/bjquanjiang/DigitalScholl into 长阳分支中职

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

@@ -20,9 +20,9 @@
         <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="lr-form-item-title">通知书号<font face="宋体">*</font></div>
-        <input id="NoticeNo" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
-    </div>*@
+            <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">学号</div>
         <input id="ProvinceCode" type="text" class="form-control" />
@@ -52,12 +52,20 @@
         <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-4 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">健康状况</div>
-        <div id="HealthStatusNo"></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">报到日期<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-12 lr-form-item" data-table="StuInfoBasic">
         <div class="lr-form-item-title">户口分类</div>
@@ -83,6 +91,10 @@
         <div class="lr-form-item-title">E-mail</div>
         <input id="EMail" 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">家庭地址<font face="宋体">*</font></div>
         <input id="MailAddress" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
@@ -111,6 +123,22 @@
         <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">系部<font face="宋体">*</font></div>
+        <div id="DeptNo" 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="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>
+        <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">年级<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">实习状态</div>
         <div id="InternshipStatus" type="text" class="form-control"></div>
@@ -167,69 +195,33 @@
         <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>
-    </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="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-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-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="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">系所<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="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-12 lr-form-item" data-table="StuInfoBasic">
         <div class="lr-form-item-title">特长</div>
         <input id="GoodAt" type="text" class="form-control" />
@@ -238,6 +230,14 @@
         <div class="lr-form-item-title">备注</div>
         <textarea id="Remark" class="form-control" style="height: 100px;"></textarea>
     </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="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-12 lr-form-item" data-table="StuInfoBasic">
         <div class="lr-form-item-title">毕业证书备注</div>
         <input id="DiplomaRemark" type="text" class="form-control" />

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

@@ -20,9 +20,9 @@
         <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="lr-form-item-title">通知书号<font face="宋体">*</font></div>
-        <input id="NoticeNo" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
-    </div>*@
+            <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">学号</div>
         <input id="ProvinceCode" type="text" class="form-control" />
@@ -52,12 +52,20 @@
         <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-4 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">健康状况</div>
-        <div id="HealthStatusNo"></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">报到日期<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-12 lr-form-item" data-table="StuInfoBasic">
         <div class="lr-form-item-title">户口分类</div>
@@ -83,6 +91,10 @@
         <div class="lr-form-item-title">E-mail</div>
         <input id="EMail" 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">家庭地址<font face="宋体">*</font></div>
         <input id="MailAddress" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
@@ -111,6 +123,22 @@
         <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">系部<font face="宋体">*</font></div>
+        <div id="DeptNo" 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="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>
+        <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">年级<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">实习状态</div>
         <div id="InternshipStatus" type="text" class="form-control"></div>
@@ -134,15 +162,15 @@
         <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">港澳台侨</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>
@@ -168,69 +196,33 @@
         <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>
-    </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="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-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-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="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">系所<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="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-12 lr-form-item" data-table="StuInfoBasic">
         <div class="lr-form-item-title">特长</div>
         <input id="GoodAt" type="text" class="form-control" />
@@ -239,6 +231,14 @@
         <div class="lr-form-item-title">备注</div>
         <textarea id="Remark" class="form-control" style="height: 100px;"></textarea>
     </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="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-12 lr-form-item" data-table="StuInfoBasic">
         <div class="lr-form-item-title">毕业证书备注</div>
         <input id="DiplomaRemark" type="text" class="form-control" />

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

@@ -30,11 +30,7 @@
                     <ul class="userSec1R">
                         <li>性 &nbsp; &nbsp; &nbsp; 别 : {{studentInfo.GenderNo | sex}}</li>
                         <li>出生日期 : {{studentInfo.Birthday | date}}</li>
-                        <li>联系电话 : {{studentInfo.mobile}}</li>
                         <li>校 &nbsp; &nbsp; &nbsp; 区 : {{baseInfo.companyId | company}}</li>
-                        <li>学 &nbsp; &nbsp; &nbsp; 号 : {{studentInfo.StuNo}}</li>
-                        <li>本 &nbsp;专 &nbsp;科 : {{studentInfo.GraduateNo | graduateNo}}</li>
-                        <li>年 &nbsp; &nbsp; &nbsp; 级 : {{studentInfo.Grade}}</li>
                     </ul>
                 </div>
             </div>
@@ -47,23 +43,16 @@
                         <li>民  族 : {{studentInfo.NationalityNo |nationalityNo}}</li>
                         <li>政治面貌 : {{studentInfo.PartyFaceNo | partyFaceNo}}</li>
                         <li>身份证号 : {{studentInfo.IdentityCardNo}}  </li>
-                        <li>E-mail : {{studentInfo.EMail}}</li>
-                        <li>户 籍  省 : {{studentInfo.F_ProvinceId | province}} </li>
-                        <li>户籍地市 : {{studentInfo.F_CityId | city}} </li>
-                        <li>户籍县区 : {{studentInfo.F_CountyId | area}}    </li>
-                        <li>户籍地址 : {{studentInfo.FatherUnit}}</li>
+                        <li>户口所在地 : {{studentInfo.FatherUnit}}</li>
                     </ul>
                 </div>
 
                 <div class="userSec2Box">
                     <div class="userSec2T">家庭情况  <i class="fa fa-angle-right"></i></div>
                     <ul class="userSec2List">
-                        <li>父亲姓名 : {{studentInfo.FatherName}} </li>
-                        <li>父亲电话 : {{studentInfo.FatherPhone}} </li>
-                        <li>母亲姓名 : {{studentInfo.MatherName}}</li>
-                        <li> 母亲电话 : {{studentInfo.MatherPhone}}</li>
-                        <li>港澳台侨 : {{studentInfo.OverseasChineseNo | overseasChineseNo}}  </li>
-                        <li>健康状况 : {{studentInfo.HealthStatusNo | healthStatusNo}}</li>
+                        <li>监护人姓名 : {{studentInfo.Guardian}}</li>
+                        <li>监护人联系电话 : {{studentInfo.GuardianPhone}}</li>
+                        <li>与监护人关系 : {{studentInfo.GuardianType |guardiantype}}</li>
                         <li>邮政编码 : {{studentInfo.PostalCode}}</li>
                         <li>家庭地址 : {{studentInfo.MailAddress}}</li>
                     </ul>
@@ -72,25 +61,25 @@
                 <div class="userSec2Box">
                     <div class="userSec2T">学籍信息  <i class="fa fa-angle-right"></i></div>
                     <ul class="userSec2List">
-                        <li>通知书号 : {{studentInfo.NoticeNo}}</li>
-                        <li> 考  生  号 : {{studentInfo.ksh}}</li>
-                        <li>系所 : {{studentInfo.DeptNo | deptNo}}  </li>
+                        <li>学 &nbsp; 籍 &nbsp; 号 : {{studentInfo.StuCode}}</li>
+                        <li>学  号 : {{studentInfo.StuNo}}</li>
+                        <li>年 &nbsp; &nbsp; &nbsp; 级 : {{studentInfo.Grade}}</li>
+                        <li>系 部 : {{studentInfo.DeptNo | deptNo}}  </li>
                         <li>专 业 : {{studentInfo.MajorNo | majorNo}}</li>
                         <li>班       级 : {{studentInfo.ClassNo | class}}   </li>
-                        <li>报到日期 : {{studentInfo.RegisterDate | date}} </li>
-                        <li>入学年月 : {{studentInfo.EntranceDate | date}}</li>
-                        <li>入党时间 : {{studentInfo.JoinPartyDate | date}}</li>
                         <li>入团时间 : {{studentInfo.JoinLeagueDate | date}}  </li>
-                        <li>档案地址 : {{studentInfo.MatherUnit}}</li>
+                        <li>现有学历 : {{studentInfo.GraduateNo | graduateNo}}</li>
+                        <li>报到日期 : {{studentInfo.RegisterDate | date}}</li>
+                        <li>入学年月 : {{studentInfo.EntranceDate | date}}</li>
                     </ul>
                 </div>
 
                 <div class="userSec2Box">
                     <div class="userSec2T">联系方式  <i class="fa fa-angle-right"></i></div>
                     <ul class="userSec2List">
-                        <li>校内地址 : {{studentInfo.InSchoolAddress}}</li>
+                        <li>联系电话 : {{studentInfo.mobile}}</li>
                         <li> QQ : {{studentInfo.QQ}}</li>
-                        <li>校内电话 : {{studentInfo.InSchoolTelephone}}</li>
+                        <li>E-mail : {{studentInfo.EMail}}</li>
                     </ul>
                 </div>
             </div>
@@ -110,12 +99,14 @@
             },
             methods: {
                 getData: function () {
-                    $.get('/UserCenter/GetStudentInfo?stuId=' + keyValue, function (ref) {
-                        this.studentInfo = ref.data.userInfo;
-                        this.baseInfo = ref.data.basicInfo;
-                        this.headUrl = ref.data.userInfo.Photo;
+                    $.get('/UserCenter/GetStudentInfo?stuId=' + keyValue,
+                        function (ref) {
+                            this.studentInfo = ref.data.userInfo;
+                            this.baseInfo = ref.data.basicInfo;
+                            this.headUrl = ref.data.userInfo.Photo;
 
-                    }.bind(this), "json");
+                        }.bind(this),
+                        "json");
                 },
                 getUrl: function () {
                     var loginInfo = top.learun.clientdata.get(['userinfo']);
@@ -133,26 +124,28 @@
                 },
                 company: function (value) {
                     var result;
-                    top.learun.clientdata.getAsync('custmerData', {
-                        sync: true,
-                        url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'company',
-                        key: value,
-                        keyId: 'f_companyid',
-                        callback: function (_data) {
-                            result = _data.f_fullname;
-                        }
-                    });
+                    top.learun.clientdata.getAsync('custmerData',
+                        {
+                            sync: true,
+                            url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'company',
+                            key: value,
+                            keyId: 'f_companyid',
+                            callback: function (_data) {
+                                result = _data.f_fullname;
+                            }
+                        });
                     return result;
                 },
                 graduateNo: function (value) {
                     var result;
-                    top.learun.clientdata.getAsync('dataItem', {
-                        key: value,
-                        code: 'CollegeType',
-                        callback: function (_data) {
-                            result = _data.text;
-                        }
-                    });
+                    top.learun.clientdata.getAsync('dataItem',
+                        {
+                            key: value,
+                            code: 'CollegeType',
+                            callback: function (_data) {
+                                result = _data.text;
+                            }
+                        });
                     return result;
                 },
                 date: function (value) {
@@ -166,24 +159,38 @@
                 },
                 nationalityNo: function (value) {
                     var result;
-                    top.learun.clientdata.getAsync('dataItem', {
-                        key: value,
-                        code: 'National',
-                        callback: function (_data) {
-                            result = _data.text;
-                        }
-                    });
+                    top.learun.clientdata.getAsync('dataItem',
+                        {
+                            key: value,
+                            code: 'National',
+                            callback: function (_data) {
+                                result = _data.text;
+                            }
+                        });
                     return result;
                 },
                 partyFaceNo: function (value) {
                     var result;
-                    top.learun.clientdata.getAsync('dataItem', {
-                        key: value,
-                        code: 'BCdPartyFace',
-                        callback: function (_data) {
-                            result = _data.text;
-                        }
-                    });
+                    top.learun.clientdata.getAsync('dataItem',
+                        {
+                            key: value,
+                            code: 'PolityStatus',
+                            callback: function (_data) {
+                                result = _data.text;
+                            }
+                        });
+                    return result;
+                },
+                guardiantype: function (value) {
+                    var result;
+                    top.learun.clientdata.getAsync('dataItem',
+                        {
+                            key: value,
+                            code: 'GuardianType',
+                            callback: function (_data) {
+                                result = _data.text;
+                            }
+                        });
                     return result;
                 },
                 province: function (value) {

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

@@ -159,7 +159,7 @@ var bootstrap = function ($, learun) {
                     }
                     learun.layerForm({
                         id: 'form',
-                        title: '编辑',
+                        title: '查看',
                         url: top.$.rootUrl + '/EducationalAdministration/StuInfoBasic/FormView?keyValue=' + keyValue,
                         width: 1162,
                         height: 600,
@@ -437,7 +437,18 @@ var bootstrap = function ($, learun) {
                         formatter: function (cellvalue) {
                             return cellvalue == "1" ? "<span class=\"label label-success\">已审核</span>" : "<span class=\"label label-danger\">未审核</span>";
                         }
+                    },
+                    {
+                        label: "是否上传头像", name: "Photo", width: 80, align: "center",
+                        formatter: function (cellvalue) {
+                            if (cellvalue != null && cellvalue != "" && cellvalue != undefined) {
+                                return cellvalue = "<span class=\"label label-success\">是</span>";
+                            } else {
+                                return cellvalue= "<span class=\"label label-danger\">否</span>";
+                            }
+                        }
                     }
+
                 ],
                 mainId: 'StuId',
                 isPage: true,

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OAModule/Views/ResourceFile/Index.cshtml

@@ -31,6 +31,7 @@
                         <div id="datesearch" class="datetime"></div>
                     </div>
                     <div class="lr-layout-tool-item">
+                        <span type="text" style="cursor:pointer;">文件大小不能超过200M</span>
                         <input id="txt_Keyword" type="text" class="form-control" placeholder="请输入要查询关键字" />
                     </div>
                     <div class="lr-layout-tool-item">

Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj

@@ -6713,6 +6713,7 @@
     <Folder Include="Areas\LR_Desktop\Views\Shared\" />
     <Folder Include="Areas\LR_ReportTestModule\Models\" />
     <Folder Include="Areas\LR_ReportTestModule\Views\Shared\" />
+    <Folder Include="Areas\LR_SystemModule\Views\CMS\" />
     <Folder Include="Areas\LR_WebChatModule\Views\User\" />
     <Folder Include="Areas\LR_WorkFlowModule\Views\WfEngine\" />
   </ItemGroup>

Learun.Framework.Ultimate V7/Learun.Application.Web/Views/LR_Content/script/lr-form.js

@@ -130,7 +130,7 @@
                         break;
                     case "datepicker":
                         var _dateFmt = $obj.attr('data-dateFmt') || 'yyyy-MM-dd';
-                        $obj.val(learun.formatDate(value, _dateFmt.replace('HH','hh')));
+                        $obj.val(learun.formatDate(value, _dateFmt.replace('HH', 'hh')));
                         break;
                     case "lr-Uploader":
                         $obj.lrUploaderSet(value);
@@ -865,6 +865,11 @@
                                 if ($(this).hasClass('edui-default')) {
                                     if ($(this)[0].ue) {
                                         point.text = $(this)[0].ue.getContent(null, null, true);
+                                    } else {
+                                        if ($(this)[0].getAttribute('id') == 'edui1_iframeholder') {
+                                            var idNowIframe = $(this)[0].getElementsByTagName('iframe')[0].getAttribute('id')
+                                            point.text = window.frames[idNowIframe].contentWindow.document.body.innerHTML
+                                        }
                                     }
                                 }
                                 else {

Learun.Framework.Ultimate V7/Learun.Application.Web/Views/UserCenter/Index.cshtml

@@ -95,11 +95,14 @@
                                         <ul class="userSec1R">
                                             <li>性 &nbsp; &nbsp; &nbsp; 别 : {{studentInfo.GenderNo | sex}}</li>
                                             <li>出生日期 : {{studentInfo.Birthday | date}}</li>
+                                            <li>校 &nbsp; &nbsp; &nbsp; 区 : {{baseInfo.companyId | company}}</li>
+                                            @*<li>性 &nbsp; &nbsp; &nbsp; 别 : {{studentInfo.GenderNo | sex}}</li>
+                                            <li>出生日期 : {{studentInfo.Birthday | date}}</li>
                                             <li>联系电话 : {{studentInfo.mobile}}</li>
                                             <li>校 &nbsp; &nbsp; &nbsp; 区 : {{baseInfo.companyId | company}}</li>
                                             <li>学 &nbsp; &nbsp; &nbsp; 号 : {{studentInfo.StuNo}}</li>
                                             <li>本 &nbsp;专 &nbsp;科 : {{studentInfo.GraduateNo | graduateNo}}</li>
-                                            <li>年 &nbsp; &nbsp; &nbsp; 级 : {{studentInfo.Grade}}</li>
+                                            <li>年 &nbsp; &nbsp; &nbsp; 级 : {{studentInfo.Grade}}</li>*@
                                         </ul>
                                     </div>
                                 </div>
@@ -112,32 +115,51 @@
                                             <li>民  族 : {{studentInfo.NationalityNo |nationalityNo}}</li>
                                             <li>政治面貌 : {{studentInfo.PartyFaceNo | partyFaceNo}}</li>
                                             <li>身份证号 : {{studentInfo.IdentityCardNo}}  </li>
+                                            <li>户口所在地 : {{studentInfo.FatherUnit}}</li>
+                                            @*<li>民  族 : {{studentInfo.NationalityNo |nationalityNo}}</li>
+                                            <li>政治面貌 : {{studentInfo.PartyFaceNo | partyFaceNo}}</li>
+                                            <li>身份证号 : {{studentInfo.IdentityCardNo}}  </li>
                                             <li>E-mail : {{studentInfo.EMail}}</li>
                                             <li>户 籍  省 : {{studentInfo.F_ProvinceId | province}} </li>
                                             <li>户籍地市 : {{studentInfo.F_CityId | city}} </li>
                                             <li>户籍县区 : {{studentInfo.F_CountyId | area}}    </li>
-                                            <li>户籍地址 : {{studentInfo.FatherUnit}}</li>
+                                            <li>户籍地址 : {{studentInfo.FatherUnit}}</li>*@
                                         </ul>
                                     </div>
 
                                     <div class="userSec2Box">
                                         <div class="userSec2T">家庭情况  <i class="fa fa-angle-right"></i></div>
                                         <ul class="userSec2List">
-                                            <li>父亲姓名 : {{studentInfo.FatherName}} </li>
+                                            <li>监护人姓名 : {{studentInfo.Guardian}}</li>
+                                            <li>监护人联系电话 : {{studentInfo.GuardianPhone}}</li>
+                                            <li>与监护人关系 : {{studentInfo.GuardianType |guardiantype}}</li>
+                                            <li>邮政编码 : {{studentInfo.PostalCode}}</li>
+                                            <li>家庭地址 : {{studentInfo.MailAddress}}</li>
+                                            @*<li>父亲姓名 : {{studentInfo.FatherName}} </li>
                                             <li>父亲电话 : {{studentInfo.FatherPhone}} </li>
                                             <li>母亲姓名 : {{studentInfo.MatherName}}</li>
                                             <li> 母亲电话 : {{studentInfo.MatherPhone}}</li>
                                             <li>港澳台侨 : {{studentInfo.OverseasChineseNo | overseasChineseNo}}  </li>
                                             <li>健康状况 : {{studentInfo.HealthStatusNo | healthStatusNo}}</li>
                                             <li>邮政编码 : {{studentInfo.PostalCode}}</li>
-                                            <li>通信地址 : {{studentInfo.MailAddress}}</li>
+                                            <li>通信地址 : {{studentInfo.MailAddress}}</li>*@
                                         </ul>
                                     </div>
 
                                     <div class="userSec2Box">
                                         <div class="userSec2T">学籍信息  <i class="fa fa-angle-right"></i></div>
                                         <ul class="userSec2List">
-                                            <li>通知书号 : {{studentInfo.NoticeNo}}</li>
+                                            <li>学 &nbsp; 籍 &nbsp; 号 : {{studentInfo.StuCode}}</li>
+                                            <li>学  号 : {{studentInfo.StuNo}}</li>
+                                            <li>年 &nbsp; &nbsp; &nbsp; 级 : {{studentInfo.Grade}}</li>
+                                            <li>系 部 : {{studentInfo.DeptNo | deptNo}}  </li>
+                                            <li>专 业 : {{studentInfo.MajorNo | majorNo}}</li>
+                                            <li>班       级 : {{studentInfo.ClassNo | class}}   </li>
+                                            <li>入团时间 : {{studentInfo.JoinLeagueDate | date}}  </li>
+                                            <li>现有学历 : {{studentInfo.GraduateNo | graduateNo}}</li>
+                                            <li>报到日期 : {{studentInfo.RegisterDate | date}}</li>
+                                            <li>入学年月 : {{studentInfo.EntranceDate | date}}</li>
+                                            @*<li>通知书号 : {{studentInfo.NoticeNo}}</li>
                                             <li> 考  生  号 : {{studentInfo.ksh}}</li>
                                             <li>系所 : {{studentInfo.DeptNo | deptNo}}  </li>
                                             <li>专 业 : {{studentInfo.MajorNo | majorNo}}</li>
@@ -146,16 +168,19 @@
                                             <li>入学年月 : {{studentInfo.EntranceDate | date}}</li>
                                             <li>入党时间 : {{studentInfo.JoinPartyDate | date}}</li>
                                             <li>入团时间 : {{studentInfo.JoinLeagueDate | date}}  </li>
-                                            <li>档案地址 : {{studentInfo.MatherUnit}}</li>
+                                            <li>档案地址 : {{studentInfo.MatherUnit}}</li>*@
                                         </ul>
                                     </div>
 
                                     <div class="userSec2Box">
                                         <div class="userSec2T">联系方式  <i class="fa fa-angle-right"></i></div>
                                         <ul class="userSec2List">
-                                            <li>校内地址 : {{studentInfo.InSchoolAddress}}</li>
+                                            <li>联系电话 : {{studentInfo.mobile}}</li>
+                                            <li> QQ : {{studentInfo.QQ}}</li>
+                                            <li>E-mail : {{studentInfo.EMail}}</li>
+                                            @*<li>校内地址 : {{studentInfo.InSchoolAddress}}</li>
                                             <li> QQ : {{studentInfo.QQ}}</li>
-                                            <li>校内电话 : {{studentInfo.InSchoolTelephone}}</li>
+                                            <li>校内电话 : {{studentInfo.InSchoolTelephone}}</li>*@
                                         </ul>
                                     </div>
                                 </div>
@@ -247,6 +272,18 @@
                                         });
                                         return result;
                                     },
+                                    guardiantype: function (value) {
+                                        var result;
+                                        top.learun.clientdata.getAsync('dataItem',
+                                            {
+                                                key: value,
+                                                code: 'GuardianType',
+                                                callback: function (_data) {
+                                                    result = _data.text;
+                                                }
+                                            });
+                                        return result;
+                                    },
                                     province: function (value) {
                                         var result;
                                         top.learun.clientdata.getAsync('custmerData', {

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.OA/News/NewsService.cs

@@ -202,11 +202,15 @@ namespace Learun.Application.OA
 
                 if (newEntity.IsSend == "1" && status == 2)
                 {
+                    BaseRepository()
+                        .ExecuteBySql("insert INTO LR_Base_Log(F_LogId,F_CategoryId,F_SourceContentJson) VALUES (newid(),2222,'准备开始run task') ");
                     Task.Run(async () => { sendNew(newEntity); });
                 }
             }
             catch (Exception ex)
             {
+                BaseRepository()
+                    .ExecuteBySql("insert INTO LR_Base_Log(F_LogId,F_CategoryId,F_SourceContentJson) VALUES (newid(),2222,'run task 报错"+ex.Message+"') ");
                 if (ex is ExceptionEx)
                 {
                     throw;
@@ -233,11 +237,13 @@ namespace Learun.Application.OA
                     string ports = ConfigurationManager.AppSettings["Ports"];
 
                     #endregion
+                    BaseRepository()
+                        .ExecuteBySql("insert INTO LR_Base_Log(F_LogId,F_CategoryId,F_SourceContentJson) VALUES (newid(),2222,'准备开始组装实体') ");
                     SemdNewList SendNew = new SemdNewList
                     {
                         Title = newEntity.F_FullHead,
                         SubTitle = newEntity.F_BriefHead,
-                        Content = newEntity.F_NewsContent,
+                        Content = HttpUtility.HtmlDecode(newEntity.F_NewsContent),
                         Author = newEntity.F_AuthorName,
                         Source = newEntity.F_SourceName,
                         AddDate = DateTime.Now,
@@ -248,8 +254,12 @@ namespace Learun.Application.OA
                     {
                         { "X-SS-API-KEY", ApiKey }
                     };
+                    BaseRepository()
+                        .ExecuteBySql("insert INTO LR_Base_Log(F_LogId,F_CategoryId,F_SourceContentJson) VALUES (newid(),2222,'准备开始post cms') ");
 
                     string responses = HttpMethods.HttpPosts("http://" + ports + "/api/v1/contents/" + siteId + "/" + channelId, SendNew.ToJson(), ApiId);
+                    BaseRepository()
+                        .ExecuteBySql("insert INTO LR_Base_Log(F_LogId,F_CategoryId,F_SourceContentJson) VALUES (newid(),2222,'"+HttpUtility.UrlEncode(responses)+"') ");
 
                     //#region 修改审核状态
                     //string Nid = JsonConvert.DeserializeObject<Root>(responses).value.id;
@@ -272,7 +282,8 @@ namespace Learun.Application.OA
             }
             catch (Exception ex)
             {
-
+                BaseRepository()
+                    .ExecuteBySql("insert INTO LR_Base_Log(F_LogId,F_CategoryId,F_SourceContentJson) VALUES (newid(),2222,'"+ex.Message + "') ");
             }
         }
 

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Util/Learun.Util/Web/HttpMethods.cs

@@ -152,28 +152,36 @@ namespace Learun.Util
         public static string HttpPosts(string url, string json, WebHeaderCollection header)
         {
             string result = "";
-            HttpWebRequest req = (HttpWebRequest)WebRequest.Create(url);
-            req.Method = "POST";
-            req.ContentType = "application/json;charset=UTF-8";
-            req.Headers.Add(header);
-            byte[] data = Encoding.UTF8.GetBytes(json);//把字符串转换为字节
+            try
+            {
+                HttpWebRequest req = (HttpWebRequest)WebRequest.Create(url);
+                req.Method = "POST";
+                req.ContentType = "application/json;charset=UTF-8";
+                req.Headers.Add(header);
+                byte[] data = Encoding.UTF8.GetBytes(json);//把字符串转换为字节
 
-            req.ContentLength = data.Length; //请求长度
+                req.ContentLength = data.Length; //请求长度
 
-            using (Stream reqStream = req.GetRequestStream()) //获取
-            {
-                reqStream.Write(data, 0, data.Length);//向当前流中写入字节
-                reqStream.Close(); //关闭当前流
-            }
+                using (Stream reqStream = req.GetRequestStream()) //获取
+                {
+                    reqStream.Write(data, 0, data.Length);//向当前流中写入字节
+                    reqStream.Close(); //关闭当前流
+                }
 
-            HttpWebResponse resp = (HttpWebResponse)req.GetResponse(); //响应结果
-            Stream stream = resp.GetResponseStream();
-            //获取响应内容
-            using (StreamReader reader = new StreamReader(stream, Encoding.UTF8))
+                HttpWebResponse resp = (HttpWebResponse)req.GetResponse(); //响应结果
+                Stream stream = resp.GetResponseStream();
+                //获取响应内容
+                using (StreamReader reader = new StreamReader(stream, Encoding.UTF8))
+                {
+                    result = reader.ReadToEnd();
+                }
+                return result;
+            }
+            catch (Exception e)
             {
-                result = reader.ReadToEnd();
+                throw e;
             }
-            return result;
+           
         }
     }
 }