教师个人信息列表展示

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

@@ -61,7 +61,7 @@ var bootstrap = function ($, learun) {
             $('#CheckMark').lrDataItemSelect({ code: 'YesOrNoInt' });
             //学位
             $('#DegreeNo').lrDataItemSelect({ code: 'BCdDegree' });
-            
+
             // 部门选择
             $('#F_DepartmentId').lrselect({
                 type: 'tree',
@@ -414,7 +414,7 @@ var bootstrap = function ($, learun) {
                     },
                     { label: "是否授课", name: "IsHasLesson", width: 100, align: "left", formatter: function (cellvalue) { return cellvalue == true ? "是" : "否" } },
                     {
-                        label: "出生日期", name: "Birthday", width: 100, align: "left" ,
+                        label: "出生日期", name: "Birthday", width: 100, align: "left",
                         formatter: function (value) {
                             return learun.formatDate(value, 'yyyy-MM-dd');
                         }
@@ -597,8 +597,61 @@ var bootstrap = function ($, learun) {
                     },
                     { label: "来校时间", name: "InSchoolDate", width: 100, align: "left" },
                     { label: "紧急联系人", name: "Linkman", width: 100, align: "left" },
-                    { label: "联系人关系", name: "RelationOfLinkman", width: 100, align: "left" },
                     { label: "联系人电话", name: "PhoneOfLinkman", width: 100, align: "left" },
+                    {
+                        label: "教师资格种类", name: "TeacherQualifications", width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('dataItem', {
+                                key: value,
+                                code: 'TeacherQualifications',
+                                callback: function (_data) {
+                                    callback(_data.text);
+                                }
+                            });
+                        }
+                    },
+                    { label: "其他教师资格种类", name: "OtherTeacherQualifications", width: 100, align: "left" },
+                    { label: "教师资格种类", name: "TeacherQualificationsNo", width: 100, align: "left" },
+                    { label: "现任职务", name: "Title", width: 100, align: "left" },
+                    { label: "参加工作时间", name: "AddWorkDate", width: 100, align: "left" },
+                    {
+                        label: "入党时间", name: "JoinPartyTime", width: 100, align: "left",
+                        formatter: function(value) {
+                            return learun.formatDate(value, 'yyyy-MM-dd');
+                        }
+                    },
+                    {
+                        label: "转为正式党员日期", name: "OfficialPartyTime", width: 100, align: "left",
+                        formatter: function (value) {
+                            return learun.formatDate(value, 'yyyy-MM-dd');
+                        }
+                    },
+                    {
+                        label: "婚姻状况", name: "Marital", width: 100, align: "left" ,
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('dataItem', {
+                                key: value,
+                                code: 'MaritalType',
+                                callback: function (_data) {
+                                    callback(_data.text);
+                                }
+                            });
+                        }
+                    },
+                    { label: "档案号", name: "FileNumber", width: 100, align: "left" },
+                    {
+                        label: "经费渠道", name: "EmployType", width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('dataItem', {
+                                key: value,
+                                code: 'FundingChannels',
+                                callback: function (_data) {
+                                    console.log(_data)
+                                    callback(_data.text);
+                                }
+                            });
+                        }
+                    },
 
                 ],
                 mainId: 'EmpId',

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

@@ -574,7 +574,7 @@ var bootstrap = function ($, learun) {
                     { label: "家庭邮政编码", name: "PostalCode", width: 100, align: "left", ishide: true, },
                     { label: "其他联系方式", name: "OtherContact", width: 100, align: "left", ishide: true, },
                     { label: "成员1姓名", name: "OneName", width: 100, align: "left", ishide: true, },
-                    { label: "成员1联系电话", name: "OneMobile", width: 100, align: "left" },
+                    { label: "成员1联系电话", name: "OneMobile", width: 100, align: "left", ishide: true },
                     {
                         label: "成员1关系", name: "OneMembership", width: 100, align: "left", ishide: true,
                         formatterAsync: function (callback, value, row, op, $cell) {
@@ -633,7 +633,7 @@ var bootstrap = function ($, learun) {
                     },
                     { label: "成员1工作或学习单位", name: "OneJob", width: 100, align: "left", ishide: true, },
                     { label: "成员2姓名", name: "TwoName", width: 100, align: "left", ishide: true, },
-                    { label: "成员2联系电话", name: "TwoMobile", width: 100, align: "left" },
+                    { label: "成员2联系电话", name: "TwoMobile", width: 100, align: "left", ishide: true },
                     {
                         label: "成员2关系", name: "TwoMembership", width: 100, align: "left", ishide: true,
                         formatterAsync: function (callback, value, row, op, $cell) {