【增加】个人信息完善：增加年度考核结果管理；

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

@@ -21,7 +21,8 @@
     #tab4 > .lr-scroll-box,
     #tab5 > .lr-scroll-box,
     #tab6 > .lr-scroll-box,
-    #tab7 > .lr-scroll-box {
+    #tab7 > .lr-scroll-box,
+    #tab8 > .lr-scroll-box {
         height: 100%;
         width: 100%;
     }
@@ -108,29 +109,29 @@
             <input id="PhoneOfLinkman" type="text" class="form-control" checkexpession="NotNull" />
         </div>
         @*<div class="col-xs-4 lr-form-item" data-table="EmpInfo">
-                <div class="lr-form-item-title">健康状况</div>
-                <div id="HealthStatusNo"></div>
-            </div>
-            <div class="col-xs-4 lr-form-item" data-table="EmpInfo">
-                <div class="lr-form-item-title">家庭出身</div>
-                <div id="FamilyOriginNo"></div>
-            </div>
-            <div class="col-xs-4 lr-form-item" data-table="EmpInfo">
-                <div class="lr-form-item-title">港澳台侨</div>
-                <div id="OverseasChineseNo"></div>
-            </div>*@
+            <div class="lr-form-item-title">健康状况</div>
+            <div id="HealthStatusNo"></div>
+        </div>
+        <div class="col-xs-4 lr-form-item" data-table="EmpInfo">
+            <div class="lr-form-item-title">家庭出身</div>
+            <div id="FamilyOriginNo"></div>
+        </div>
+        <div class="col-xs-4 lr-form-item" data-table="EmpInfo">
+            <div class="lr-form-item-title">港澳台侨</div>
+            <div id="OverseasChineseNo"></div>
+        </div>*@
         @*<div class="col-xs-4 lr-form-item" data-table="EmpInfo">
-                <div class="lr-form-item-title">户籍省份</div>
-                <div id="ProvinceNo"></div>
-            </div>
-            <div class="col-xs-4 lr-form-item" data-table="EmpInfo">
-                <div class="lr-form-item-title">户籍地市</div>
-                <div id="CityNo"></div>
-            </div>
-            <div class="col-xs-4 lr-form-item" data-table="EmpInfo">
-                <div class="lr-form-item-title">户籍县区</div>
-                <div id="RegionNo"></div>
-            </div>*@
+            <div class="lr-form-item-title">户籍省份</div>
+            <div id="ProvinceNo"></div>
+        </div>
+        <div class="col-xs-4 lr-form-item" data-table="EmpInfo">
+            <div class="lr-form-item-title">户籍地市</div>
+            <div id="CityNo"></div>
+        </div>
+        <div class="col-xs-4 lr-form-item" data-table="EmpInfo">
+            <div class="lr-form-item-title">户籍县区</div>
+            <div id="RegionNo"></div>
+        </div>*@
         <div class="col-xs-12 lr-form-item" data-table="EmpInfo">
             <div class="lr-form-item-title">户籍地址</div>
             <input id="LocusOfResidence" type="text" class="form-control" />
@@ -167,9 +168,9 @@
             <div id="F_DepartmentId" isvalid="yes" checkexpession="NotNull"></div>
         </div>
         @*<div class="col-xs-4 lr-form-item" data-table="EmpInfo">
-                <div class="lr-form-item-title">系部</div>
-                <div id="DeptNo"></div>
-            </div>*@
+            <div class="lr-form-item-title">系部</div>
+            <div id="DeptNo"></div>
+        </div>*@
         <div class="col-xs-4 lr-form-item" data-table="EmpInfo">
             <div class="lr-form-item-title">岗位类别</div>
             <div id="EmpSortNo"></div>
@@ -282,6 +283,18 @@
             <div class="lr-form-item-title">职称获得时间</div>
             <input id="ProfessionalTitleGetTime" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ dateFmt:'yyyy-MM-dd',onpicked: function () { $('#ProfessionalTitleGetTime').trigger('change'); } })" />
         </div>
+        <div class="col-xs-4 lr-form-item" data-table="EmpInfo">
+            <div class="lr-form-item-title">考核时间</div>
+            <input id="AssessTime" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ dateFmt:'yyyy-MM-dd',onpicked: function () { $('#AssessTime').trigger('change'); } })" />
+        </div>
+        <div class="col-xs-4 lr-form-item" data-table="EmpInfo">
+            <div class="lr-form-item-title">考核年度</div>
+            <input id="AssessYear" type="text" class="form-control" />
+        </div>
+        <div class="col-xs-4 lr-form-item" data-table="EmpInfo">
+            <div class="lr-form-item-title">考核结果</div>
+            <input id="AssessResult" type="text" class="form-control" />
+        </div>
         <div class="col-xs-12 lr-form-item">
             <div class="lr-form-item-title lr-title">学历学位信息</div>
         </div>
@@ -393,9 +406,9 @@
             <div id="Photo"></div>
         </div>
         @*<div class="col-xs-12 lr-form-item" data-table="EmpInfo">
-                <div class="lr-form-item-title">教师简介</div>
-                <textarea id="resume" class="form-control" style="height:200px;"></textarea>
-            </div>*@
+            <div class="lr-form-item-title">教师简介</div>
+            <textarea id="resume" class="form-control" style="height:200px;"></textarea>
+        </div>*@
 
         <div class="col-xs-12 lr-form-item">
             <div class="lr-form-item-title">教师简介</div>

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

@@ -104,7 +104,7 @@ var bootstrap = function ($, learun) {
                     id: 'form',
                     title: '新增',
                     url: top.$.rootUrl + '/EducationalAdministration/EmpInfo/Form',
-                    width: 1000,
+                    width: 1200,
                     height: 800,
                     callBack: function (id) {
                         return top[id].acceptClick(refreshGirdData);
@@ -128,7 +128,7 @@ var bootstrap = function ($, learun) {
                         id: 'form',
                         title: '编辑',
                         url: top.$.rootUrl + '/EducationalAdministration/EmpInfo/Form?keyValue=' + keyValue,
-                        width: 1000,
+                        width: 1200,
                         height: 800,
                         callBack: function (id) {
                             return top[id].acceptClick(refreshGirdData);

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

@@ -19,6 +19,7 @@
             <li><a data-value="tab5">教师部门变更记录</a></li>
             <li><a data-value="tab6">家庭情况</a></li>
             <li><a data-value="tab7">教师聘任变更记录</a></li>
+            <li><a data-value="tab8">年度考核结果管理</a></li>
         }
     </ul>
     <div class="tab-content" id="lr_tab_content">
@@ -831,6 +832,9 @@
         <div class="tab-pane" id="tab7">
             <iframe id="PM_PositionChange" width="100%" scrolling="no" height="100%" frameborder="0"></iframe>
         </div>
+        <div class="tab-pane" id="tab8">
+            <iframe id="PM_YearAssess" width="100%" scrolling="no" height="100%" frameborder="0"></iframe>
+        </div>
     </div>
 
 </div>

Learun.Framework.Ultimate V7/Learun.Application.Web/Views/UserCenter/IndexInTeacher.js

@@ -22,6 +22,7 @@ var bootstrap = function ($, learun) {
             $("#PM_Resume").attr("src", "/EducationalAdministration/PM_Resume/Index?empId=" + NewEmpId);
             $("#PM_FamilySituation").attr("src", "/EducationalAdministration/PM_FamilySituation/Index?empId=" + NewEmpId);
             $("#PM_PositionChange").attr("src", "/EducationalAdministration/PM_PositionChange/Index?empId=" + NewEmpId);
+            $("#PM_YearAssess").attr("src", "/EducationalAdministration/PM_YearAssess/Index?empId=" + NewEmpId);
 
             // 显示信息选项卡
             $('#tablist').lrFormTabEx();