From 0258e4adc64ea7ce9ed2733452e5398c1aa81954 Mon Sep 17 00:00:00 2001 From: liangkun Date: Thu, 23 Jun 2022 11:53:09 +0800 Subject: [PATCH] =?UTF-8?q?=E6=95=99=E5=B8=88=E4=BF=A1=E6=81=AF=E4=B8=8B?= =?UTF-8?q?=E6=8B=89=E6=A1=86=E7=BB=91=E5=AE=9A=E9=A1=B9=E6=9B=B4=E6=96=B0?= =?UTF-8?q?=E4=B8=BA=E5=A1=94=E9=87=8C=E6=9C=A8=E5=BA=93=E5=86=85=E5=AE=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Views/EmpInfo/Form.js | 10 +++++----- .../Views/EmpInfo/Index.cshtml | 4 ---- .../Views/EmpInfo/Index.js | 8 ++++---- .../Views/PM_EducationExperience/Form.cshtml | 2 +- .../Views/PM_EducationExperience/Form.js | 3 ++- .../Views/PM_EducationExperience/Index.js | 15 +++++++++++++-- 6 files changed, 25 insertions(+), 17 deletions(-) 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 @@
政治面貌
-
-
文化程度
-
-
人员身份
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 d0a13be6f..f28a3b553 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 @@ -50,7 +50,7 @@ var bootstrap = function ($, learun) { //政治面貌 $('#PartyFaceNo').lrDataItemSelect({ code: 'PolityStatus', allowSearch: true }); //最高学历 - $('#HighestRecord').lrDataItemSelect({ code: 'HighestEducation'}); + //$('#HighestRecord').lrDataItemSelect({ code: 'HighestEducation'}); //民族 @@ -60,7 +60,7 @@ var bootstrap = function ($, learun) { //是否审核 $('#CheckMark').lrDataItemSelect({ code: 'YesOrNoInt' }); //学位 - $('#DegreeNo').lrDataItemSelect({ code: 'BCdDegree' }); + $('#DegreeNo').lrDataItemSelect({ code: 'DegreeInSchool' }); //职称 $('#ProfessionalTitle').lrDataItemSelect({ code: 'jszc' }); @@ -496,7 +496,7 @@ var bootstrap = function ($, learun) { formatterAsync: function (callback, value, row, op, $cell) { learun.clientdata.getAsync('dataItem', { key: value, - code: 'HighestEducation', + code: 'RecordInSchool', callback: function (_data) { callback(_data.text); } @@ -508,7 +508,7 @@ var bootstrap = function ($, learun) { formatterAsync: function (callback, value, row, op, $cell) { learun.clientdata.getAsync('dataItem', { key: value, - code: 'BCdDegree', + code: 'DegreeInSchool', callback: function (_data) { callback(_data.text); } diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/PM_EducationExperience/Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/PM_EducationExperience/Form.cshtml index 7f2b565fb..34a570a19 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/PM_EducationExperience/Form.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/PM_EducationExperience/Form.cshtml @@ -21,7 +21,7 @@
学位
- +
学制
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/PM_EducationExperience/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/PM_EducationExperience/Form.js index 7d4775158..51e607924 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/PM_EducationExperience/Form.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/PM_EducationExperience/Form.js @@ -16,7 +16,8 @@ var bootstrap = function ($, learun) { page.initData(); }, bind: function () { - $('#Education').lrDataItemSelect({ code: 'CollegeType' }); + $('#Education').lrDataItemSelect({ code: 'RecordInSchool' }); + $('#AcademicDegree').lrDataItemSelect({ code: 'DegreeInSchool' }); $('#EducationalSystem').lrDataItemSelect({ code: 'EductionalSystme' }); }, initData: function () { diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/PM_EducationExperience/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/PM_EducationExperience/Index.js index 1866c7fd4..fb46810cb 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/PM_EducationExperience/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/PM_EducationExperience/Index.js @@ -122,14 +122,25 @@ var bootstrap = function ($, learun) { formatterAsync: function (callback, value, row, op, $cell) { learun.clientdata.getAsync('dataItem', { key: value, - code: 'CollegeType', + code: 'RecordInSchool', + callback: function (_data) { + callback(_data.text); + } + }); + } + }, + { + label: "学位", name: "AcademicDegree", width: 100, align: "left", + formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('dataItem', { + key: value, + code: 'DegreeInSchool', callback: function (_data) { callback(_data.text); } }); } }, - { label: "学位", name: "AcademicDegree", width: 100, align: "left" }, { label: "学制", name: "EducationalSystem", width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) {