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 ad4b9d7a7..61f6c63ba 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 @@ -127,7 +127,7 @@ var bootstrap = function ($, learun) { //初始学历 $('#CultureDegreeNo').lrDataItemSelect({ code: 'CollegeType', allowSearch: true }); $('#DegreeNo').lrDataItemSelect({ code: 'BCdDegree', allowSearch: true }); - $('#FamilyOriginNo').lrDataSourceSelect({ code: 'BCdFamilyOrigin', value: 'familyoriginno', text: 'familyorigin' }); + $('#FamilyOriginNo').lrDataItemSelect({ code: 'BCdFamilyOrigin', allowSearch: true }); $('#SubjectSpeciesNo').lrDataSourceSelect({ code: 'BCdSubjectSpecies', value: 'subjectspeciesno', text: 'subjectspecies' }); $('#ForeignLanguageNo').lrDataSourceSelect({ code: 'BCdForeignLanguage', value: 'foreignlanguageno', text: 'foreignlanguagename' }); $('#EmpSortNo').lrDataItemSelect({ code: 'jsgw' }); 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 9a25e3f73..6dbafad76 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 @@ -220,13 +220,12 @@ }, familyOriginNo: function (value) { var result; - top.learun.clientdata.getAsync('custmerData', { - url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BCdFamilyOrigin', + top.learun.clientdata.getAsync('dataItem', { key: value, - keyId: 'familyoriginno', + code: 'BCdFamilyOrigin', callback: function (_data) { - result = _data.familyorigin; - }.bind(this) + 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 ae87de61d..1719b6031 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 @@ -71,7 +71,7 @@ var bootstrap = function ($, learun) { $('#HealthStatusNo').lrDataSourceSelect({ code: 'BCdHealthStatus',value: 'healthstatusno',text: 'healthstatus' }); $('#CultureDegreeNo').lrDataSourceSelect({ code: 'BCdCultureDegree',value: 'culturedegreeno',text: 'culturedegree' }); $('#DegreeNo').lrDataItemSelect({ code: 'BCdDegree' }); - $('#FamilyOriginNo').lrDataSourceSelect({ code: 'BCdFamilyOrigin',value: 'familyoriginno',text: 'familyorigin' }); + $('#FamilyOriginNo').lrDataItemSelect({ code: 'BCdFamilyOrigin' }); $('#SubjectSpeciesNo').lrDataSourceSelect({ code: 'BCdSubjectSpecies',value: 'subjectspeciesno',text: 'subjectspecies' }); $('#ForeignLanguageNo').lrDataSourceSelect({ code: 'BCdForeignLanguage',value: 'foreignlanguageno',text: 'foreignlanguagename' }); $('#EmpSortNo').lrDataItemSelect({ code: 'EmpSort' }); 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 1611a53ac..d2bdace5d 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 @@ -572,12 +572,11 @@ var bootstrap = function ($, learun) { { label: "家庭出身", name: "FamilyOriginNo", width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) { - learun.clientdata.getAsync('custmerData', { - url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BCdFamilyOrigin', + learun.clientdata.getAsync('dataItem', { key: value, - keyId: 'familyoriginno', + code: 'BCdFamilyOrigin', callback: function (_data) { - callback(_data['familyorigin']); + callback(_data.text); } }); } diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/Form.js index b191ff80b..dba6a2368 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/Form.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/Form.js @@ -110,7 +110,7 @@ var bootstrap = function ($, learun) { $('#PartyFaceNo').lrDataItemSelect({ code: 'BCdPartyFace' }); $('#HealthStatusNo').lrDataSourceSelect({ code: 'BCdHealthStatus', value: 'healthstatusno', text: 'healthstatus' }); $('#Photo').lrUploader(); - $('#FamilyOriginNo').lrDataSourceSelect({ code: 'BCdFamilyOrigin', value: 'familyoriginno', text: 'familyorigin' }); + $('#FamilyOriginNo').lrDataItemSelect({ code: 'BCdFamilyOrigin' }); $('#OverseasChineseNo').lrDataSourceSelect({ code: 'BCdOverseasChinese', value: 'overseaschineseno', text: 'overseaschinesename' }); $('#GraduateNo').lrDataItemSelect({ code: 'CollegeType' }); $('#EduSystem').lrDataItemSelect({ code: 'EduSystem' }); diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/FormOfDC.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/FormOfDC.js index 14521eef5..2be4f4e6b 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/FormOfDC.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/FormOfDC.js @@ -109,7 +109,7 @@ var bootstrap = function ($, learun) { $('#PartyFaceNo').lrDataItemSelect({ code: 'BCdPartyFace' }); $('#HealthStatusNo').lrDataSourceSelect({ code: 'BCdHealthStatus', value: 'healthstatusno', text: 'healthstatus' }); $('#Photo').lrUploader(); - $('#FamilyOriginNo').lrDataSourceSelect({ code: 'BCdFamilyOrigin', value: 'familyoriginno', text: 'familyorigin' }); + $('#FamilyOriginNo').lrDataItemSelect({ code: 'BCdFamilyOrigin' }); $('#OverseasChineseNo').lrDataSourceSelect({ code: 'BCdOverseasChinese', value: 'overseaschineseno', text: 'overseaschinesename' }); $('#GraduateNo').lrDataItemSelect({ code: 'CollegeType' }); $('#EduSystem').lrDataItemSelect({ code: 'EduSystem' }); diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/FormView.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/FormView.js index f052d2981..6bb52c569 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/FormView.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/FormView.js @@ -68,7 +68,7 @@ var bootstrap = function ($, learun) { $('#PartyFaceNo').lrDataItemSelect({ code: 'BCdPartyFace' }); $('#HealthStatusNo').lrDataSourceSelect({ code: 'BCdHealthStatus', value: 'healthstatusno', text: 'healthstatus' }); $('#Photo').lrUploader(); - $('#FamilyOriginNo').lrDataSourceSelect({ code: 'BCdFamilyOrigin', value: 'familyoriginno', text: 'familyorigin' }); + $('#FamilyOriginNo').lrDataItemSelect({ code: 'BCdFamilyOrigin' }); $('#OverseasChineseNo').lrDataSourceSelect({ code: 'BCdOverseasChinese', value: 'overseaschineseno', text: 'overseaschinesename' }); $('#GraduateNo').lrDataItemSelect({ code: 'CollegeType' }); $('#DeptNo').lrselect({ diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Accommodation/Room.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Accommodation/Room.cshtml index b3c3250c8..2f2595dba 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Accommodation/Room.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Accommodation/Room.cshtml @@ -288,13 +288,11 @@ }, filter_BCdFamilyOrigin: function (value) { var result; - top.learun.clientdata.getAsync('custmerData', { - sync: true, - url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BCdFamilyOrigin', + top.learun.clientdata.getAsync('dataItem', { key: value, - keyId: 'familyoriginno', + code: 'BCdFamilyOrigin', callback: function (_data) { - result = _data['familyorigin']; + result = _data.text; } }); return result; 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 91d992fab..00c9f5902 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 @@ -561,13 +561,12 @@ }, familyOriginNo: function (value) { var result; - top.learun.clientdata.getAsync('custmerData', { - url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BCdFamilyOrigin', + top.learun.clientdata.getAsync('dataItem', { key: value, - keyId: 'familyoriginno', + code: 'BCdFamilyOrigin', callback: function (_data) { - result = _data.familyorigin; - }.bind(this) + 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 c98d8bde4..fc50c991a 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 @@ -569,13 +569,12 @@ }, familyOriginNo: function (value) { var result; - top.learun.clientdata.getAsync('custmerData', { - url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BCdFamilyOrigin', + top.learun.clientdata.getAsync('dataItem', { key: value, - keyId: 'familyoriginno', + code: 'BCdFamilyOrigin', callback: function (_data) { - result = _data.familyorigin; - }.bind(this) + 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 6e1aedf66..4ad694cfd 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 @@ -610,13 +610,12 @@ }, familyOriginNo: function (value) { var result; - top.learun.clientdata.getAsync('custmerData', { - url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BCdFamilyOrigin', + top.learun.clientdata.getAsync('dataItem', { key: value, - keyId: 'familyoriginno', + code: 'BCdFamilyOrigin', callback: function (_data) { - result = _data.familyorigin; - }.bind(this) + result = _data.text; + } }); return result; },