民族BCdNationality 改为读取字典

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);
                                 }

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);
                                 }
                             });
                         }

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',

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);
                                 }
                             });
                         }

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);
                                 }
                             });
                         }

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;
                 

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',

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 = '<option value="">请选择</option>';
                     $.each(companys, function (i, item) {
-                        str += '<option value="' + item.nationalityno + '">' + item.nationality + '</option>'
+                        str += '<option value="' + item["F_ItemValue"] + '">' + item["F_ItemName"] + '</option>'
                     })
                     $("#NationalityNo").html(str);
                 },

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) {

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;

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',

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);
                                 }
                             });
                         }

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);
                                 }
                             });
                         }

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 = '<option value="">请选择</option>';
-                    $.each(companys, function (i, item) {
-                        str += '<option value="' + item.nationalityno + '">' + item.nationality + '</option>'
+                    $.each(msgObject.data, function (i, item) {
+                        str += '<option value="' + item["F_ItemValue"] + '">' + item["F_ItemName"] + '</option>'
                     })
                     $("#NationalityNo").html(str);
                 },

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' });

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);
                                 }
                             });
                         }

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' });

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);
                                 }
                             });
                         }

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);
                                 }
                             });
                         }

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);
                                 }
                             });
                         }

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);
                                 }
                             });
                         }

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' });

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' });

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);
                                 }
                             });
                         }

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);
                                 }
                             });
                         }

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);
                                 }
                             });
                         }

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);
                                 }
                             });
                         }

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);
                                 }
                             });
                         }

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);
                                 }
                             });
                         }

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);
                                 }
                             });
                         }

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);
                                 }
                             });
                         }

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);
                                 }
                             });
                         }

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);
                                 }
                             });
                         }

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);
                                 }
                             });
                         }

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' });

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' });
 

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;

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' });

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);
                                 }
                             });
                         }

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);
                                 }
                             });
                         }

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);
                                 }
                             });
                         }

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);
                                 }
                             });
                         }

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");

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);
                                 }
                             });
                         }

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);
                                 }
                             });
                         }

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);
                                 }
                             });
                         }

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' });

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' });

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' });

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' });

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);
                                 }
                             });
                         }

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);
                                 }
                             });
                         }

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);
                                 }
                             });
                         }

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);
                                 }
                             });
                         }

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);
                                 }
                             });
                         }

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);
                                 }
                             });
                         }

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);
                                 }
                             });
                         }

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);
                                 }
                             });
                         }

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;

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 () {

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);
                                 }
                             });
                         }

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) {

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);
                                 }
                             });
                         }

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' });
 
         },

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);
                                 }
                             });
                         }

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");

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");

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;

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;

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;

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);

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();