From 022addd593fd0869110e34fa900bfd0d4dbd2486 Mon Sep 17 00:00:00 2001 From: zhangli <1109134334@qq.com> Date: Thu, 27 Jan 2022 09:44:51 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A4=96=E8=AF=AD=E8=AF=AD=E7=A7=8D=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E4=B8=BA=E6=95=B0=E6=8D=AE=E5=AD=97=E5=85=B8=E8=AF=BB?= =?UTF-8?q?=E5=8F=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../EducationalAdministration/Views/EmpInfo/Form.js | 2 +- .../Views/EmpInfo/FormModify.js | 2 +- .../Views/EmpInfo/FormView.cshtml | 9 ++++----- .../EducationalAdministration/Views/EmpInfo/FormView.js | 2 +- .../Learun.Application.Web/Views/UserCenter/Index.cshtml | 9 ++++----- .../Views/UserCenter/IndexInTeacher.cshtml | 9 ++++----- 6 files changed, 15 insertions(+), 18 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 670cbee1f..1bbaa170c 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,7 +125,7 @@ var bootstrap = function ($, learun) { $('#DegreeNo').lrDataItemSelect({ code: 'BCdDegree', allowSearch: true }); $('#FamilyOriginNo').lrDataItemSelect({ code: 'BCdFamilyOrigin', allowSearch: true }); $('#SubjectSpeciesNo').lrDataSourceSelect({ code: 'BCdSubjectSpecies', value: 'subjectspeciesno', text: 'subjectspecies' }); - $('#ForeignLanguageNo').lrDataSourceSelect({ code: 'BCdForeignLanguage', value: 'foreignlanguageno', text: 'foreignlanguagename' }); + $('#ForeignLanguageNo').lrDataItemSelect({ code: 'BCdForeignLanguage', allowSearch: true }); $('#EmpSortNo').lrDataItemSelect({ code: 'jsgw' }); $('#EmpFullTimeNo').lrDataItemSelect({ code: 'EmpFullTime' }); $('#ObtainWay').lrDataItemSelect({ code: 'ObtainWay' }); 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 e74f8a8f7..6b9a53383 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,7 +8,7 @@ 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', 'BCdDegree', 'BCdFamilyOrigin','usersexbit', 'JobStatus', 'jsgw', 'PositionLevel', 'CompilationCategory', 'ObtainWay', 'ObtainWay', 'ObtainWayOfDegree', 'ObtainWayOfDegree', 'TechnicalPost', 'TechnicalLevelOfWorker', 'EmpFullTime', 'YesOrNoBit']; +var colDataItemCode = ['BCdPartyFace', 'BCdDegree', 'BCdFamilyOrigin', 'BCdForeignLanguage','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']; 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 fb5191e21..67c9002e5 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 @@ -231,13 +231,12 @@ }, foreignLanguageNo: function (value) { var result; - top.learun.clientdata.getAsync('custmerData', { - url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BCdForeignLanguage', + top.learun.clientdata.getAsync('dataItem', { key: value, - keyId: 'foreignlanguageno', + code: 'BCdForeignLanguage', callback: function (_data) { - result = _data.foreignlanguagename; - }.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 a1af557c6..8db72e3b5 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 @@ -73,7 +73,7 @@ var bootstrap = function ($, learun) { $('#DegreeNo').lrDataItemSelect({ code: 'BCdDegree' }); $('#FamilyOriginNo').lrDataItemSelect({ code: 'BCdFamilyOrigin' }); $('#SubjectSpeciesNo').lrDataSourceSelect({ code: 'BCdSubjectSpecies',value: 'subjectspeciesno',text: 'subjectspecies' }); - $('#ForeignLanguageNo').lrDataSourceSelect({ code: 'BCdForeignLanguage',value: 'foreignlanguageno',text: 'foreignlanguagename' }); + $('#ForeignLanguageNo').lrDataItemSelect({ code: 'BCdForeignLanguage' }); $('#EmpSortNo').lrDataItemSelect({ code: 'EmpSort' }); $('#EmpFullTimeNo').lrDataItemSelect({ code: 'EmpFullTime' }); $('#DeptNo').lrDataSourceSelect({ code: 'CdDeptInfo',value: 'deptno',text: 'deptname' }); 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 ac891e97b..40d97a188 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 @@ -572,13 +572,12 @@ }, foreignLanguageNo: function (value) { var result; - top.learun.clientdata.getAsync('custmerData', { - url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BCdForeignLanguage', + top.learun.clientdata.getAsync('dataItem', { key: value, - keyId: 'foreignlanguageno', + code: 'BCdForeignLanguage', callback: function (_data) { - result = _data.foreignlanguagename; - }.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 22d7816ac..f005a02a3 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 @@ -621,13 +621,12 @@ }, foreignLanguageNo: function (value) { var result; - top.learun.clientdata.getAsync('custmerData', { - url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BCdForeignLanguage', + top.learun.clientdata.getAsync('dataItem', { key: value, - keyId: 'foreignlanguageno', + code: 'BCdForeignLanguage', callback: function (_data) { - result = _data.foreignlanguagename; - }.bind(this) + result = _data.text; + } }); return result; },