diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Form.js index 4c57d991b..3f609ace8 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Form.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Form.js @@ -125,8 +125,8 @@ var bootstrap = function ($, learun) { $('#OverseasChineseNo').lrDataItemSelect({ code: 'BCdOverseasChinese', allowSearch: true }); $('#HealthStatusNo').lrDataItemSelect({ code: 'BCdHealthStatus', allowSearch: true }); //初始学历 - $('#CultureDegreeNo').lrDataItemSelect({ code: 'CollegeType', allowSearch: true }); - $('#DegreeNo').lrDataItemSelect({ code: 'BCdDegree', allowSearch: true }); + $('#CultureDegreeNo').lrDataItemSelect({ code: 'RecordInSchool', allowSearch: true }); + $('#DegreeNo').lrDataItemSelect({ code: 'DegreeInSchool', allowSearch: true }); $('#FamilyOriginNo').lrDataItemSelect({ code: 'BCdFamilyOrigin', allowSearch: true }); $('#SubjectSpeciesNo').lrDataItemSelect({ code: 'BCdSubjectSpecies', allowSearch: true }); $('#ForeignLanguageNo').lrDataItemSelect({ code: 'BCdForeignLanguage', allowSearch: true }); @@ -137,11 +137,11 @@ var bootstrap = function ($, learun) { $('#PostRank').lrDataItemSelect({ code: 'BCdTitleOfTechPost', allowSearch: true }); $('#Photo').lrUploader(); //$('#HighestRecord').lrDataSourceSelect({ code: 'BCdCultureDegree', value: 'culturedegreeno', text: 'culturedegree' }); - $('#HighestRecord').lrDataItemSelect({ code: 'HighestEducation'}); + $('#HighestRecord').lrDataItemSelect({ code: 'RecordInSchool'}); //$('#ObtainWayOfHighestRecord').lrDataItemSelect({ code: 'ObtainWay' }); - $('#ObtainWayOfHighestRecord').lrDataItemSelect({ code: 'HighestEducationAcquisitionMode' }); - $('#InitialDegree').lrDataSourceSelect({ code: 'BCdDegree', value: 'degreeno', text: 'degreename' }); + $('#ObtainWayOfHighestRecord').lrDataItemSelect({ code: 'ObtainWayOfDegree' }); + $('#InitialDegree').lrDataItemSelect({ code: 'DegreeInSchool'}); $('#ObtainWayOfInitialDegree').lrDataItemSelect({ code: 'ObtainWayOfDegree' }); $('#ObtainWayOfHighestDegree').lrDataItemSelect({ code: 'ObtainWayOfDegree' }); //$('#PositionLevel').lrDataItemSelect({ code: 'PositionLevel' }); diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Index.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Index.cshtml index 4fa6df5ce..5d94a6504 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Index.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Index.cshtml @@ -54,10 +54,6 @@