From 0de511ef8e926c45b3316f5eea199630c4948de3 Mon Sep 17 00:00:00 2001 From: zhangli <1109134334@qq.com> Date: Wed, 9 Feb 2022 09:51:03 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B8=AF=E6=BE=B3=E5=8F=B0=E4=BE=A8=E6=95=B0?= =?UTF-8?q?=E6=8D=AEBCdOverseasChinese=20=20=E6=95=B0=E6=8D=AE=E6=BA=90?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=BA=E5=AD=97=E5=85=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Views/EmpInfo/Form.js | 2 +- .../Views/EmpInfo/FormModify.js | 2 +- .../Views/EmpInfo/FormView.cshtml | 8 +++----- .../Views/EmpInfo/FormView.js | 2 +- .../Views/EmpInfo/Index.js | 7 +++---- .../Views/StuInfoBasic/Form.js | 2 +- .../Views/StuInfoBasic/FormOfDC.js | 2 +- .../Views/StuInfoBasic/FormView.cshtml | 9 +++------ .../Views/StuInfoBasic/FormView.js | 2 +- .../Views/Accommodation/Room.cshtml | 9 +++------ .../Views/UserCenter/Index.cshtml | 18 ++++++------------ .../Views/UserCenter/IndexForDC.cshtml | 9 +++------ .../Views/UserCenter/IndexInTeacher.cshtml | 17 ++++++----------- 13 files changed, 33 insertions(+), 56 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 b1f3ed245..5d50abc34 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 @@ -118,7 +118,7 @@ var bootstrap = function ($, learun) { } }); $('#RegionNo').lrselect(); - $('#OverseasChineseNo').lrDataSourceSelect({ code: 'BCdOverseasChinese', value: 'overseaschineseno', text: 'overseaschinesename' }); + $('#OverseasChineseNo').lrDataItemSelect({ code: 'BCdOverseasChinese', allowSearch: true }); $('#HealthStatusNo').lrDataItemSelect({ code: 'BCdHealthStatus', allowSearch: true }); //初始学历 $('#CultureDegreeNo').lrDataItemSelect({ code: 'CollegeType', allowSearch: true }); 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 54eaa7724..f6dbe3db3 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', 'BCdNationality', 'BCdDegree', 'BCdFamilyOrigin', 'BCdForeignLanguage', 'BCdHealthStatus','usersexbit', 'JobStatus', 'jsgw', 'PositionLevel', 'CompilationCategory', 'ObtainWay', 'ObtainWay', 'ObtainWayOfDegree', 'ObtainWayOfDegree', 'TechnicalPost', 'TechnicalLevelOfWorker', 'EmpFullTime', 'YesOrNoBit']; +var colDataItemCode = ['BCdPartyFace', 'BCdNationality', 'BCdDegree', 'BCdFamilyOrigin', 'BCdForeignLanguage', 'BCdOverseasChinese','BCdHealthStatus','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 65d9268f1..ce253587d 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 @@ -166,13 +166,11 @@ }, overseasChineseNo: function (value) { var result; - top.learun.clientdata.getAsync('custmerData', { - sync: true, - url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BCdOverseasChinese', + top.learun.clientdata.getAsync('dataItem', { key: value, - keyId: 'overseaschineseno', + code: 'BCdOverseasChinese', callback: function (_data) { - result = _data.overseaschinesename; + result = _data.text; } }); 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 e60e20353..2f0039ac5 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 @@ -67,7 +67,7 @@ var bootstrap = function ($, learun) { } }); $('#RegionNo').lrselect(); - $('#OverseasChineseNo').lrDataSourceSelect({ code: 'BCdOverseasChinese', value: 'overseaschineseno', text: 'overseaschinesename' }); + $('#OverseasChineseNo').lrDataItemSelect({ code: 'BCdOverseasChinese' }); $('#HealthStatusNo').lrDataItemSelect({ code: 'BCdHealthStatus' }); $('#CultureDegreeNo').lrDataSourceSelect({ code: 'BCdCultureDegree',value: 'culturedegreeno',text: 'culturedegree' }); $('#DegreeNo').lrDataItemSelect({ code: 'BCdDegree' }); 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 e9b526b42..f402cd098 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 @@ -499,12 +499,11 @@ var bootstrap = function ($, learun) { { label: "港澳台侨", name: "OverseasChineseNo", width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) { - learun.clientdata.getAsync('custmerData', { - url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BCdOverseasChinese', + learun.clientdata.getAsync('dataItem', { key: value, - keyId: 'overseaschineseno', + code: 'BCdOverseasChinese', callback: function (_data) { - callback(_data['overseaschinesename']); + 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 85ee14778..0378d1e11 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) { $('#HealthStatusNo').lrDataItemSelect({ code: 'BCdHealthStatus' }); $('#Photo').lrUploader(); $('#FamilyOriginNo').lrDataItemSelect({ code: 'BCdFamilyOrigin' }); - $('#OverseasChineseNo').lrDataSourceSelect({ code: 'BCdOverseasChinese', value: 'overseaschineseno', text: 'overseaschinesename' }); + $('#OverseasChineseNo').lrDataItemSelect({ code: 'BCdOverseasChinese' }); $('#GraduateNo').lrDataItemSelect({ code: 'CollegeType' }); $('#EduSystem').lrDataItemSelect({ code: 'EduSystem' }); $('#StudyModality').lrDataItemSelect({ code: 'StudyModality' }); 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 7e1d73ea8..7de2fba10 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 @@ -110,7 +110,7 @@ var bootstrap = function ($, learun) { $('#HealthStatusNo').lrDataItemSelect({ code: 'BCdHealthStatus' }); $('#Photo').lrUploader(); $('#FamilyOriginNo').lrDataItemSelect({ code: 'BCdFamilyOrigin' }); - $('#OverseasChineseNo').lrDataSourceSelect({ code: 'BCdOverseasChinese', value: 'overseaschineseno', text: 'overseaschinesename' }); + $('#OverseasChineseNo').lrDataItemSelect({ code: 'BCdOverseasChinese' }); $('#GraduateNo').lrDataItemSelect({ code: 'CollegeType' }); $('#EduSystem').lrDataItemSelect({ code: 'EduSystem' }); $('#StudyModality').lrDataItemSelect({ code: 'StudyModality' }); diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/FormView.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/FormView.cshtml index c830af7c6..ee85a332c 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/FormView.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/FormView.cshtml @@ -227,16 +227,13 @@ }, overseasChineseNo: function (value) { var result; - top.learun.clientdata.getAsync('custmerData', { - sync: true, - url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BCdOverseasChinese', + top.learun.clientdata.getAsync('dataItem', { key: value, - keyId: 'overseaschineseno', + code: 'BCdOverseasChinese', callback: function (_data) { - result = _data.overseaschinesename; + result = _data.text; } }); - return result; }, healthStatusNo: function (value) { 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 c370d5d1c..88141dcd8 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 @@ -69,7 +69,7 @@ var bootstrap = function ($, learun) { $('#HealthStatusNo').lrDataItemSelect({ code: 'BCdHealthStatus' }); $('#Photo').lrUploader(); $('#FamilyOriginNo').lrDataItemSelect({ code: 'BCdFamilyOrigin' }); - $('#OverseasChineseNo').lrDataSourceSelect({ code: 'BCdOverseasChinese', value: 'overseaschineseno', text: 'overseaschinesename' }); + $('#OverseasChineseNo').lrDataItemSelect({ code: 'BCdOverseasChinese' }); $('#GraduateNo').lrDataItemSelect({ code: 'CollegeType' }); $('#DeptNo').lrselect({ value: "deptno", 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 d6ab1a52b..0a38bd286 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 @@ -351,16 +351,13 @@ }, filter_BCdOverseasChinese: function (value) { var result; - top.learun.clientdata.getAsync('custmerData', { - sync: true, - url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BCdOverseasChinese', + top.learun.clientdata.getAsync('dataItem', { key: value, - keyId: 'overseaschineseno', + code: 'BCdOverseasChinese', callback: function (_data) { - result = _data.overseaschinesename; + result=_data.text; } }); - return result; }, filter_CollegeType: function (value) { 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 e02f9d5df..100de34b6 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 @@ -284,16 +284,13 @@ }, overseasChineseNo: function (value) { var result; - top.learun.clientdata.getAsync('custmerData', { - sync: true, - url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BCdOverseasChinese', + top.learun.clientdata.getAsync('dataItem', { key: value, - keyId: 'overseaschineseno', + code: 'BCdOverseasChinese', callback: function (_data) { - result = _data.overseaschinesename; + result = _data.text; } }); - return result; }, healthStatusNo: function (value) { @@ -503,16 +500,13 @@ }, overseasChineseNo: function (value) { var result; - top.learun.clientdata.getAsync('custmerData', { - sync: true, - url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BCdOverseasChinese', + top.learun.clientdata.getAsync('dataItem', { key: value, - keyId: 'overseaschineseno', + code: 'BCdOverseasChinese', callback: function (_data) { - result = _data.overseaschinesename; + result = _data.text; } }); - return result; }, healthStatusNo: function (value) { 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 325cdc47f..4d90d15a1 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 @@ -284,16 +284,13 @@ }, overseasChineseNo: function (value) { var result; - top.learun.clientdata.getAsync('custmerData', { - sync: true, - url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BCdOverseasChinese', + top.learun.clientdata.getAsync('dataItem', { key: value, - keyId: 'overseaschineseno', + code: 'BCdOverseasChinese', callback: function (_data) { - result = _data.overseaschinesename; + result = _data.text; } }); - return result; }, healthStatusNo: function (value) { 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 877b59eff..ce7764f2d 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 @@ -270,13 +270,11 @@ }, overseasChineseNo: function (value) { var result; - top.learun.clientdata.getAsync('custmerData', { - sync: true, - url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BCdOverseasChinese', + top.learun.clientdata.getAsync('dataItem', { key: value, - keyId: 'overseaschineseno', + code: 'BCdOverseasChinese', callback: function (_data) { - result = _data.overseaschinesename; + result = _data.text; } }); @@ -551,16 +549,13 @@ }, overseasChineseNo: function (value) { var result; - top.learun.clientdata.getAsync('custmerData', { - sync: true, - url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BCdOverseasChinese', + top.learun.clientdata.getAsync('dataItem', { key: value, - keyId: 'overseaschineseno', + code: 'BCdOverseasChinese', callback: function (_data) { - result = _data.overseaschinesename; + result = _data.text; } }); - return result; }, healthStatusNo: function (value) {