From 4c60f4a6e2557d6b15054a8d66f8d26d75e13489 Mon Sep 17 00:00:00 2001 From: dyy <807692433@qq.com> Date: Mon, 7 Nov 2022 10:45:03 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E5=A2=9E=E5=8A=A0=E3=80=91=E4=B8=AA?= =?UTF-8?q?=E4=BA=BA=E4=BF=A1=E6=81=AF=E5=AE=8C=E5=96=84=EF=BC=9A=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E5=B9=B4=E5=BA=A6=E8=80=83=E6=A0=B8=E7=BB=93=E6=9E=9C?= =?UTF-8?q?=E7=AE=A1=E7=90=86=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Views/EmpInfo/Form.cshtml | 71 +++++++++++-------- .../Views/EmpInfo/Index.js | 4 +- .../Views/UserCenter/IndexInTeacher.cshtml | 4 ++ .../Views/UserCenter/IndexInTeacher.js | 1 + 4 files changed, 49 insertions(+), 31 deletions(-) diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Form.cshtml index 3f6d33d6d..31e2a6db7 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Form.cshtml +++ b/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 @@ @*
-
健康状况
-
-
-
-
家庭出身
-
-
-
-
港澳台侨
-
-
*@ +
健康状况
+
+ +
+
家庭出身
+
+
+
+
港澳台侨
+
+
*@ @*
-
户籍省份
-
-
-
-
户籍地市
-
-
-
-
户籍县区
-
-
*@ +
户籍省份
+
+ +
+
户籍地市
+
+
+
+
户籍县区
+
+
*@
户籍地址
@@ -167,9 +168,9 @@
@*
-
系部
-
-
*@ +
系部
+
+ *@
岗位类别
@@ -282,6 +283,18 @@
职称获得时间
+
+
考核时间
+ +
+
+
考核年度
+ +
+
+
考核结果
+ +
学历学位信息
@@ -393,9 +406,9 @@
@*
-
教师简介
- -
*@ +
教师简介
+ + *@
教师简介
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Index.js index 74549be76..860a51842 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Index.js +++ b/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); diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/UserCenter/IndexInTeacher.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/UserCenter/IndexInTeacher.cshtml index 48b634318..1e54b24af 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/UserCenter/IndexInTeacher.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/UserCenter/IndexInTeacher.cshtml @@ -19,6 +19,7 @@
  • 教师部门变更记录
  • 家庭情况
  • 教师聘任变更记录
    • +
  • 年度考核结果管理
    • }
    @@ -831,6 +832,9 @@
    +
    + +
    diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/UserCenter/IndexInTeacher.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/UserCenter/IndexInTeacher.js index 7d2191494..30f774045 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/UserCenter/IndexInTeacher.js +++ b/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();