diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/FormModify.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/FormModify.cshtml index e713088b6..98656f9a3 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/FormModify.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/FormModify.cshtml @@ -231,7 +231,7 @@ -
+ @*
系部：
@@ -244,8 +244,8 @@
岗位名称：
-
-
+
*@ + @*
岗位职级：
@@ -258,7 +258,7 @@
聘任时间：
-
+
*@
编制类别：
@@ -269,11 +269,15 @@
+
进入教育系统时间：
+ +
+ @*
工龄偏移量(月)：
-
+
*@ -
+ @*
工龄(减去偏移量)：
@@ -286,22 +290,19 @@
集团龄偏移量(月)：
-
-
+
*@ + @*
集团龄(减去偏移量)：
-
-
进入教育系统时间：
- -
+
教龄偏移量(月)：
-
-
+
*@ + @*
教龄(减去偏移量)：
@@ -314,8 +315,8 @@
校龄偏移量(月)：
-
-
+
*@ + @*
校龄(减去偏移量)：
@@ -328,11 +329,15 @@
转正时间：
-
+
*@
-
+ @*
从教三十年表彰年度：
+
*@ +
+
来校时间：
+
@@ -363,10 +368,10 @@
初始学历：
-
+ @*
初始学历获取方式：
-
+
*@
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/FormModify.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/FormModify.js index 905e72216..bdbeb30fa 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/FormModify.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/FormModify.js @@ -7,12 +7,12 @@ var acceptClick; var keyValue = request('keyValue'); var isTeacher = request('isTeacher'); -var colDataItemArr = ['GenderNo', 'IsInActiveStatus', 'EmpSortNo', 'PositionLevel', 'CompilationCategory', 'ObtainWayOfHighestRecord', 'ObtainWay', 'ObtainWayOfHighestDegree', 'ObtainWayOfInitialDegree', 'JobRank', 'WorkLevel', 'EmpFullTimeNo', 'IsHasLesson']; -var colDataItemCode = ['BCdPartyFace', 'BCdNationality', 'BCdDegree', 'BCdFamilyOrigin', 'BCdForeignLanguage', 'BCdSubjectSpecies', 'BCdOverseasChinese', 'BCdHealthStatus', 'BCdTitleOfTechPost','usersexbit', 'JobStatus', 'jsgw', 'PositionLevel', 'CompilationCategory', 'ObtainWay', 'ObtainWay', 'ObtainWayOfDegree', 'ObtainWayOfDegree', 'TechnicalPost', 'TechnicalLevelOfWorker', 'EmpFullTime', 'YesOrNoBit']; -var colDataSourceArr = ['PartyFaceNo', 'NationalityNo', 'HealthStatusNo', 'FamilyOriginNo', 'OverseasChineseNo', 'F_CompanyId', 'F_DepartmentId', 'DeptNo', 'PostRank', 'HighestRecord', 'CultureDegreeNo', 'DegreeNo', 'InitialDegree', 'SubjectSpeciesNo', 'ForeignLanguageNo']; -var colDataSourceCode = ['BCdPartyFace', 'BCdNationality', 'BCdHealthStatus', 'BCdFamilyOrigin', 'BCdOverseasChinese', 'company', 'classdata', 'CdDeptInfo', 'BCdTitleOfTechPost', 'BCdCultureDegree', 'BCdCultureDegree', 'BCdDegree', 'BCdSubjectSpecies', 'BCdForeignLanguage']; -var colDataSourceValue = ['partyfaceno', 'nationalityno', 'healthstatusno', 'familyoriginno', 'overseaschineseno', 'f_companyid', 'f_departmentid', 'deptno', 'titleoftechpostno', 'culturedegreeno', 'culturedegreeno', 'degreeno', 'degreeno', 'subjectspeciesno', 'foreignlanguageno']; -var colDataSourceText = ['partyface', 'nationality', 'healthstatus', 'familyorigin', 'overseaschinesename', 'f_fullname', 'f_fullname', 'deptname', 'titleoftechpost', 'culturedegree', 'culturedegree', 'degreename', 'degreename', 'subjectspecies', 'foreignlanguagename']; +var colDataItemArr = ['OverseasChineseNo', 'FamilyOriginNo', 'HealthStatusNo', 'PartyFaceNo', 'NationalityNo', 'GenderNo', 'IsInActiveStatus', 'CompilationCategory', 'HighestRecord', 'ObtainWayOfHighestRecord', 'CultureDegreeNo', 'DegreeNo', 'ObtainWayOfHighestDegree', 'InitialDegree', 'ObtainWayOfInitialDegree', 'JobRank', 'WorkLevel', 'EmpFullTimeNo', 'IsHasLesson', 'SubjectSpeciesNo','ForeignLanguageNo']; +var colDataItemCode = ['BCdOverseasChinese', 'BCdFamilyOrigin', 'BCdHealthStatus', 'PolityStatus', 'National', 'usersexbit', 'JobStatus', 'CompilationCategory', 'RecordInSchool', 'ObtainWayOfDegree', 'RecordInSchool', 'DegreeInSchool', 'ObtainWayOfDegree', 'DegreeInSchool', 'ObtainWayOfDegree', 'TechnicalPost', 'TechnicalLevelOfWorker', 'EmpFullTime', 'YesOrNoBit', 'BCdSubjectSpecies','BCdForeignLanguage']; +var colDataSourceArr = [ 'F_CompanyId', 'F_DepartmentId']; +var colDataSourceCode = ['company', 'classdata']; +var colDataSourceValue = [ 'f_companyid', 'f_departmentid']; +var colDataSourceText = ['f_fullname', 'f_fullname']; var bootstrap = function ($, learun) { "use strict"; var ue; @@ -43,11 +43,7 @@ var bootstrap = function ($, learun) { $("#GraduateSchoolName").parent().hide(); $("#SubjectSpeciesNo").parent().hide(); $("#ForeignLanguageNo").parent().hide(); - $("#EmpSortNo").parent().hide(); $("#EmpFullTimeNo").parent().hide(); - $("#DeptNo").parent().hide(); - $("#TitleOfTechPostNo").parent().hide(); - $("#InSchoolDate").parent().hide(); $("#resume").parent().hide(); $("#Photo").parent().hide(); } diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/UserCenter/Index.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/UserCenter/Index.cshtml index d7bff517f..2d9f074fc 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/UserCenter/Index.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/UserCenter/Index.cshtml @@ -236,7 +236,7 @@ var result; top.learun.clientdata.getAsync('dataItem', { key: value, - code: 'BCdPartyFace', + code: 'PolityStatus', callback: function (_data) { result = _data.text; } @@ -374,7 +374,7 @@
  • 联系电话 : {{teacherInfo.mobile}}
  • 校       区 : {{baseInfo.companyId | company}}
  • 教职工类别 : {{teacherInfo.EmpSortNo | empSortNo}}
    • -
  • 聘任职称1 : {{teacherInfo.TitleOfTechPostNo | titleOfTechPostNo}}
    • +
  • 聘任职称: {{teacherInfo.TitleOfTechPostNo | titleOfTechPostNo}}
    • @@ -491,7 +491,7 @@ var result; top.learun.clientdata.getAsync('dataItem', { key: value, - code: 'BCdPartyFace', + code: 'PolityStatus', callback: function (_data) { result = _data.text; } @@ -606,13 +606,11 @@ }, cultureDegreeNo: function (value) { var result; - top.learun.clientdata.getAsync('custmerData', { - sync: true, - url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BCdCultureDegree', + top.learun.clientdata.getAsync('dataItem', { key: value, - keyId: 'culturedegreeno', + code: 'RecordInSchool', callback: function (_data) { - result = _data['culturedegree']; + result = _data.text; } }); return result; @@ -621,7 +619,7 @@ var result; top.learun.clientdata.getAsync('dataItem', { key: value, - code: 'BCdDegree', + code: 'DegreeInSchool', callback: function (_data) { result = _data.text; } 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 5b5c1cf67..1d9a7069d 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 @@ -222,7 +222,7 @@ var result; top.learun.clientdata.getAsync('dataItem', { key: value, - code: 'BCdPartyFace', + code: 'PolityStatus', callback: function (_data) { result = _data.text; } @@ -360,8 +360,8 @@
  • 出生日期 : {{teacherInfo.Birthday | date}}
  • 联系电话 : {{teacherInfo.mobile}}
  • 校       区 : {{baseInfo.companyId | company}}
    • -
  • 岗位类别 : {{teacherInfo.EmpSortNo | jsgw}}
    • -
  • 岗位职级 : {{teacherInfo.PostRank | titleOfTechPostNo}}
    • + @*
  • 岗位类别 : {{teacherInfo.EmpSortNo | jsgw}}
    • +
  • 岗位职级 : {{teacherInfo.PostRank | titleOfTechPostNo}}
    • *@ @@ -395,28 +395,28 @@ @@ -428,7 +428,7 @@
  • 最高学历获取方式 : {{teacherInfo.ObtainWayOfHighestRecord | obtainWay}}
  • 学制（最高学历） : {{teacherInfo.EducationalSystem}}
  • 初始学历 : {{teacherInfo.CultureDegreeNo | cultureDegreeNo}}
    • -
  • 初始学历获取方式 : {{teacherInfo.ObtainWay | obtainWay}}
    • + @*
  • 初始学历获取方式 : {{teacherInfo.ObtainWay | obtainWay}}
    • *@
  • 最高学位 : {{teacherInfo.DegreeNo | degreeNo}}
  • 最高学位取得时间 : {{teacherInfo.HighestDegreeGetTime | date}}
  • 最高学位获取方式 : {{teacherInfo.ObtainWayOfHighestDegree | obtainWayOfDegree}}
    • @@ -540,7 +540,7 @@ var result; top.learun.clientdata.getAsync('dataItem', { key: value, - code: 'BCdPartyFace', + code: 'PolityStatus', callback: function (_data) { result =_data.text; } @@ -654,51 +654,49 @@ return result; }, cultureDegreeNo: function (value) { - var result; - top.learun.clientdata.getAsync('custmerData', { - sync: true, - url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BCdCultureDegree', - key: value, - keyId: 'culturedegreeno', - callback: function (_data) { - result = _data['culturedegree']; - } - }); - return result; - }, - degreeNo: function (value) { var result; top.learun.clientdata.getAsync('dataItem', { key: value, - code: 'BCdDegree', + code: 'RecordInSchool', callback: function (_data) { result = _data.text; } }); return result; }, - jsgw: function (value) { - var result; - top.learun.clientdata.getAsync('dataItem', { - key: value, - code: 'jsgw', - callback: function (_data) { - result = _data.text; - } - }); - return result; - }, - titleOfTechPostNo: function (value) { + degreeNo: function (value) { var result; top.learun.clientdata.getAsync('dataItem', { key: value, - code: 'BCdTitleOfTechPost', + code: 'DegreeInSchool', callback: function (_data) { result = _data.text; } }); return result; }, + //jsgw: function (value) { + // var result; + // top.learun.clientdata.getAsync('dataItem', { + // key: value, + // code: 'jsgw', + // callback: function (_data) { + // result = _data.text; + // } + // }); + // return result; + //}, + //titleOfTechPostNo: function (value) { + // var result; + // top.learun.clientdata.getAsync('dataItem', { + // key: value, + // code: 'BCdTitleOfTechPost', + // callback: function (_data) { + // result = _data.text; + // } + // }); + // return result; + //}, isInActiveStatus: function (value) { var result; top.learun.clientdata.getAsync('dataItem', { @@ -710,33 +708,33 @@ }); return result; }, - positionLevel: function (value) { - var result; - top.learun.clientdata.getAsync('dataItem', { - key: value, - code: 'PositionLevel', - callback: function (_data) { - result = _data.text; - } - }); - return result; - }, - compilationCategory: function (value) { - var result; - top.learun.clientdata.getAsync('dataItem', { - key: value, - code: 'CompilationCategory', - callback: function (_data) { - result = _data.text; - } - }); - return result; - }, + //positionLevel: function (value) { + // var result; + // top.learun.clientdata.getAsync('dataItem', { + // key: value, + // code: 'PositionLevel', + // callback: function (_data) { + // result = _data.text; + // } + // }); + // return result; + //}, + //compilationCategory: function (value) { + // var result; + // top.learun.clientdata.getAsync('dataItem', { + // key: value, + // code: 'CompilationCategory', + // callback: function (_data) { + // result = _data.text; + // } + // }); + // return result; + //}, obtainWay: function (value) { var result; top.learun.clientdata.getAsync('dataItem', { key: value, - code: 'ObtainWay', + code: 'ObtainWayOfDegree', callback: function (_data) { result = _data.text; }