From beca9e3887bdfff1901a8aa8914cc7da52564826 Mon Sep 17 00:00:00 2001 From: zhangli <1109134334@qq.com> Date: Thu, 27 Jan 2022 15:27:09 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B0=91=E6=97=8FBCdNationality=20=E6=94=B9?= =?UTF-8?q?=E4=B8=BA=E8=AF=BB=E5=8F=96=E5=AD=97=E5=85=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Views/AP_OnlineUserInfo/DropOutIndex.js | 2 +- .../Views/AP_OnlineUserInfo/PaymentIndex.js | 7 +++-- .../Views/AP_OnlineUserInfo/RegistrateForm.js | 2 +- .../AP_OnlineUserInfo/RegistrateIndex.js | 7 +++-- .../Views/AP_OnlineUserInfo/ReportIndex.js | 7 +++-- .../Controllers/EmpInfoController.cs | 12 +++++---- .../Views/EmpInfo/Form.js | 2 +- .../Views/EmpInfo/FormAdd.cshtml | 6 ++--- .../Views/EmpInfo/FormModify.js | 26 ++----------------- .../Views/EmpInfo/FormView.cshtml | 8 +++--- .../Views/EmpInfo/FormView.js | 2 +- .../Views/EmpInfo/Index.js | 9 +++---- .../Views/EmpInfo/IndexOfDC.js | 7 +++-- .../Views/EmpInfoEnternal/FormAdd.cshtml | 8 +++--- .../Views/SignUpAboutOnline/Form.js | 2 +- .../Views/SignUpAboutOnline/Index.js | 7 +++-- .../Views/SignUpAboutTrain/Form.js | 2 +- .../Views/SignUpAboutTrain/Index.js | 7 +++-- .../Views/StuEnroll/AllocationClass.js | 7 +++-- .../Views/StuEnroll/AllocationDormitory.js | 7 +++-- .../Views/StuEnroll/CheckIn.js | 7 +++-- .../Views/StuEnroll/Form.js | 2 +- .../Views/StuEnroll/FormView.js | 2 +- .../Views/StuEnroll/GetArticles.js | 7 +++-- .../Views/StuEnroll/GetCloth.js | 7 +++-- .../Views/StuEnroll/GetClothSize.js | 7 +++-- .../Views/StuEnroll/Index.js | 7 +++-- .../Views/StuEnroll/IsPay.js | 7 +++-- .../Views/StuEnroll/IsPhoto.js | 7 +++-- .../Views/StuEnroll/Military.js | 7 +++-- .../Views/StuEnroll/NewAllocationBed.js | 7 +++-- .../Views/StuEnroll/PayAfter.js | 7 +++-- .../Views/StuEnroll/Report.js | 7 +++-- .../Views/StuEnroll/StuTuition.js | 7 +++-- .../Views/StuInfoBasic/Form.js | 2 +- .../Views/StuInfoBasic/FormOfDC.js | 6 ++--- .../Views/StuInfoBasic/FormView.cshtml | 8 +++--- .../Views/StuInfoBasic/FormView.js | 2 +- .../Views/StuInfoBasic/Index.js | 7 +++-- .../Views/StuInfoBasic/IndexInClass.js | 7 +++-- .../Views/StuInfoBasic/IndexOfDC.js | 21 +++++++-------- .../Views/StuInfoBasic/MyClass.js | 7 +++-- .../Views/StuInfoBasic/Print.cshtml | 2 +- .../Views/StuInfoBasicTwo/Index.js | 7 +++-- .../Views/StuInfoFresh/AllocationClassDC.js | 7 +++-- .../Views/StuInfoFresh/CollectFileIndex.js | 7 +++-- .../Views/StuInfoFresh/Form.js | 2 +- .../Views/StuInfoFresh/FormDC.js | 2 +- .../Views/StuInfoFresh/FormOfStudent.js | 2 +- .../Views/StuInfoFresh/FormView.js | 2 +- .../Views/StuInfoFresh/GetKeyIndex.js | 7 +++-- .../Views/StuInfoFresh/Index.js | 7 +++-- .../Views/StuInfoFresh/IndexDC.js | 7 +++-- .../Views/StuInfoFresh/IndexOfStudent.js | 7 +++-- .../Views/StuInfoFresh/RegisterIndex.js | 7 +++-- .../Views/StuInfoFresh/SchoolUniform.js | 7 +++-- .../Views/StuInfoFresh/StatusView.js | 7 +++-- .../Views/StuInfoGraduate/Index.js | 7 +++-- .../Views/Accommodation/Room.cshtml | 8 +++--- .../Views/LeagueMember/Form.js | 2 +- .../Views/LeagueMember/Index.js | 7 +++-- .../PersonnelManagement/Views/PMCadre/Form.js | 2 +- .../Views/PMCadre/Index.js | 7 +++-- .../Views/PMMembership/Form.js | 2 +- .../Views/PMMembership/Index.js | 7 +++-- .../OnlineRegistrate/RegistrateForm.cshtml | 2 +- .../RegistrateFormEdit.cshtml | 2 +- .../Views/UserCenter/Index.cshtml | 16 +++++------- .../Views/UserCenter/IndexForDC.cshtml | 16 +++++------- .../Views/UserCenter/IndexInTeacher.cshtml | 16 +++++------- .../Modules/Feixing/UserApiController.cs | 8 +++--- .../Import/ExcelImportBLL.cs | 2 +- 72 files changed, 195 insertions(+), 274 deletions(-) diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AdmissionsPlatform/Views/AP_OnlineUserInfo/DropOutIndex.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AdmissionsPlatform/Views/AP_OnlineUserInfo/DropOutIndex.js index 87d6bfaf6..c9e93cb8c 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AdmissionsPlatform/Views/AP_OnlineUserInfo/DropOutIndex.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AdmissionsPlatform/Views/AP_OnlineUserInfo/DropOutIndex.js @@ -123,7 +123,7 @@ var bootstrap = function ($, learun) { formatterAsync: function (callback, value, row, op, $cell) { learun.clientdata.getAsync('dataItem', { key: value, - code: 'BCdNationality', + code: 'National', callback: function (_data) { callback(_data.text); } diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AdmissionsPlatform/Views/AP_OnlineUserInfo/PaymentIndex.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AdmissionsPlatform/Views/AP_OnlineUserInfo/PaymentIndex.js index 5f461c45d..e7eecead8 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AdmissionsPlatform/Views/AP_OnlineUserInfo/PaymentIndex.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AdmissionsPlatform/Views/AP_OnlineUserInfo/PaymentIndex.js @@ -117,12 +117,11 @@ var bootstrap = function ($, learun) { { label: '民族', name: 'Nation', width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) { - learun.clientdata.getAsync('custmerData', { - url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BCdNationality', + learun.clientdata.getAsync('dataItem', { key: value, - keyId: 'nationalityno', + code: 'National', callback: function (_data) { - callback(_data['nationality']); + callback(_data.text); } }); } diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AdmissionsPlatform/Views/AP_OnlineUserInfo/RegistrateForm.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AdmissionsPlatform/Views/AP_OnlineUserInfo/RegistrateForm.js index a259aa17e..27d2da9c9 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AdmissionsPlatform/Views/AP_OnlineUserInfo/RegistrateForm.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AdmissionsPlatform/Views/AP_OnlineUserInfo/RegistrateForm.js @@ -16,7 +16,7 @@ var bootstrap = function ($, learun) { }, bind: function () { $("#SexId").lrDataItemSelect({ code: 'usersex' }); - $('#Nation').lrDataSourceSelect({ code: 'BCdNationality', value: 'nationalityno', text: 'nationality' }); + $("#Nation").lrDataItemSelect({ code: 'National' }); $('#PhotoUrl').lrUploader(); $('#Province').lrDataSourceSelect({ code: 'DIC_PROVINCE', value: 'pcode', text: 'pname', diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AdmissionsPlatform/Views/AP_OnlineUserInfo/RegistrateIndex.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AdmissionsPlatform/Views/AP_OnlineUserInfo/RegistrateIndex.js index 8af6c386c..e223d4e19 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AdmissionsPlatform/Views/AP_OnlineUserInfo/RegistrateIndex.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AdmissionsPlatform/Views/AP_OnlineUserInfo/RegistrateIndex.js @@ -189,12 +189,11 @@ var bootstrap = function ($, learun) { { label: '民族', name: 'Nation', width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) { - learun.clientdata.getAsync('custmerData', { - url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BCdNationality', + learun.clientdata.getAsync('dataItem', { key: value, - keyId: 'nationalityno', + code: 'National', callback: function (_data) { - callback(_data['nationality']); + callback(_data.text); } }); } diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AdmissionsPlatform/Views/AP_OnlineUserInfo/ReportIndex.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AdmissionsPlatform/Views/AP_OnlineUserInfo/ReportIndex.js index 6add32e76..4a3ff6f5b 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AdmissionsPlatform/Views/AP_OnlineUserInfo/ReportIndex.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AdmissionsPlatform/Views/AP_OnlineUserInfo/ReportIndex.js @@ -119,12 +119,11 @@ var bootstrap = function ($, learun) { { label: '民族', name: 'Nation', width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) { - learun.clientdata.getAsync('custmerData', { - url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BCdNationality', + learun.clientdata.getAsync('dataItem', { key: value, - keyId: 'nationalityno', + code: 'National', callback: function (_data) { - callback(_data['nationality']); + callback(_data.text); } }); } diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/EmpInfoController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/EmpInfoController.cs index f91175957..d4e52139f 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/EmpInfoController.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/EmpInfoController.cs @@ -116,11 +116,13 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers //部门 empInfo.DepartmentName = departmentIBLL.GetEntity(empInfo.F_DepartmentId)?.F_FullName; //民族 - var nationality = dataSourceIBLL.GetDataTable("BCdNationality", "t.NationalityNo='" + empInfo.NationalityNo + "'"); - if (nationality != null && nationality.Rows.Count > 0) - { - empInfo.NationalityNo = nationality.Rows[0][1].ToString(); - } + empInfo.NationalityNo = dataItemIBLL.GetDetailList("National").FirstOrDefault(x => x.F_ItemValue == empInfo.NationalityNo)?.F_ItemName; + + //var nationality = dataSourceIBLL.GetDataTable("BCdNationality", "t.NationalityNo='" + empInfo.NationalityNo + "'"); + //if (nationality != null && nationality.Rows.Count > 0) + //{ + // empInfo.NationalityNo = nationality.Rows[0][1].ToString(); + //} //政治面貌 empInfo.PartyFaceNo = dataItemIBLL.GetDetailList("BCdPartyFace").FirstOrDefault(x => x.F_ItemValue == empInfo.PartyFaceNo)?.F_ItemName; 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 cb46f9fc1..b1f3ed245 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 @@ -86,7 +86,7 @@ var bootstrap = function ($, learun) { $('#F_DepartmentId').lrselect(); $('#GenderNo').lrDataItemSelect({ code: 'usersexbit' }); $('#IsHasLesson').lrDataItemSelect({ code: 'YesOrNoBit' }); - $('#NationalityNo').lrDataSourceSelect({ code: 'BCdNationality', value: 'nationalityno', text: 'nationality' }); + $('#NationalityNo').lrDataItemSelect({ code: 'National' }); $('#PartyFaceNo').lrDataItemSelect({ code: 'BCdPartyFace' }); $('#ProvinceNo').lrDataSourceSelect({ code: 'DIC_PROVINCE', value: 'pcode', text: 'pname', 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 82ffb5ace..2ade1f3bd 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 @@ -287,13 +287,13 @@ }); $.ajax({ - url: "/LR_SystemModule/DataSource/GetMap?code=" + "BCdNationality", + url: "/EducationalAdministration/EmpInfoEnternal/GetDataItemMap?code=" + "National", 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 += '' }) $("#NationalityNo").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 766137ce1..54eaa7724 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', 'BCdForeignLanguage', 'BCdHealthStatus','usersexbit', 'JobStatus', 'jsgw', 'PositionLevel', 'CompilationCategory', 'ObtainWay', 'ObtainWay', 'ObtainWayOfDegree', 'ObtainWayOfDegree', 'TechnicalPost', 'TechnicalLevelOfWorker', 'EmpFullTime', 'YesOrNoBit']; +var colDataItemCode = ['BCdPartyFace', 'BCdNationality', 'BCdDegree', 'BCdFamilyOrigin', 'BCdForeignLanguage', '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']; @@ -56,29 +56,7 @@ var bootstrap = function ($, learun) { // 显示信息选项卡 $('#tablist').lrFormTabEx(); $('#tablist li').eq(0).trigger('click'); - //校区 - //$('#F_CompanyId').lrDataSourceSelect({ - // code: 'company', value: 'f_companyid', text: 'f_fullname', - // select: function (item) { - // if (!!item) { - // // 部门 - // $('#F_DepartmentId').lrselectRefresh({ - // type: 'tree', - // // 是否允许搜索 - // allowSearch: true, - // // 访问数据接口地址 - // url: top.$.rootUrl + '/LR_OrganizationModule/Department/GetTree', - // // 访问数据接口参数 - // param: { companyId: item.f_companyid, parentId: '0' } - // }); - // } - // } - //}); - //$('#F_DepartmentId').lrselect(); - //$('#GenderNo').lrDataItemSelect({ code: 'usersexbit' }); - //$('#IsHasLesson').lrDataItemSelect({ code: 'YesOrNoBit' }); - //$('#NationalityNo').lrDataSourceSelect({ code: 'BCdNationality', value: 'nationalityno', text: 'nationality' }); - //$('#PartyFaceNo').lrDataSourceSelect({ code: 'BCdPartyFace', value: 'partyfaceno', text: 'partyface' }); + $('#ProvinceNo').lrDataSourceSelect({ code: 'DIC_PROVINCE', value: 'pcode', text: 'pname', select: function (item) { 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 b6d8696f7..65d9268f1 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 @@ -143,13 +143,11 @@ }, nationalityNo: function (value) { var result; - top.learun.clientdata.getAsync('custmerData', { - sync: true, - url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BCdNationality', + top.learun.clientdata.getAsync('dataItem', { key: value, - keyId: 'nationalityno', + code: 'National', callback: function (_data) { - result = _data['nationality']; + 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 94264deb9..e60e20353 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 @@ -35,7 +35,7 @@ var bootstrap = function ($, learun) { }); $('#F_DepartmentId').lrselect(); $('#GenderNo').lrDataItemSelect({ code: 'usersexbit' }); - $('#NationalityNo').lrDataSourceSelect({ code: 'BCdNationality',value: 'nationalityno',text: 'nationality' }); + $('#NationalityNo').lrDataItemSelect({ code: 'National' }); $('#PartyFaceNo').lrDataItemSelect({ code: 'BCdPartyFace' }); $('#ProvinceNo').lrDataSourceSelect({ code: 'DIC_PROVINCE', value: 'pcode', text: 'pname', 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 d99f4eeeb..e9b526b42 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 @@ -53,7 +53,7 @@ var bootstrap = function ($, learun) { $('#HighestRecord').lrDataItemSelect({ code: 'CollegeType', allowSearch: true }); //民族 - $('#NationalityNo').lrDataSourceSelect({ code: 'BCdNationality', value: 'nationalityno', text: 'nationality' }); + $('#NationalityNo').lrDataItemSelect({ code: 'National', allowSearch: true }); //性别 $('#GenderNo').lrDataItemSelect({ code: 'usersexbit' }); //是否审核 @@ -421,12 +421,11 @@ var bootstrap = function ($, learun) { { label: "民族", name: "NationalityNo", width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) { - learun.clientdata.getAsync('custmerData', { - url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BCdNationality', + learun.clientdata.getAsync('dataItem', { key: value, - keyId: 'nationalityno', + code: 'National', callback: function (_data) { - callback(_data['nationality']); + callback(_data.text); } }); } diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/IndexOfDC.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/IndexOfDC.js index 1839872a2..7c1c6e29e 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/IndexOfDC.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/IndexOfDC.js @@ -329,12 +329,11 @@ var bootstrap = function ($, learun) { { label: "民族", name: "NationalityNo", width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) { - learun.clientdata.getAsync('custmerData', { - url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BCdNationality', + learun.clientdata.getAsync('dataItem', { key: value, - keyId: 'nationalityno', + code: 'National', callback: function (_data) { - callback(_data['nationality']); + 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 c895ec4af..d7ea7b7a5 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 @@ -314,13 +314,13 @@ }); $.ajax({ - url: "/EducationalAdministration/EmpInfoEnternal/GetMap?code=" + "BCdNationality", + url: "/EducationalAdministration/EmpInfoEnternal/GetDataItemMap?code=" + "National", 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 += '' }) $("#NationalityNo").html(str); }, diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/SignUpAboutOnline/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/SignUpAboutOnline/Form.js index d126c175b..6c241b757 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/SignUpAboutOnline/Form.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/SignUpAboutOnline/Form.js @@ -16,7 +16,7 @@ var bootstrap = function ($, learun) { }, bind: function () { $('#Sex').lrDataItemSelect({ code: 'usersex' }); - $('#NationalityNo').lrDataSourceSelect({ code: 'BCdNationality', value: 'nationalityno', text: 'nationality' }); + $('#NationalityNo').lrDataItemSelect({ code: 'National' }); $('#DeptNo').lrDataSourceSelect({ code: 'CdDeptInfo', value: 'deptno', text: 'deptname' }); $('#MajorNo').lrDataSourceSelect({ code: 'CdMajorInfo', value: 'majorno', text: 'majorname' }); $('#PartyFaceNo').lrDataItemSelect({ code: 'BCdPartyFace' }); diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/SignUpAboutOnline/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/SignUpAboutOnline/Index.js index 972194138..49a84e86e 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/SignUpAboutOnline/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/SignUpAboutOnline/Index.js @@ -141,12 +141,11 @@ var bootstrap = function ($, learun) { { label: "民族", name: "NationalityNo", width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) { - learun.clientdata.getAsync('custmerData', { - url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BCdNationality', + learun.clientdata.getAsync('dataItem', { key: value, - keyId: 'nationalityno', + code: 'National', callback: function (_data) { - callback(_data['nationality']); + callback(_data.text); } }); } diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/SignUpAboutTrain/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/SignUpAboutTrain/Form.js index d29c4350f..cca38fec2 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/SignUpAboutTrain/Form.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/SignUpAboutTrain/Form.js @@ -16,7 +16,7 @@ var bootstrap = function ($, learun) { }, bind: function () { $('#Sex').lrDataItemSelect({ code: 'usersex' }); - $('#NationalityNo').lrDataSourceSelect({ code: 'BCdNationality', value: 'nationalityno', text: 'nationality' }); + $('#NationalityNo').lrDataItemSelect({ code: 'National' }); $('#PartyFaceNo').lrDataItemSelect({ code: 'BCdPartyFace' }); $('#CultureDegree').lrDataSourceSelect({ code: 'BCdCultureDegree',value: 'culturedegreeno',text: 'culturedegree' }); $('#ResidenceNo').lrDataItemSelect({ code: 'ResidenceNo' }); diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/SignUpAboutTrain/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/SignUpAboutTrain/Index.js index 5fed1ec2b..369b9ac37 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/SignUpAboutTrain/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/SignUpAboutTrain/Index.js @@ -86,12 +86,11 @@ var bootstrap = function ($, learun) { { label: "民族", name: "NationalityNo", width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) { - learun.clientdata.getAsync('custmerData', { - url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BCdNationality', + learun.clientdata.getAsync('dataItem', { key: value, - keyId: 'nationalityno', + code: 'National', callback: function (_data) { - callback(_data['nationality']); + callback(_data.text); } }); } diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/AllocationClass.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/AllocationClass.js index 6cf76b6b8..471fb686d 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/AllocationClass.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/AllocationClass.js @@ -177,12 +177,11 @@ var bootstrap = function ($, learun) { }, { label: "民族", name: "Nationals", width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) { - learun.clientdata.getAsync('custmerData', { - url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BCdNationality', + learun.clientdata.getAsync('dataItem', { key: value, - keyId: 'nationalityno', + code: 'National', callback: function (_data) { - callback(_data['nationality']); + callback(_data.text); } }); } diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/AllocationDormitory.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/AllocationDormitory.js index dd38e619a..6801ee982 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/AllocationDormitory.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/AllocationDormitory.js @@ -149,12 +149,11 @@ var bootstrap = function ($, learun) { }, { label: "民族", name: "Nationals", width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) { - learun.clientdata.getAsync('custmerData', { - url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BCdNationality', + learun.clientdata.getAsync('dataItem', { key: value, - keyId: 'nationalityno', + code: 'National', callback: function (_data) { - callback(_data['nationality']); + callback(_data.text); } }); } diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/CheckIn.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/CheckIn.js index 22f735063..e782b5a90 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/CheckIn.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/CheckIn.js @@ -236,12 +236,11 @@ var bootstrap = function ($, learun) { }, { label: "民族", name: "Nationals", width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) { - learun.clientdata.getAsync('custmerData', { - url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BCdNationality', + learun.clientdata.getAsync('dataItem', { key: value, - keyId: 'nationalityno', + code: 'National', callback: function (_data) { - callback(_data['nationality']); + callback(_data.text); } }); } diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/Form.js index 3dde645a4..e7de2cac6 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/Form.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/Form.js @@ -21,7 +21,7 @@ var bootstrap = function ($, learun) { $('#SubsidizeUrl').lrUploader(); $('#Gender').lrDataItemSelect({ code: 'usersexbit' }); //民族 - $('#Nationals').lrDataSourceSelect({ code: 'BCdNationality', value: 'nationalityno', text: 'nationality' }); + $('#Nationals').lrDataItemSelect({ code: 'National' }); //政治面貌 //$('#Political').lrDataSourceSelect({ code: 'BCdPartyFace', value: 'partyfaceno', text: 'partyface' }); $('#Political').lrDataItemSelect({ code: 'BCdPartyFace' }); diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/FormView.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/FormView.js index 698f04a0d..0f7fb355c 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/FormView.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/FormView.js @@ -21,7 +21,7 @@ var bootstrap = function ($, learun) { $('#SubsidizeUrl').lrUploader(); $('#Gender').lrDataItemSelect({ code: 'usersexbit' }); //民族 - $('#Nationals').lrDataSourceSelect({ code: 'BCdNationality', value: 'nationalityno', text: 'nationality' }); + $('#Nationals').lrDataItemSelect({ code: 'National' }); //政治面貌 $('#Political').lrDataItemSelect({ code: 'BCdPartyFace' }); $('#ClassNo').lrDataSourceSelect({ code: 'bjsj', value: 'classno', text: 'classname' }); diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/GetArticles.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/GetArticles.js index a65fa0474..995b60b99 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/GetArticles.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/GetArticles.js @@ -201,12 +201,11 @@ var bootstrap = function ($, learun) { }, { label: "民族", name: "Nationals", width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) { - learun.clientdata.getAsync('custmerData', { - url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BCdNationality', + learun.clientdata.getAsync('dataItem', { key: value, - keyId: 'nationalityno', + code: 'National', callback: function (_data) { - callback(_data['nationality']); + callback(_data.text); } }); } diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/GetCloth.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/GetCloth.js index 951773d51..e948ed27c 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/GetCloth.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/GetCloth.js @@ -201,12 +201,11 @@ var bootstrap = function ($, learun) { }, { label: "民族", name: "Nationals", width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) { - learun.clientdata.getAsync('custmerData', { - url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BCdNationality', + learun.clientdata.getAsync('dataItem', { key: value, - keyId: 'nationalityno', + code: 'National', callback: function (_data) { - callback(_data['nationality']); + callback(_data.text); } }); } diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/GetClothSize.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/GetClothSize.js index 11bb8b0bd..1f6f13aa9 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/GetClothSize.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/GetClothSize.js @@ -197,12 +197,11 @@ var bootstrap = function ($, learun) { }, { label: "民族", name: "Nationals", width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) { - learun.clientdata.getAsync('custmerData', { - url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BCdNationality', + learun.clientdata.getAsync('dataItem', { key: value, - keyId: 'nationalityno', + code: 'National', callback: function (_data) { - callback(_data['nationality']); + callback(_data.text); } }); } diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/Index.js index 58306614c..e1911ff1b 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/Index.js @@ -364,12 +364,11 @@ var bootstrap = function ($, learun) { { label: "年级", name: "Grade", width: 100, align: "left" }, { label: "民族", name: "Nationals", width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) { - learun.clientdata.getAsync('custmerData', { - url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BCdNationality', + learun.clientdata.getAsync('dataItem', { key: value, - keyId: 'nationalityno', + code: 'National', callback: function (_data) { - callback(_data['nationality']); + callback(_data.text); } }); } diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/IsPay.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/IsPay.js index 043b25250..682da9123 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/IsPay.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/IsPay.js @@ -233,12 +233,11 @@ var bootstrap = function ($, learun) { }, { label: "民族", name: "Nationals", width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) { - learun.clientdata.getAsync('custmerData', { - url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BCdNationality', + learun.clientdata.getAsync('dataItem', { key: value, - keyId: 'nationalityno', + code: 'National', callback: function (_data) { - callback(_data['nationality']); + callback(_data.text); } }); } diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/IsPhoto.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/IsPhoto.js index 8072a218a..665bc7929 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/IsPhoto.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/IsPhoto.js @@ -193,12 +193,11 @@ var bootstrap = function ($, learun) { }, { label: "民族", name: "Nationals", width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) { - learun.clientdata.getAsync('custmerData', { - url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BCdNationality', + learun.clientdata.getAsync('dataItem', { key: value, - keyId: 'nationalityno', + code: 'National', callback: function (_data) { - callback(_data['nationality']); + callback(_data.text); } }); } diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/Military.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/Military.js index d1c81f8cb..7cad7dd03 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/Military.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/Military.js @@ -231,12 +231,11 @@ var bootstrap = function ($, learun) { }, { label: "民族", name: "Nationals", width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) { - learun.clientdata.getAsync('custmerData', { - url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BCdNationality', + learun.clientdata.getAsync('dataItem', { key: value, - keyId: 'nationalityno', + code: 'National', callback: function (_data) { - callback(_data['nationality']); + callback(_data.text); } }); } diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/NewAllocationBed.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/NewAllocationBed.js index b1679df3e..3411b34ff 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/NewAllocationBed.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/NewAllocationBed.js @@ -117,12 +117,11 @@ var bootstrap = function ($, learun) { }, { label: "民族", name: "Nationals", width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) { - learun.clientdata.getAsync('custmerData', { - url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BCdNationality', + learun.clientdata.getAsync('dataItem', { key: value, - keyId: 'nationalityno', + code: 'National', callback: function (_data) { - callback(_data['nationality']); + callback(_data.text); } }); } diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/PayAfter.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/PayAfter.js index 63acb6a87..6190cd4f7 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/PayAfter.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/PayAfter.js @@ -319,12 +319,11 @@ var bootstrap = function ($, learun) { }, { label: "民族", name: "Nationals", width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) { - learun.clientdata.getAsync('custmerData', { - url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BCdNationality', + learun.clientdata.getAsync('dataItem', { key: value, - keyId: 'nationalityno', + code: 'National', callback: function (_data) { - callback(_data['nationality']); + callback(_data.text); } }); } diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/Report.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/Report.js index 91d8b6d8a..f019ab9fc 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/Report.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/Report.js @@ -297,12 +297,11 @@ var bootstrap = function ($, learun) { }, { label: "民族", name: "Nationals", width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) { - learun.clientdata.getAsync('custmerData', { - url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BCdNationality', + learun.clientdata.getAsync('dataItem', { key: value, - keyId: 'nationalityno', + code: 'National', callback: function (_data) { - callback(_data['nationality']); + callback(_data.text); } }); } diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/StuTuition.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/StuTuition.js index fef5a18cb..eebc7118c 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/StuTuition.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/StuTuition.js @@ -316,12 +316,11 @@ var bootstrap = function ($, learun) { }, { label: "民族", name: "Nationals", width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) { - learun.clientdata.getAsync('custmerData', { - url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BCdNationality', + learun.clientdata.getAsync('dataItem', { key: value, - keyId: 'nationalityno', + code: 'National', callback: function (_data) { - callback(_data['nationality']); + 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 7d97f3c89..85ee14778 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 @@ -104,7 +104,7 @@ var bootstrap = function ($, learun) { }); $('#HealthStatus').lrDataItemSelect({ code: 'QRCodeHealthStatus' }); $('#F_SchoolId').lrDataSourceSelect({ code: 'company', value: 'f_companyid', text: 'f_fullname' }); - $('#NationalityNo').lrDataSourceSelect({ code: 'BCdNationality', value: 'nationalityno', text: 'nationality' }); + $('#NationalityNo').lrDataItemSelect({ code: 'National' }); $('#GenderNo').lrDataItemSelect({ code: 'usersexbit' }); $('#PartyFaceNo').lrDataItemSelect({ code: 'BCdPartyFace' }); $('#HealthStatusNo').lrDataItemSelect({ code: 'BCdHealthStatus' }); 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 a2887e4e9..7e1d73ea8 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 @@ -104,7 +104,7 @@ var bootstrap = function ($, learun) { }); $('#HealthStatus').lrDataItemSelect({ code: 'QRCodeHealthStatus' }); $('#F_SchoolId').lrDataSourceSelect({ code: 'company', value: 'f_companyid', text: 'f_fullname' }); - $('#NationalityNo').lrDataSourceSelect({ code: 'BCdNationality', value: 'nationalityno', text: 'nationality' }); + $('#NationalityNo').lrDataItemSelect({ code: 'National' }); $('#GenderNo').lrDataItemSelect({ code: 'usersexbit' }); $('#PartyFaceNo').lrDataItemSelect({ code: 'BCdPartyFace' }); $('#HealthStatusNo').lrDataItemSelect({ code: 'BCdHealthStatus' }); @@ -186,13 +186,13 @@ var bootstrap = function ($, learun) { $('#OneMembership').lrDataItemSelect({ code: 'FamilyRelation' }); $('#OneIsGuardian').lrDataItemSelect({ code: 'YesOrNoInt' }); $('#OneIdCardType').lrDataItemSelect({ code: 'IdCardType' }); - $('#OneNationalityNo').lrDataSourceSelect({ code: 'BCdNationality', value: 'nationalityno', text: 'nationality' }); + $('#OneNationalityNo').lrDataItemSelect({ code: 'National' }); $('#OnePartyFaceNo').lrDataItemSelect({ code: 'BCdPartyFace' }); $('#OneHealthStatus').lrDataItemSelect({ code: 'BCdHealthStatus' }); $('#TwoMembership').lrDataItemSelect({ code: 'FamilyRelation' }); $('#TwoIsGuardian').lrDataItemSelect({ code: 'YesOrNoInt' }); $('#TwoIdCardType').lrDataItemSelect({ code: 'IdCardType' }); - $('#TwoNationalityNo').lrDataSourceSelect({ code: 'BCdNationality', value: 'nationalityno', text: 'nationality' }); + $('#TwoNationalityNo').lrDataItemSelect({ code: 'National' }); $('#TwoPartyFaceNo').lrDataItemSelect({ code: 'BCdPartyFace' }); $('#TwoHealthStatus').lrDataItemSelect({ code: 'BCdHealthStatus' }); 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 8c8663a0c..c830af7c6 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 @@ -166,13 +166,11 @@ }, nationalityNo: function (value) { var result; - top.learun.clientdata.getAsync('custmerData', { - sync: true, - url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BCdNationality', + top.learun.clientdata.getAsync('dataItem', { key: value, - keyId: 'nationalityno', + code: 'National', callback: function (_data) { - result = _data['nationality']; + result = _data.text; } }); return result; 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 fca8190a3..c370d5d1c 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 @@ -63,7 +63,7 @@ var bootstrap = function ($, learun) { text: 'text' }); $('#F_SchoolId').lrDataSourceSelect({ code: 'company', value: 'f_companyid', text: 'f_fullname' }); - $('#NationalityNo').lrDataSourceSelect({ code: 'BCdNationality', value: 'nationalityno', text: 'nationality' }); + $('#NationalityNo').lrDataItemSelect({ code: 'National' }); $('#GenderNo').lrDataItemSelect({ code: 'usersexbit' }); $('#PartyFaceNo').lrDataItemSelect({ code: 'BCdPartyFace' }); $('#HealthStatusNo').lrDataItemSelect({ code: 'BCdHealthStatus' }); diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/Index.js index 32b299e21..9937aa2fa 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/Index.js @@ -311,12 +311,11 @@ var bootstrap = function ($, learun) { { label: "民族", name: "NationalityNo", width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) { - learun.clientdata.getAsync('custmerData', { - url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BCdNationality', + learun.clientdata.getAsync('dataItem', { key: value, - keyId: 'nationalityno', + code: 'National', callback: function (_data) { - callback(_data['nationality']); + callback(_data.text); } }); } diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/IndexInClass.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/IndexInClass.js index 33591b29a..c00fc6a07 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/IndexInClass.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/IndexInClass.js @@ -58,12 +58,11 @@ var bootstrap = function ($, learun) { }, { label: '民族', name: 'NationalityNo', width: 80, align: "left", formatterAsync: function (callback, value, row, op, $cell) { - learun.clientdata.getAsync('custmerData', { - url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BCdNationality', + learun.clientdata.getAsync('dataItem', { key: value, - keyId: 'nationalityno', + code: 'National', callback: function (_data) { - callback(_data['nationality']); + callback(_data.text); } }); } diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/IndexOfDC.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/IndexOfDC.js index 26b137980..177bc229d 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/IndexOfDC.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/IndexOfDC.js @@ -376,12 +376,11 @@ var bootstrap = function ($, learun) { { label: "民族", name: "NationalityNo", width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) { - learun.clientdata.getAsync('custmerData', { - url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BCdNationality', + learun.clientdata.getAsync('dataItem', { key: value, - keyId: 'nationalityno', + code: 'National', callback: function (_data) { - callback(_data['nationality']); + callback(_data.text); } }); } @@ -539,12 +538,11 @@ var bootstrap = function ($, learun) { { label: "成员1民族", name: "OneNationalityNo", width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) { - learun.clientdata.getAsync('custmerData', { - url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BCdNationality', + learun.clientdata.getAsync('dataItem', { key: value, - keyId: 'nationalityno', + code: 'National', callback: function (_data) { - callback(_data['nationality']); + callback(_data.text); } }); } @@ -615,12 +613,11 @@ var bootstrap = function ($, learun) { { label: "成员2民族", name: "TwoNationalityNo", width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) { - learun.clientdata.getAsync('custmerData', { - url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BCdNationality', + learun.clientdata.getAsync('dataItem', { key: value, - keyId: 'nationalityno', + code: 'National', callback: function (_data) { - callback(_data['nationality']); + callback(_data.text); } }); } diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/MyClass.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/MyClass.js index 27c3ef44c..c2757cb65 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/MyClass.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/MyClass.js @@ -38,12 +38,11 @@ var bootstrap = function ($, learun) { { label: "民族", name: "NationalityNo", width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) { - learun.clientdata.getAsync('custmerData', { - url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BCdNationality', + learun.clientdata.getAsync('dataItem', { key: value, - keyId: 'nationalityno', + code: 'National', callback: function (_data) { - callback(_data['nationality']); + callback(_data.text); } }); } diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/Print.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/Print.cshtml index ca74ee8ab..f79a73029 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/Print.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/Print.cshtml @@ -138,7 +138,7 @@ return; }; GetDataItemStr("usersexbit", "@Model.GenderNo","#GenderNo"); - GetDataSourceStr("BCdNationality", "nationalityno", "nationality", "@Model.NationalityNo", "#NationalityNo"); + GetDataItemStr("BCdNationality", "@Model.NationalityNo","#NationalityNo"); GetDataSourceStr("CdDeptInfo", "deptno", "deptname", "@Model.DeptNo", "#DeptNo"); GetDataSourceStr("CdMajorInfo", "majorno", "majorname", "@Model.MajorNo", "#MajorNo"); GetDataSourceStr("bjsj", "classno", "classname", "@Model.ClassNo", "#ClassNo"); diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasicTwo/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasicTwo/Index.js index e8bd357d4..481375f0b 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasicTwo/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasicTwo/Index.js @@ -110,12 +110,11 @@ var bootstrap = function ($, learun) { { label: '民族', name: 'NationalityNo', width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) { - learun.clientdata.getAsync('custmerData', { - url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BCdNationality', + learun.clientdata.getAsync('dataItem', { key: value, - keyId: 'nationalityno', + code: 'National', callback: function (_data) { - callback(_data['nationality']); + callback(_data.text); } }); } diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/AllocationClassDC.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/AllocationClassDC.js index cdc17de11..f8dfe32fb 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/AllocationClassDC.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/AllocationClassDC.js @@ -107,12 +107,11 @@ var bootstrap = function ($, learun) { }, { label: '民族', name: 'NationalityNo', width: 80, align: "left", formatterAsync: function (callback, value, row, op, $cell) { - learun.clientdata.getAsync('custmerData', { - url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BCdNationality', + learun.clientdata.getAsync('dataItem', { key: value, - keyId: 'nationalityno', + code: 'National', callback: function (_data) { - callback(_data['nationality']); + callback(_data.text); } }); } diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/CollectFileIndex.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/CollectFileIndex.js index 5997a5755..edbcd88c8 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/CollectFileIndex.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/CollectFileIndex.js @@ -139,12 +139,11 @@ var bootstrap = function ($, learun) { { label: '身份证号', name: 'IdentityCardNo', width: 150, align: "left" }, { label: '民族', name: 'NationalityNo', width: 80, align: "left", formatterAsync: function (callback, value, row, op, $cell) { - learun.clientdata.getAsync('custmerData', { - url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BCdNationality', + learun.clientdata.getAsync('dataItem', { key: value, - keyId: 'nationalityno', + code: 'National', callback: function (_data) { - callback(_data['nationality']); + callback(_data.text); } }); } diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/Form.js index f588d59af..abbfefd90 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/Form.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/Form.js @@ -18,7 +18,7 @@ var bootstrap = function ($, learun) { $("#GenderNo").lrDataItemSelect({ code: 'usersex' }); $("#PartyFaceNo").lrDataItemSelect({ code: 'BCdPartyFace' }); $("#FamilyOriginNo").lrDataItemSelect({ code: 'ExamineeCategory' }); - $('#NationalityNo').lrDataSourceSelect({ code: 'BCdNationality', value: 'nationalityno', text: 'nationality' }); + $("#NationalityNo").lrDataItemSelect({ code: 'National' }); $("#TestStuSortNo").lrDataItemSelect({ code: 'ExamineeType' }); $("#TestStuSubjectNo").lrDataItemSelect({ code: 'SubjectType' }); $("#HighTestSortNo").lrDataItemSelect({ code: 'GraduateCategory' }); diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/FormDC.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/FormDC.js index 6c91de30f..bf50e4133 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/FormDC.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/FormDC.js @@ -19,7 +19,7 @@ var bootstrap = function ($, learun) { $("#IsAccommodate").lrDataItemSelect({ code: 'YesOrNoInt' }); $("#PartyFaceNo").lrDataItemSelect({ code: 'BCdPartyFace' }); $("#FamilyOriginNo").lrDataItemSelect({ code: 'ExamineeCategory' }); - $('#NationalityNo').lrDataSourceSelect({ code: 'BCdNationality', value: 'nationalityno', text: 'nationality' }); + $("#NationalityNo").lrDataItemSelect({ code: 'National' }); $("#TestStuSortNo").lrDataItemSelect({ code: 'ExamineeType' }); $("#TestStuSubjectNo").lrDataItemSelect({ code: 'SubjectType' }); $("#HighTestSortNo").lrDataItemSelect({ code: 'GraduateCategory' }); diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/FormOfStudent.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/FormOfStudent.js index de5fff142..272f02d9c 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/FormOfStudent.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/FormOfStudent.js @@ -19,7 +19,7 @@ var bootstrap = function ($, learun) { $("#GenderNo").lrDataItemSelect({ code: 'usersex' }); $("#PartyFaceNo").lrDataItemSelect({ code: 'BCdPartyFace' }); $("#FamilyOriginNo").lrDataItemSelect({ code: 'ExamineeCategory' }); - $('#NationalityNo').lrDataSourceSelect({ code: 'BCdNationality', value: 'nationalityno', text: 'nationality' }); + $("#NationalityNo").lrDataItemSelect({ code: 'National' }); $("#TestStuSortNo").lrDataItemSelect({ code: 'ExamineeType' }); $("#TestStuSubjectNo").lrDataItemSelect({ code: 'SubjectType' }); $("#HighTestSortNo").lrDataItemSelect({ code: 'GraduateCategory' }); diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/FormView.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/FormView.js index 59765f84e..1d1fbd919 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/FormView.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/FormView.js @@ -18,7 +18,7 @@ var bootstrap = function ($, learun) { $("#GenderNo").lrDataItemSelect({ code: 'usersex' }); $("#PartyFaceNo").lrDataItemSelect({ code: 'BCdPartyFace' }); $("#FamilyOriginNo").lrDataItemSelect({ code: 'ExamineeCategory' }); - $('#NationalityNo').lrDataSourceSelect({ code: 'BCdNationality', value: 'nationalityno', text: 'nationality' }); + $("#NationalityNo").lrDataItemSelect({ code: 'National' }); $("#TestStuSortNo").lrDataItemSelect({ code: 'ExamineeType' }); $("#TestStuSubjectNo").lrDataItemSelect({ code: 'SubjectType' }); $("#HighTestSortNo").lrDataItemSelect({ code: 'GraduateCategory' }); diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/GetKeyIndex.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/GetKeyIndex.js index afcc0904e..729f8ccc6 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/GetKeyIndex.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/GetKeyIndex.js @@ -259,12 +259,11 @@ var bootstrap = function ($, learun) { { label: '身份证号', name: 'IdentityCardNo', width: 150, align: "left" }, { label: '民族', name: 'NationalityNo', width: 80, align: "left", formatterAsync: function (callback, value, row, op, $cell) { - learun.clientdata.getAsync('custmerData', { - url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BCdNationality', + learun.clientdata.getAsync('dataItem', { key: value, - keyId: 'nationalityno', + code: 'National', callback: function (_data) { - callback(_data['nationality']); + callback(_data.text); } }); } diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/Index.js index 296d47d15..c8c3684b6 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/Index.js @@ -248,12 +248,11 @@ var bootstrap = function ($, learun) { { label: '身份证号', name: 'IdentityCardNo', width: 150, align: "left" }, { label: '民族', name: 'NationalityNo', width: 80, align: "left", formatterAsync: function (callback, value, row, op, $cell) { - learun.clientdata.getAsync('custmerData', { - url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BCdNationality', + learun.clientdata.getAsync('dataItem', { key: value, - keyId: 'nationalityno', + code: 'National', callback: function (_data) { - callback(_data['nationality']); + callback(_data.text); } }); } diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/IndexDC.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/IndexDC.js index dfcca271a..436a027c4 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/IndexDC.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/IndexDC.js @@ -179,12 +179,11 @@ var bootstrap = function ($, learun) { }, { label: '民族', name: 'NationalityNo', width: 80, align: "left", formatterAsync: function (callback, value, row, op, $cell) { - learun.clientdata.getAsync('custmerData', { - url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BCdNationality', + learun.clientdata.getAsync('dataItem', { key: value, - keyId: 'nationalityno', + code: 'National', callback: function (_data) { - callback(_data['nationality']); + callback(_data.text); } }); } diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/IndexOfStudent.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/IndexOfStudent.js index 416379aa8..76c446b7b 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/IndexOfStudent.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/IndexOfStudent.js @@ -99,12 +99,11 @@ var bootstrap = function ($, learun) { { label: '身份证号', name: 'IdentityCardNo', width: 150, align: "left" }, { label: '民族', name: 'NationalityNo', width: 80, align: "left", formatterAsync: function (callback, value, row, op, $cell) { - learun.clientdata.getAsync('custmerData', { - url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BCdNationality', + learun.clientdata.getAsync('dataItem', { key: value, - keyId: 'nationalityno', + code: 'National', callback: function (_data) { - callback(_data['nationality']); + callback(_data.text); } }); } diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/RegisterIndex.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/RegisterIndex.js index dfc099167..48807eb25 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/RegisterIndex.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/RegisterIndex.js @@ -186,12 +186,11 @@ var bootstrap = function ($, learun) { { label: '民族', name: 'NationalityNo', width: 80, align: "left", formatterAsync: function (callback, value, row, op, $cell) { - learun.clientdata.getAsync('custmerData', { - url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BCdNationality', + learun.clientdata.getAsync('dataItem', { key: value, - keyId: 'nationalityno', + code: 'National', callback: function (_data) { - callback(_data['nationality']); + callback(_data.text); } }); } diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/SchoolUniform.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/SchoolUniform.js index b08b12f57..915bcc5d3 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/SchoolUniform.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/SchoolUniform.js @@ -205,12 +205,11 @@ var bootstrap = function ($, learun) { }, { label: '民族', name: 'NationalityNo', width: 80, align: "left", formatterAsync: function (callback, value, row, op, $cell) { - learun.clientdata.getAsync('custmerData', { - url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BCdNationality', + learun.clientdata.getAsync('dataItem', { key: value, - keyId: 'nationalityno', + code: 'National', callback: function (_data) { - callback(_data['nationality']); + callback(_data.text); } }); } diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/StatusView.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/StatusView.js index e9acf7567..2df2a428a 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/StatusView.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/StatusView.js @@ -185,12 +185,11 @@ var bootstrap = function ($, learun) { { label: '身份证号', name: 'IdentityCardNo', width: 150, align: "left" }, { label: '民族', name: 'NationalityNo', width: 80, align: "left", formatterAsync: function (callback, value, row, op, $cell) { - learun.clientdata.getAsync('custmerData', { - url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BCdNationality', + learun.clientdata.getAsync('dataItem', { key: value, - keyId: 'nationalityno', + code: 'National', callback: function (_data) { - callback(_data['nationality']); + callback(_data.text); } }); } diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoGraduate/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoGraduate/Index.js index 6e0f69b88..47e23c1fa 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoGraduate/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoGraduate/Index.js @@ -39,12 +39,11 @@ var bootstrap = function ($, learun) { { label: "民族", name: "NationalityNo", width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) { - learun.clientdata.getAsync('custmerData', { - url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BCdNationality', + learun.clientdata.getAsync('dataItem', { key: value, - keyId: 'nationalityno', + code: 'National', callback: function (_data) { - callback(_data['nationality']); + callback(_data.text); } }); } 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 2f2595dba..d6ab1a52b 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 @@ -263,13 +263,11 @@ filter_BCdNationality: function (value) { var result; - top.learun.clientdata.getAsync('custmerData', { - sync: true, - url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BCdNationality', + top.learun.clientdata.getAsync('dataItem', { key: value, - keyId: 'nationalityno', + code: 'National', callback: function (_data) { - result = _data['nationality']; + result = _data.text; } }); return result; diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/LeagueMember/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/LeagueMember/Form.js index 232fdac04..193ed1888 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/LeagueMember/Form.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/LeagueMember/Form.js @@ -30,7 +30,7 @@ var bootstrap = function ($, learun) { //}); $('#Gender').lrDataItemSelect({ code: 'usersex' }); $('#IsInJob').lrDataItemSelect({ code: 'YesOrNoInt' }); - $('#Nation').lrDataSourceSelect({ code: 'BCdNationality', value: 'nationalityno', text: 'nationality' }); + $('#Nation').lrDataItemSelect({ code: 'National' }); }, initData: function () { diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/LeagueMember/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/LeagueMember/Index.js index bb9c7fba6..b50307910 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/LeagueMember/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/LeagueMember/Index.js @@ -84,12 +84,11 @@ var bootstrap = function ($, learun) { { label: "民族", name: "Nation", width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) { - learun.clientdata.getAsync('custmerData', { - url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BCdNationality', + learun.clientdata.getAsync('dataItem', { key: value, - keyId: 'nationalityno', + code: 'National', callback: function (_data) { - callback(_data['nationality']); + callback(_data.text); } }); } diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/PMCadre/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/PMCadre/Form.js index 339855726..ffafc8998 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/PMCadre/Form.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/PMCadre/Form.js @@ -17,7 +17,7 @@ var bootstrap = function ($, learun) { bind: function () { $('#Gender').lrDataItemSelect({ code: 'usersex' }); $('#IsInJob').lrDataItemSelect({ code: 'YesOrNoInt' }); - $('#Nation').lrDataSourceSelect({ code: 'BCdNationality', value: 'nationalityno', text: 'nationality' }); + $('#Nation').lrDataItemSelect({ code: 'National' }); }, initData: function () { if (!!keyValue) { diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/PMCadre/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/PMCadre/Index.js index 957954e4b..9d80b1193 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/PMCadre/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/PMCadre/Index.js @@ -85,12 +85,11 @@ var bootstrap = function ($, learun) { { label: "民族", name: "Nation", width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) { - learun.clientdata.getAsync('custmerData', { - url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BCdNationality', + learun.clientdata.getAsync('dataItem', { key: value, - keyId: 'nationalityno', + code: 'National', callback: function (_data) { - callback(_data['nationality']); + callback(_data.text); } }); } diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/PMMembership/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/PMMembership/Form.js index 0a27b23b8..4cf39be37 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/PMMembership/Form.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/PMMembership/Form.js @@ -17,7 +17,7 @@ var bootstrap = function ($, learun) { bind: function () { $('#Gender').lrDataItemSelect({ code: 'usersex' }); $('#IsInJob').lrDataItemSelect({ code: 'YesOrNoInt' }); - $('#Nation').lrDataSourceSelect({ code: 'BCdNationality', value: 'nationalityno', text: 'nationality' }); + $('#Nation').lrDataItemSelect({ code: 'National' }); $('#Education').lrDataSourceSelect({ code: 'BCdCultureDegree', value: 'culturedegreeno', text: 'culturedegree' }); }, diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/PMMembership/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/PMMembership/Index.js index 70e38bc14..bd51d1f8c 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/PMMembership/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/PMMembership/Index.js @@ -81,12 +81,11 @@ var bootstrap = function ($, learun) { { label: "民族", name: "Nation", width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) { - learun.clientdata.getAsync('custmerData', { - url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BCdNationality', + learun.clientdata.getAsync('dataItem', { key: value, - keyId: 'nationalityno', + code: 'National', callback: function (_data) { - callback(_data['nationality']); + callback(_data.text); } }); } diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/OnlineRegistrate/RegistrateForm.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/OnlineRegistrate/RegistrateForm.cshtml index 4830218e0..aa5307eb8 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/OnlineRegistrate/RegistrateForm.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/OnlineRegistrate/RegistrateForm.cshtml @@ -341,7 +341,7 @@ GetDataSourceStr("DIC_CITY", "ccode", "cname", "@Model.City", "#City"); GetDataSourceStr("DIC_AREA", "acode", "aname", "@Model.Country", "#Country"); GetDataItemStr("usersex", "@Model.SexId", "#SexId"); - GetDataSourceStr("BCdNationality", "nationalityno", "nationality", "@Model.Nation", "#Nation"); + GetDataItemStr("National", "@Model.Nation", "#Nation"); GetDataItemStr("FamilyBirth", "@Model.AP_OnlineStudentInfoEntity.FamilyBirthId", "#FamilyBirthId"); GetDataItemStr("BCdPartyFace", "@Model.PoliticsFace", "#PoliticsFace"); GetDataSourceStr("BCdCultureDegree", "culturedegreeno", "culturedegree", "@Model.AP_OnlineStudentInfoEntity.CultureId", "#CultureId"); diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/OnlineRegistrate/RegistrateFormEdit.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/OnlineRegistrate/RegistrateFormEdit.cshtml index ca97b545a..83fd556aa 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/OnlineRegistrate/RegistrateFormEdit.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/OnlineRegistrate/RegistrateFormEdit.cshtml @@ -848,7 +848,7 @@ SetDataItemSelect("usersex", "@Model.SexId", "#SexId"); SetDataSourceSelect("BCdCultureDegree", "culturedegreeno", "culturedegree", "@Model.AP_OnlineStudentInfoEntity.CultureId", "#CultureId"); SetDataItemSelect("BCdPartyFace", "@Model.PoliticsFace", "#PoliticsFace"); - SetDataSourceSelect("BCdNationality", "nationalityno", "nationality", "@Model.Nation", "#Nation"); + GetDataItemStr("National", "@Model.Nation", "#Nation"); SetDataItemSelect("MarriageType", "@Model.AP_OnlineStudentInfoEntity.MarriageId", "#MarriageId"); SetDataItemSelect("FamilyBirth", "@Model.AP_OnlineStudentInfoEntity.FamilyBirthId", "#FamilyBirthId"); SetDataItemSelect("ResidenceNo", "@Model.OriginId", "#OriginId"); 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 66b798321..e02f9d5df 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 @@ -223,13 +223,11 @@ }, nationalityNo: function (value) { var result; - top.learun.clientdata.getAsync('custmerData', { - sync: true, - url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BCdNationality', + top.learun.clientdata.getAsync('dataItem', { key: value, - keyId: 'nationalityno', + code: 'National', callback: function (_data) { - result = _data['nationality']; + result = _data.text; } }); return result; @@ -483,13 +481,11 @@ }, nationalityNo: function (value) { var result; - top.learun.clientdata.getAsync('custmerData', { - sync: true, - url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BCdNationality', + top.learun.clientdata.getAsync('dataItem', { key: value, - keyId: 'nationalityno', + code: 'National', callback: function (_data) { - result = _data['nationality']; + 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 a3936e916..325cdc47f 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 @@ -223,13 +223,11 @@ }, nationalityNo: function (value) { var result; - top.learun.clientdata.getAsync('custmerData', { - sync: true, - url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BCdNationality', + top.learun.clientdata.getAsync('dataItem', { key: value, - keyId: 'nationalityno', + code: 'National', callback: function (_data) { - result = _data['nationality']; + result = _data.text; } }); return result; @@ -490,13 +488,11 @@ }, nationalityNo: function (value) { var result; - top.learun.clientdata.getAsync('custmerData', { - sync: true, - url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BCdNationality', + top.learun.clientdata.getAsync('dataItem', { key: value, - keyId: 'nationalityno', + code: 'National', callback: function (_data) { - result = _data['nationality']; + 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 ad6642b33..877b59eff 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 @@ -209,13 +209,11 @@ }, nationalityNo: function (value) { var result; - top.learun.clientdata.getAsync('custmerData', { - sync: true, - url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BCdNationality', + top.learun.clientdata.getAsync('dataItem', { key: value, - keyId: 'nationalityno', + code: 'National', callback: function (_data) { - result = _data['nationality']; + result = _data.text; } }); return result; @@ -531,13 +529,11 @@ }, nationalityNo: function (value) { var result; - top.learun.clientdata.getAsync('custmerData', { - sync: true, - url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BCdNationality', + top.learun.clientdata.getAsync('dataItem', { key: value, - keyId: 'nationalityno', + code: 'National', callback: function (_data) { - result = _data['nationality']; + result = _data.text; } }); return result; diff --git a/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/Feixing/UserApiController.cs b/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/Feixing/UserApiController.cs index 6f30aaf94..ef3b36e23 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/Feixing/UserApiController.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/Feixing/UserApiController.cs @@ -313,14 +313,14 @@ namespace Learun.Application.WebApi.Modules.Feixing } if (req == "Nation") { - var data = dataSourceIBLL.GetDataTable("BCdNationality", ""); + var data = dataItemIBLL.GetDetailList("National", ""); DictDataModel dictDataModel = new DictDataModel(); - for (int i = 0; i < data.Rows.Count; i++) + foreach (var t in data) { dictDataModel.Items.Add(new SysDictDetailApiViewModel { - ItemName = data.Rows[i]["nationality"].ToString(), - ItemValue = data.Rows[i]["nationalityno"].ToString() + ItemName = t.F_ItemName, + ItemValue = t.F_ItemValue }); } return Success("OK", dictDataModel); 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 ed9e01d24..084b50faf 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 @@ -818,7 +818,7 @@ namespace Learun.Application.Excel { empinfoEntity.IdentityCardNo = dr["身份证号"].ToString(); empinfoEntity.Birthday = Convert.ToDateTime(dr["出生日期"].ToString()); - empinfoEntity.NationalityNo = dataSourceIBLL.GetKeyByValue("BCdNationality", "nationality", dr["民族"].ToString(), "nationalityno"); + empinfoEntity.NationalityNo = FindDataItemValue(dataItemIBLL.GetDetailList("National"), dr["民族"].ToString(), "民族", false); empinfoEntity.LocusOfResidence = dr["籍贯"].ToString(); empinfoEntity.PartyFaceNo = FindDataItemValue(dataItemIBLL.GetDetailList("BCdPartyFace"), dr["政治面貌"].ToString(), "政治面貌", false); empinfoEntity.JoinPartyTime = dr["入党（团）时间"].ToString();