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 0df9615e8..e1f308327 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
@@ -122,7 +122,7 @@ var bootstrap = function ($, learun) {
$('#HealthStatusNo').lrDataSourceSelect({ code: 'BCdHealthStatus', value: 'healthstatusno', text: 'healthstatus' });
//初始学历
$('#CultureDegreeNo').lrDataItemSelect({ code: 'CollegeType', allowSearch: true });
- $('#DegreeNo').lrDataSourceSelect({ code: 'BCdDegree', value: 'degreeno', text: 'degreename' });
+ $('#DegreeNo').lrDataItemSelect({ code: 'BCdDegree', allowSearch: true });
$('#FamilyOriginNo').lrDataSourceSelect({ code: 'BCdFamilyOrigin', value: 'familyoriginno', text: 'familyorigin' });
$('#SubjectSpeciesNo').lrDataSourceSelect({ code: 'BCdSubjectSpecies', value: 'subjectspeciesno', text: 'subjectspecies' });
$('#ForeignLanguageNo').lrDataSourceSelect({ code: 'BCdForeignLanguage', value: 'foreignlanguageno', text: 'foreignlanguagename' });
@@ -135,7 +135,7 @@ var bootstrap = function ($, learun) {
//最高学历
$('#HighestRecord').lrDataItemSelect({ code: 'CollegeType', allowSearch: true });
$('#ObtainWayOfHighestRecord').lrDataItemSelect({ code: 'ObtainWay' });
- $('#InitialDegree').lrDataSourceSelect({ code: 'BCdDegree', value: 'degreeno', text: 'degreename' });
+ $('#InitialDegree').lrDataItemSelect({ code: 'BCdDegree', allowSearch: true });
$('#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/FormAdd.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/FormAdd.cshtml
index ac9b28963..82ffb5ace 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/FormAdd.cshtml
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/FormAdd.cshtml
@@ -323,13 +323,13 @@
},
});
$.ajax({
- url: "/LR_SystemModule/DataSource/GetMap?code=" + "BCdDegree",
+ url: "/EducationalAdministration/EmpInfoEnternal/GetDataItemMap?code=" + "BCdDegree",
async: false,
success: function (msg) {
- var companys = $.parseJSON(msg).data.data;
+ var companys = $.parseJSON(msg).data;
var str = '';
$.each(companys, function (i, item) {
- str += ''
+ str += ''
})
$("#DegreeNo").html(str);
},
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 b34f5461c..aaace40a2 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
@@ -8,9 +8,9 @@ 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','usersexbit', 'JobStatus', 'jsgw', 'PositionLevel', 'CompilationCategory', 'ObtainWay', 'ObtainWay', 'ObtainWayOfDegree', 'ObtainWayOfDegree', 'TechnicalPost', 'TechnicalLevelOfWorker', 'EmpFullTime', 'YesOrNoBit'];
+var colDataItemCode = ['BCdPartyFace', 'BCdDegree','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', 'BCdDegree', 'BCdSubjectSpecies', 'BCdForeignLanguage'];
+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 bootstrap = function ($, learun) {
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/FormView.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/FormView.cshtml
index 50b69dd16..78ac20b49 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/FormView.cshtml
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/FormView.cshtml
@@ -296,13 +296,11 @@
},
degreeNo: function (value) {
var result;
- top.learun.clientdata.getAsync('custmerData', {
- sync: true,
- url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BCdDegree',
+ top.learun.clientdata.getAsync('dataItem', {
key: value,
- keyId: 'degreeno',
+ code: 'BCdDegree',
callback: function (_data) {
- result = _data['degreename'];
+ result = _data.text;
}
});
return result;
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/FormView.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/FormView.js
index bc5002b26..0e1d3e66b 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/FormView.js
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/FormView.js
@@ -70,7 +70,7 @@ var bootstrap = function ($, learun) {
$('#OverseasChineseNo').lrDataSourceSelect({ code: 'BCdOverseasChinese',value: 'overseaschineseno',text: 'overseaschinesename' });
$('#HealthStatusNo').lrDataSourceSelect({ code: 'BCdHealthStatus',value: 'healthstatusno',text: 'healthstatus' });
$('#CultureDegreeNo').lrDataSourceSelect({ code: 'BCdCultureDegree',value: 'culturedegreeno',text: 'culturedegree' });
- $('#DegreeNo').lrDataSourceSelect({ code: 'BCdDegree',value: 'degreeno',text: 'degreename' });
+ $('#DegreeNo').lrDataItemSelect({ code: 'BCdDegree' });
$('#FamilyOriginNo').lrDataSourceSelect({ code: 'BCdFamilyOrigin',value: 'familyoriginno',text: 'familyorigin' });
$('#SubjectSpeciesNo').lrDataSourceSelect({ code: 'BCdSubjectSpecies',value: 'subjectspeciesno',text: 'subjectspecies' });
$('#ForeignLanguageNo').lrDataSourceSelect({ code: 'BCdForeignLanguage',value: 'foreignlanguageno',text: 'foreignlanguagename' });
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 b6ce8d7cd..b5cb5c8ca 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
@@ -59,7 +59,7 @@ var bootstrap = function ($, learun) {
//是否审核
$('#CheckMark').lrDataItemSelect({ code: 'YesOrNoInt' });
//学位
- $('#DegreeNo').lrDataSourceSelect({ code: 'BCdDegree', value: 'degreeno', text: 'degreename' });
+ $('#DegreeNo').lrDataItemSelect({ code: 'BCdDegree' });
// 部门选择
$('#F_DepartmentId').lrselect({
@@ -460,12 +460,11 @@ var bootstrap = function ($, learun) {
{
label: "最高学位", name: "DegreeNo", width: 100, align: "left",
formatterAsync: function (callback, value, row, op, $cell) {
- learun.clientdata.getAsync('custmerData', {
- url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BCdDegree',
+ learun.clientdata.getAsync('dataItem', {
key: value,
- keyId: 'degreeno',
+ code: 'BCdDegree',
callback: function (_data) {
- callback(_data['degreename']);
+ callback(_data.text);
}
});
}
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfoEnternal/FormAdd.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfoEnternal/FormAdd.cshtml
index fe9d0f0e0..c895ec4af 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfoEnternal/FormAdd.cshtml
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfoEnternal/FormAdd.cshtml
@@ -350,13 +350,13 @@
},
});
$.ajax({
- url: "/EducationalAdministration/EmpInfoEnternal/GetMap?code=" + "BCdDegree",
+ url: "/EducationalAdministration/EmpInfoEnternal/GetDataItemMap?code=" + "BCdDegree",
async: false,
success: function (msg) {
- var companys = $.parseJSON(msg).data.data;
+ var msgObject = $.parseJSON(msg);
var str = '';
- $.each(companys, function (i, item) {
- str += ''
+ $.each(msgObject.data, function (i, item) {
+ str += ''
})
$("#DegreeNo").html(str);
},
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 68f0a21dc..3b5a6fdc7 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
@@ -637,13 +637,11 @@
},
degreeNo: function (value) {
var result;
- top.learun.clientdata.getAsync('custmerData', {
- sync: true,
- url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BCdDegree',
+ top.learun.clientdata.getAsync('dataItem', {
key: value,
- keyId: 'degreeno',
+ code: 'BCdDegree',
callback: function (_data) {
- result = _data['degreename'];
+ result = _data.text;
}
});
return result;
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/UserCenter/IndexForDC.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/UserCenter/IndexForDC.cshtml
index 8cb421692..481a37dc9 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/UserCenter/IndexForDC.cshtml
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/UserCenter/IndexForDC.cshtml
@@ -644,13 +644,11 @@
},
degreeNo: function (value) {
var result;
- top.learun.clientdata.getAsync('custmerData', {
- sync: true,
- url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BCdDegree',
+ top.learun.clientdata.getAsync('dataItem', {
key: value,
- keyId: 'degreeno',
+ code: 'BCdDegree',
callback: function (_data) {
- result = _data['degreename'];
+ result = _data.text;
}
});
return result;
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 c83501630..b09b22a6c 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
@@ -686,13 +686,11 @@
},
degreeNo: function (value) {
var result;
- top.learun.clientdata.getAsync('custmerData', {
- sync: true,
- url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BCdDegree',
+ top.learun.clientdata.getAsync('dataItem', {
key: value,
- keyId: 'degreeno',
+ code: 'BCdDegree',
callback: function (_data) {
- result = _data['degreename'];
+ result = _data.text;
}
});
return result;
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Excel/Import/ExcelImportBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Excel/Import/ExcelImportBLL.cs
index df0c11599..ed9e01d24 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Excel/Import/ExcelImportBLL.cs
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Excel/Import/ExcelImportBLL.cs
@@ -851,7 +851,7 @@ namespace Learun.Application.Excel
empinfoEntity.HighestRecord = dataSourceIBLL.GetKeyByValue("BCdCultureDegree", "culturedegree", dr["最高学历"].ToString(), "culturedegreeno");
empinfoEntity.HighestRecordGetTime = Convert.ToDateTime(dr["最高学历取得时间"].ToString());
empinfoEntity.EducationalSystem = dr["学制（最高学历）"].ToString();
- empinfoEntity.DegreeNo = dataSourceIBLL.GetKeyByValue("BCdDegree", "degreename", dr["最高学位"].ToString(), "degreeno");
+ empinfoEntity.DegreeNo = FindDataItemValue(dataItemIBLL.GetDetailList("BCdDegree"), dr["最高学位"].ToString(), "最高学位", false);
empinfoEntity.HighestDegreeGetTime = dr["最高学位取得时间"].ToString();
empinfoEntity.JobRank = FindDataItemValue(dataItemIBLL.GetDetailList("TechnicalPost"), dr["专业技术职务等级"].ToString(), "专业技术职务等级", false);
empinfoEntity.JobTitle = dr["专业技术职务名称"].ToString();