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 0f30d8369..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 @@ -121,12 +121,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); } }); } @@ -134,12 +133,11 @@ var bootstrap = function ($, learun) { { label: '政治面貌', name: 'PoliticsFace', width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) { - learun.clientdata.getAsync('custmerData', { - url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BCdPartyFace', + learun.clientdata.getAsync('dataItem', { key: value, - keyId: 'partyfaceno', + code: 'BCdPartyFace', callback: function (_data) { - callback(_data['partyface']); + 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 326a7851a..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); } }); } @@ -130,12 +129,11 @@ var bootstrap = function ($, learun) { { label: '政治面貌', name: 'PoliticsFace', width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) { - learun.clientdata.getAsync('custmerData', { - url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BCdPartyFace', + learun.clientdata.getAsync('dataItem', { key: value, - keyId: 'partyfaceno', + code: 'BCdPartyFace', callback: function (_data) { - callback(_data['partyface']); + 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 a497d63c4..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', @@ -56,7 +56,7 @@ var bootstrap = function ($, learun) { $('#Country').lrselect({ value: 'ACODE', text: 'ANAME' }); - $('#PoliticsFace').lrDataSourceSelect({ code: 'BCdPartyFace', value: 'partyfaceno', text: 'partyface' }); + $("#PoliticsFace").lrDataItemSelect({ code: 'BCdPartyFace' }); $("#OriginId").lrDataItemSelect({ code: 'ResidenceNo' }); $("#DataSource").lrDataItemSelect({ code: 'AdmissionsDataSource' }); $("#ExamineTypeId").lrDataItemSelect({ code: 'ExamineType' }); @@ -148,13 +148,11 @@ var bootstrap = function ($, learun) { label: '政治面貌', name: 'PoliticalId', width: 100, align: 'left' , edit: { type: 'select', - datatype: 'dataSource', - code: 'BCdPartyFace', - op: { - value: 'partyfaceno', - text: 'partyface', - title: 'partyface' - } + init: function (data, $edit) { + + }, + datatype: 'dataItem', + code: 'BCdPartyFace' } }, { 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 bf4f13678..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); } }); } @@ -202,12 +201,11 @@ var bootstrap = function ($, learun) { { label: '政治面貌', name: 'PoliticsFace', width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) { - learun.clientdata.getAsync('custmerData', { - url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BCdPartyFace', + learun.clientdata.getAsync('dataItem', { key: value, - keyId: 'partyfaceno', + code: 'BCdPartyFace', callback: function (_data) { - callback(_data['partyface']); + 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 b1831fcba..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); } }); } @@ -132,12 +131,11 @@ var bootstrap = function ($, learun) { { label: '政治面貌', name: 'PoliticsFace', width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) { - learun.clientdata.getAsync('custmerData', { - url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BCdPartyFace', + learun.clientdata.getAsync('dataItem', { key: value, - keyId: 'partyfaceno', + code: 'BCdPartyFace', callback: function (_data) { - callback(_data['partyface']); + 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 5472caf07..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,17 +116,16 @@ 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(); + //} //政治面貌 - var partyFace = dataSourceIBLL.GetDataTable("BCdPartyFace", "t.PartyFaceNo='" + empInfo.PartyFaceNo + "'"); - if (partyFace != null && partyFace.Rows.Count > 0) - { - empInfo.PartyFaceNo = partyFace.Rows[0][1].ToString(); - } + empInfo.PartyFaceNo = dataItemIBLL.GetDetailList("BCdPartyFace").FirstOrDefault(x => x.F_ItemValue == empInfo.PartyFaceNo)?.F_ItemName; + //最高学历 var highestRecord = dataSourceIBLL.GetDataTable("BCdCultureDegree", "t.CultureDegreeNo='" + empInfo.HighestRecord + "'"); if (highestRecord != null && highestRecord.Rows.Count > 0) diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/EmpInfoEnternalController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/EmpInfoEnternalController.cs index 43c1b5f2b..c331232ee 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/EmpInfoEnternalController.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/EmpInfoEnternalController.cs @@ -14,6 +14,7 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers { // GET: EducationalAdministration/EmpInfoEnternal DataSourceIBLL dataSourceIBLL = new DataSourceBLL(); + DataItemIBLL dataItemIBLL = new DataItemBLL(); UserIBLL userIBLL = new UserBLL(); EmpInfoIBLL empInfoIBLL = new EmpInfoBLL(); AnnexesFileIBLL annexesFileIBLL = new AnnexesFileBLL(); @@ -53,6 +54,21 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers } } + /// + /// 获取数据字典数据 + /// + /// 数据源编号 + /// sql查询条件语句 + /// 数据源请求条件字串 + /// + [HttpGet] + [AjaxOnly] + public ActionResult GetDataItemMap(string code, string ver) + { + var data = dataItemIBLL.GetDetailList(code, null); + + return JsonResult(data); + } public ActionResult UploadImg(HttpPostedFileBase Filedata) { 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 e7faffedf..47f8da822 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,8 +86,8 @@ var bootstrap = function ($, learun) { $('#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' }); + $('#NationalityNo').lrDataItemSelect({ code: 'National' }); + $('#PartyFaceNo').lrDataItemSelect({ code: 'BCdPartyFace' }); $('#ProvinceNo').lrDataSourceSelect({ code: 'DIC_PROVINCE', value: 'pcode', text: 'pname', select: function (item) { @@ -118,24 +118,24 @@ var bootstrap = function ($, learun) { } }); $('#RegionNo').lrselect(); - $('#OverseasChineseNo').lrDataSourceSelect({ code: 'BCdOverseasChinese', value: 'overseaschineseno', text: 'overseaschinesename' }); - $('#HealthStatusNo').lrDataSourceSelect({ code: 'BCdHealthStatus', value: 'healthstatusno', text: 'healthstatus' }); + $('#OverseasChineseNo').lrDataItemSelect({ code: 'BCdOverseasChinese', allowSearch: true }); + $('#HealthStatusNo').lrDataItemSelect({ code: 'BCdHealthStatus', allowSearch: true }); //初始学历 $('#CultureDegreeNo').lrDataItemSelect({ code: 'CollegeType', allowSearch: true }); - $('#DegreeNo').lrDataSourceSelect({ code: 'BCdDegree', value: 'degreeno', text: 'degreename' }); - $('#FamilyOriginNo').lrDataSourceSelect({ code: 'BCdFamilyOrigin', value: 'familyoriginno', text: 'familyorigin' }); - $('#SubjectSpeciesNo').lrDataSourceSelect({ code: 'BCdSubjectSpecies', value: 'subjectspeciesno', text: 'subjectspecies' }); - $('#ForeignLanguageNo').lrDataSourceSelect({ code: 'BCdForeignLanguage', value: 'foreignlanguageno', text: 'foreignlanguagename' }); + $('#DegreeNo').lrDataItemSelect({ code: 'BCdDegree', allowSearch: true }); + $('#FamilyOriginNo').lrDataItemSelect({ code: 'BCdFamilyOrigin', allowSearch: true }); + $('#SubjectSpeciesNo').lrDataItemSelect({ code: 'BCdSubjectSpecies', allowSearch: true }); + $('#ForeignLanguageNo').lrDataItemSelect({ code: 'BCdForeignLanguage', allowSearch: true }); $('#EmpSortNo').lrDataItemSelect({ code: 'jsgw' }); $('#EmpFullTimeNo').lrDataItemSelect({ code: 'EmpFullTime' }); $('#ObtainWay').lrDataItemSelect({ code: 'ObtainWay' }); //$('#DeptNo').lrDataSourceSelect({ code: 'CdDeptInfo', value: 'deptno', text: 'deptname' }); - $('#PostRank').lrDataSourceSelect({ code: 'BCdTitleOfTechPost', value: 'titleoftechpostno', text: 'titleoftechpost' }); + $('#PostRank').lrDataItemSelect({ code: 'BCdTitleOfTechPost', allowSearch: true }); $('#Photo').lrUploader(); //最高学历 $('#HighestRecord').lrDataItemSelect({ code: 'CollegeType', allowSearch: true }); $('#ObtainWayOfHighestRecord').lrDataItemSelect({ code: 'ObtainWay' }); - $('#InitialDegree').lrDataSourceSelect({ code: 'BCdDegree', value: 'degreeno', text: 'degreename' }); + $('#InitialDegree').lrDataItemSelect({ code: 'BCdDegree', allowSearch: true }); $('#ObtainWayOfInitialDegree').lrDataItemSelect({ code: 'ObtainWayOfDegree' }); $('#ObtainWayOfHighestDegree').lrDataItemSelect({ code: 'ObtainWayOfDegree' }); $('#PositionLevel').lrDataItemSelect({ code: 'PositionLevel' }); 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 13c22c99e..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 @@ -185,7 +185,7 @@ //登录按钮点击 form.on('submit(*)', function (data) { - + $.ajax({ url: "/EducationalAdministration/EmpInfo/SaveForm?keyValue=2b7d3b57-6614-4900-affe-9b26bd77bbb4", data: { strEntity: JSON.stringify(data.field) }, @@ -287,25 +287,25 @@ }); $.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); }, }); $.ajax({ - url: "/LR_SystemModule/DataSource/GetMap?code=" + "BCdPartyFace", + url: "/EducationalAdministration/EmpInfoEnternal/GetDataItemMap?code=" + "BCdPartyFace", 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 += '' }) $("#PartyFaceNo").html(str); }, @@ -323,13 +323,13 @@ }, }); $.ajax({ - url: "/LR_SystemModule/DataSource/GetMap?code=" + "BCdDegree", + url: "/EducationalAdministration/EmpInfoEnternal/GetDataItemMap?code=" + "BCdDegree", 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 += '' }) $("#DegreeNo").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 df4d20537..905e72216 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,9 +8,9 @@ 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 = ['usersexbit', 'JobStatus', 'jsgw', 'PositionLevel', 'CompilationCategory', 'ObtainWay', 'ObtainWay', 'ObtainWayOfDegree', 'ObtainWayOfDegree', 'TechnicalPost', 'TechnicalLevelOfWorker', 'EmpFullTime', 'YesOrNoBit']; +var colDataItemCode = ['BCdPartyFace', 'BCdNationality', 'BCdDegree', 'BCdFamilyOrigin', 'BCdForeignLanguage', 'BCdSubjectSpecies', 'BCdOverseasChinese', 'BCdHealthStatus', 'BCdTitleOfTechPost','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', 'BCdDegree', 'BCdSubjectSpecies', 'BCdForeignLanguage']; +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']; var colDataSourceText = ['partyface', 'nationality', 'healthstatus', 'familyorigin', 'overseaschinesename', 'f_fullname', 'f_fullname', 'deptname', 'titleoftechpost', 'culturedegree', 'culturedegree', 'degreename', 'degreename', 'subjectspecies', 'foreignlanguagename']; var bootstrap = function ($, learun) { @@ -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) { @@ -109,30 +87,8 @@ var bootstrap = function ($, learun) { } }); $('#RegionNo').lrselect(); - //$('#OverseasChineseNo').lrDataSourceSelect({ code: 'BCdOverseasChinese', value: 'overseaschineseno', text: 'overseaschinesename' }); - //$('#HealthStatusNo').lrDataSourceSelect({ code: 'BCdHealthStatus', value: 'healthstatusno', text: 'healthstatus' }); - //$('#CultureDegreeNo').lrDataSourceSelect({ code: 'BCdCultureDegree', value: 'culturedegreeno', text: 'culturedegree' }); - //$('#DegreeNo').lrDataSourceSelect({ code: 'BCdDegree', value: 'degreeno', text: 'degreename' }); - //$('#FamilyOriginNo').lrDataSourceSelect({ code: 'BCdFamilyOrigin', value: 'familyoriginno', text: 'familyorigin' }); - //$('#SubjectSpeciesNo').lrDataSourceSelect({ code: 'BCdSubjectSpecies', value: 'subjectspeciesno', text: 'subjectspecies' }); - //$('#ForeignLanguageNo').lrDataSourceSelect({ code: 'BCdForeignLanguage', value: 'foreignlanguageno', text: 'foreignlanguagename' }); - //$('#EmpSortNo').lrDataItemSelect({ code: 'jsgw' }); - //$('#EmpFullTimeNo').lrDataItemSelect({ code: 'EmpFullTime' }); - //$('#ObtainWay').lrDataItemSelect({ code: 'ObtainWay' }); - //$('#DeptNo').lrDataSourceSelect({ code: 'CdDeptInfo', value: 'deptno', text: 'deptname' }); - //$('#PostRank').lrDataSourceSelect({ code: 'BCdTitleOfTechPost', value: 'titleoftechpostno', text: 'titleoftechpost' }); $('#Photo').lrUploader(); - //$('#HighestRecord').lrDataSourceSelect({ code: 'BCdCultureDegree', value: 'culturedegreeno', text: 'culturedegree' }); - //$('#ObtainWayOfHighestRecord').lrDataItemSelect({ code: 'ObtainWay' }); - //$('#InitialDegree').lrDataSourceSelect({ code: 'BCdDegree', value: 'degreeno', text: 'degreename' }); - //$('#ObtainWayOfInitialDegree').lrDataItemSelect({ code: 'ObtainWayOfDegree' }); - //$('#ObtainWayOfHighestDegree').lrDataItemSelect({ code: 'ObtainWayOfDegree' }); - //$('#PositionLevel').lrDataItemSelect({ code: 'PositionLevel' }); - //$('#JobRank').lrDataItemSelect({ code: 'TechnicalPost' }); - //$('#WorkLevel').lrDataItemSelect({ code: 'TechnicalLevelOfWorker' }); - //$('#CompilationCategory').lrDataItemSelect({ code: 'CompilationCategory' }); - //$('#IsInActiveStatus').lrDataItemSelect({ code: 'JobStatus' }); - + //内容编辑器 ue = UE.getEditor('editor'); 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 8041578a5..3decebe81 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,39 +143,34 @@ }, 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; }, partyFaceNo: function (value) { var result; - top.learun.clientdata.getAsync('custmerData', { - sync: true, - url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BCdPartyFace', + top.learun.clientdata.getAsync('dataItem', { key: value, - keyId: 'partyfaceno', + code: 'BCdPartyFace', callback: function (_data) { - result = _data['partyface']; + result = _data.text; } }); + return result; }, overseasChineseNo: function (value) { var result; - top.learun.clientdata.getAsync('custmerData', { - sync: true, - url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BCdOverseasChinese', + top.learun.clientdata.getAsync('dataItem', { key: value, - keyId: 'overseaschineseno', + code: 'BCdOverseasChinese', callback: function (_data) { - result = _data.overseaschinesename; + result = _data.text; } }); @@ -183,16 +178,13 @@ }, healthStatusNo: function (value) { var result; - top.learun.clientdata.getAsync('custmerData', { - sync: true, - url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BCdHealthStatus', + top.learun.clientdata.getAsync('dataItem', { key: value, - keyId: 'healthstatusno', + code: 'BCdHealthStatus', callback: function (_data) { - result = _data.healthstatus; + result = _data.text; } }); - return result; }, deptNo: function (value) { @@ -209,37 +201,34 @@ }, subjectSpeciesNo: function (value) { var result; - top.learun.clientdata.getAsync('custmerData', { - url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BCdSubjectSpecies', + top.learun.clientdata.getAsync('dataItem', { key: value, - keyId: 'subjectspeciesno', + code: 'BCdSubjectSpecies', callback: function (_data) { - result = _data.subjectspecies; - }.bind(this) + result = _data.text; + } }); return result; }, familyOriginNo: function (value) { var result; - top.learun.clientdata.getAsync('custmerData', { - url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BCdFamilyOrigin', + top.learun.clientdata.getAsync('dataItem', { key: value, - keyId: 'familyoriginno', + code: 'BCdFamilyOrigin', callback: function (_data) { - result = _data.familyorigin; - }.bind(this) + result = _data.text; + } }); return result; }, foreignLanguageNo: function (value) { var result; - top.learun.clientdata.getAsync('custmerData', { - url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BCdForeignLanguage', + top.learun.clientdata.getAsync('dataItem', { key: value, - keyId: 'foreignlanguageno', + code: 'BCdForeignLanguage', callback: function (_data) { - result = _data.foreignlanguagename; - }.bind(this) + result = _data.text; + } }); return result; }, @@ -297,13 +286,11 @@ }, degreeNo: function (value) { var result; - top.learun.clientdata.getAsync('custmerData', { - sync: true, - url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BCdDegree', + top.learun.clientdata.getAsync('dataItem', { key: value, - keyId: 'degreeno', + code: 'BCdDegree', callback: function (_data) { - result = _data['degreename']; + result = _data.text; } }); return result; @@ -321,13 +308,11 @@ }, titleOfTechPostNo: function (value) { var result; - top.learun.clientdata.getAsync('custmerData', { - sync: true, - url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BCdTitleOfTechPost', + top.learun.clientdata.getAsync('dataItem', { key: value, - keyId: 'titleoftechpostno', + code: 'BCdTitleOfTechPost', callback: function (_data) { - result = _data['titleoftechpost']; + 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 d604c7501..dcbd5a70a 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,8 +35,8 @@ var bootstrap = function ($, learun) { }); $('#F_DepartmentId').lrselect(); $('#GenderNo').lrDataItemSelect({ code: 'usersexbit' }); - $('#NationalityNo').lrDataSourceSelect({ code: 'BCdNationality',value: 'nationalityno',text: 'nationality' }); - $('#PartyFaceNo').lrDataSourceSelect({ code: 'BCdPartyFace',value: 'partyfaceno',text: 'partyface' }); + $('#NationalityNo').lrDataItemSelect({ code: 'National' }); + $('#PartyFaceNo').lrDataItemSelect({ code: 'BCdPartyFace' }); $('#ProvinceNo').lrDataSourceSelect({ code: 'DIC_PROVINCE', value: 'pcode', text: 'pname', select: function (item) { @@ -67,17 +67,16 @@ var bootstrap = function ($, learun) { } }); $('#RegionNo').lrselect(); - $('#OverseasChineseNo').lrDataSourceSelect({ code: 'BCdOverseasChinese',value: 'overseaschineseno',text: 'overseaschinesename' }); - $('#HealthStatusNo').lrDataSourceSelect({ code: 'BCdHealthStatus',value: 'healthstatusno',text: 'healthstatus' }); + $('#OverseasChineseNo').lrDataItemSelect({ code: 'BCdOverseasChinese' }); + $('#HealthStatusNo').lrDataItemSelect({ code: 'BCdHealthStatus' }); $('#CultureDegreeNo').lrDataSourceSelect({ code: 'BCdCultureDegree',value: 'culturedegreeno',text: 'culturedegree' }); - $('#DegreeNo').lrDataSourceSelect({ code: 'BCdDegree',value: 'degreeno',text: 'degreename' }); - $('#FamilyOriginNo').lrDataSourceSelect({ code: 'BCdFamilyOrigin',value: 'familyoriginno',text: 'familyorigin' }); - $('#SubjectSpeciesNo').lrDataSourceSelect({ code: 'BCdSubjectSpecies',value: 'subjectspeciesno',text: 'subjectspecies' }); - $('#ForeignLanguageNo').lrDataSourceSelect({ code: 'BCdForeignLanguage',value: 'foreignlanguageno',text: 'foreignlanguagename' }); + $('#DegreeNo').lrDataItemSelect({ code: 'BCdDegree' }); + $('#FamilyOriginNo').lrDataItemSelect({ code: 'BCdFamilyOrigin' }); + $('#SubjectSpeciesNo').lrDataItemSelect({ code: 'BCdSubjectSpecies' }); + $('#ForeignLanguageNo').lrDataItemSelect({ code: 'BCdForeignLanguage' }); $('#EmpSortNo').lrDataItemSelect({ code: 'EmpSort' }); $('#EmpFullTimeNo').lrDataItemSelect({ code: 'EmpFullTime' }); - $('#DeptNo').lrDataSourceSelect({ code: 'CdDeptInfo',value: 'deptno',text: 'deptname' }); - $('#TitleOfTechPostNo').lrDataSourceSelect({ code: 'BCdTitleOfTechPost',value: 'titleoftechpostno',text: 'titleoftechpost' }); + $('#DeptNo').lrDataSourceSelect({ code: 'CdDeptInfo', value: 'deptno', text: 'deptname' });$('#TitleOfTechPostNo').lrDataItemSelect({ code: 'BCdTitleOfTechPost', allowSearch: true }); $('#Photo').lrUploader(); $("#lrUploader_uploadBtn_Photo").hide(); }, 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 d78d3927d..57b2fcf43 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 @@ -48,18 +48,18 @@ var bootstrap = function ($, learun) { }); $('#RegionNo').lrselect(); //政治面貌 - $('#PartyFaceNo').lrDataSourceSelect({ code: 'BCdPartyFace', value: 'partyfaceno', text: 'partyface' }); + $('#PartyFaceNo').lrDataItemSelect({ code: 'BCdPartyFace', allowSearch: true }); //最高学历 $('#HighestRecord').lrDataItemSelect({ code: 'CollegeType', allowSearch: true }); //民族 - $('#NationalityNo').lrDataSourceSelect({ code: 'BCdNationality', value: 'nationalityno', text: 'nationality' }); + $('#NationalityNo').lrDataItemSelect({ code: 'National', allowSearch: true }); //性别 $('#GenderNo').lrDataItemSelect({ code: 'usersexbit' }); //是否审核 $('#CheckMark').lrDataItemSelect({ code: 'YesOrNoInt' }); //学位 - $('#DegreeNo').lrDataSourceSelect({ code: 'BCdDegree', value: 'degreeno', text: 'degreename' }); + $('#DegreeNo').lrDataItemSelect({ code: 'BCdDegree' }); // 部门选择 $('#F_DepartmentId').lrselect({ @@ -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); } }); } @@ -434,12 +433,11 @@ var bootstrap = function ($, learun) { { label: "政治面貌", name: "PartyFaceNo", width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) { - learun.clientdata.getAsync('custmerData', { - url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BCdPartyFace', + learun.clientdata.getAsync('dataItem', { key: value, - keyId: 'partyfaceno', + code: 'BCdPartyFace', callback: function (_data) { - callback(_data['partyface']); + callback(_data.text); } }); } @@ -461,12 +459,11 @@ var bootstrap = function ($, learun) { { label: "最高学位", name: "DegreeNo", width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) { - learun.clientdata.getAsync('custmerData', { - url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BCdDegree', + learun.clientdata.getAsync('dataItem', { key: value, - keyId: 'degreeno', + code: 'BCdDegree', callback: function (_data) { - callback(_data['degreename']); + callback(_data.text); } }); } @@ -502,12 +499,11 @@ var bootstrap = function ($, learun) { { label: "港澳台侨", name: "OverseasChineseNo", width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) { - learun.clientdata.getAsync('custmerData', { - url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BCdOverseasChinese', + learun.clientdata.getAsync('dataItem', { key: value, - keyId: 'overseaschineseno', + code: 'BCdOverseasChinese', callback: function (_data) { - callback(_data['overseaschinesename']); + callback(_data.text); } }); } @@ -515,12 +511,11 @@ var bootstrap = function ($, learun) { { label: "健康状况", name: "HealthStatusNo", width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) { - learun.clientdata.getAsync('custmerData', { - url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BCdHealthStatus', + learun.clientdata.getAsync('dataItem', { key: value, - keyId: 'healthstatusno', + code: 'BCdHealthStatus', callback: function (_data) { - callback(_data['healthstatus']); + callback(_data.text); } }); } @@ -529,12 +524,11 @@ var bootstrap = function ($, learun) { { label: "家庭出身", name: "FamilyOriginNo", width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) { - learun.clientdata.getAsync('custmerData', { - url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BCdFamilyOrigin', + learun.clientdata.getAsync('dataItem', { key: value, - keyId: 'familyoriginno', + code: 'BCdFamilyOrigin', callback: function (_data) { - callback(_data['familyorigin']); + callback(_data.text); } }); } @@ -543,12 +537,11 @@ var bootstrap = function ($, learun) { { label: "学科门类", name: "SubjectSpeciesNo", width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) { - learun.clientdata.getAsync('custmerData', { - url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BCdSubjectSpecies', + learun.clientdata.getAsync('dataItem', { key: value, - keyId: 'subjectspeciesno', + code: 'BCdSubjectSpecies', callback: function (_data) { - callback(_data['subjectspecies']); + callback(_data.text); } }); } @@ -580,12 +573,11 @@ var bootstrap = function ($, learun) { { label: "岗位名称", name: "TitleOfTechPostNo", width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) { - learun.clientdata.getAsync('custmerData', { - url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BCdTitleOfTechPost', + learun.clientdata.getAsync('dataItem', { key: value, - keyId: 'titleoftechpostno', + code: 'BCdTitleOfTechPost', callback: function (_data) { - callback(_data['titleoftechpost']); + 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 ba41b046b..f8540ddda 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); } }); } @@ -348,12 +347,11 @@ var bootstrap = function ($, learun) { { label: "政治面貌", name: "PartyFaceNo", width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) { - learun.clientdata.getAsync('custmerData', { - url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BCdPartyFace', + learun.clientdata.getAsync('dataItem', { key: value, - keyId: 'partyfaceno', + code: 'BCdPartyFace', callback: function (_data) { - callback(_data['partyface']); + callback(_data.text); } }); } @@ -419,12 +417,11 @@ var bootstrap = function ($, learun) { { label: "职级", name: "PostRank", width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) { - learun.clientdata.getAsync('custmerData', { - url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BCdTitleOfTechPost', + learun.clientdata.getAsync('dataItem', { key: value, - keyId: 'titleoftechpostno', + code: 'BCdTitleOfTechPost', callback: function (_data) { - callback(_data['titleoftechpost']); + 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 f21e7877b..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,25 +314,25 @@ }); $.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); }, }); $.ajax({ - url: "/EducationalAdministration/EmpInfoEnternal/GetMap?code=" + "BCdPartyFace", + url: "/EducationalAdministration/EmpInfoEnternal/GetDataItemMap?code=" + "BCdPartyFace", 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 += '' }) $("#PartyFaceNo").html(str); }, @@ -350,13 +350,13 @@ }, }); $.ajax({ - url: "/EducationalAdministration/EmpInfoEnternal/GetMap?code=" + "BCdDegree", + url: "/EducationalAdministration/EmpInfoEnternal/GetDataItemMap?code=" + "BCdDegree", 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 += '' }) $("#DegreeNo").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 88e5e147a..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,10 +16,10 @@ 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').lrDataSourceSelect({ code: 'BCdPartyFace', value: 'partyfaceno', text: 'partyface' }); + $('#PartyFaceNo').lrDataItemSelect({ code: 'BCdPartyFace' }); $('#IsAccommodate').lrDataItemSelect({ code: 'YesOrNoInt' }); }, initData: function () { 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 76191b205..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,8 +16,8 @@ var bootstrap = function ($, learun) { }, bind: function () { $('#Sex').lrDataItemSelect({ code: 'usersex' }); - $('#NationalityNo').lrDataSourceSelect({ code: 'BCdNationality',value: 'nationalityno',text: 'nationality' }); - $('#PartyFaceNo').lrDataSourceSelect({ code: 'BCdPartyFace',value: 'partyfaceno',text: 'partyface' }); + $('#NationalityNo').lrDataItemSelect({ code: 'National' }); + $('#PartyFaceNo').lrDataItemSelect({ code: 'BCdPartyFace' }); $('#CultureDegree').lrDataSourceSelect({ code: 'BCdCultureDegree',value: 'culturedegreeno',text: 'culturedegree' }); $('#ResidenceNo').lrDataItemSelect({ code: 'ResidenceNo' }); $('#MajorNo').lrDataSourceSelect({ code: 'CdMajorInfo',value: 'majorno',text: 'majorname' }); 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 171cfd929..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); } }); } @@ -99,12 +98,11 @@ var bootstrap = function ($, learun) { { label: "政治面貌", name: "PartyFaceNo", width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) { - learun.clientdata.getAsync('custmerData', { - url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BCdPartyFace', + learun.clientdata.getAsync('dataItem', { key: value, - keyId: 'partyfaceno', + code: 'BCdPartyFace', callback: function (_data) { - callback(_data['partyface']); + 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 c37f14944..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); } }); } @@ -205,12 +204,11 @@ var bootstrap = function ($, learun) { { label: "政治面貌", name: "Political", width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) { - learun.clientdata.getAsync('custmerData', { - url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BCdPartyFace', + learun.clientdata.getAsync('dataItem', { key: value, - keyId: 'partyfaceno', + code: 'BCdPartyFace', callback: function (_data) { - callback(_data['partyface']); + 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 ceaac9785..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,9 +21,10 @@ 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').lrDataSourceSelect({ code: 'BCdPartyFace', value: 'partyfaceno', text: 'partyface' }); + $('#Political').lrDataItemSelect({ code: 'BCdPartyFace' }); $('#DeptNo').lrselect({ allowSearch: true, value: "deptno", 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 1118636d1..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,9 +21,9 @@ 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' }); $('#ClassNo').lrDataSourceSelect({ code: 'bjsj', value: 'classno', text: 'classname' }); $('#MajorNo').lrDataSourceSelect({ code: 'CdMajorInfo', value: 'majorno', text: 'majorname' }); $('#FreshType').lrDataItemSelect({ code: 'timeType' }); 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 af18e6e94..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); } }); } @@ -216,12 +215,11 @@ var bootstrap = function ($, learun) { { label: "政治面貌", name: "Political", width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) { - learun.clientdata.getAsync('custmerData', { - url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BCdPartyFace', + learun.clientdata.getAsync('dataItem', { key: value, - keyId: 'partyfaceno', + code: 'BCdPartyFace', callback: function (_data) { - callback(_data['partyface']); + 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 768eb4f7b..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); } }); } @@ -216,12 +215,11 @@ var bootstrap = function ($, learun) { { label: "政治面貌", name: "Political", width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) { - learun.clientdata.getAsync('custmerData', { - url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BCdPartyFace', + learun.clientdata.getAsync('dataItem', { key: value, - keyId: 'partyfaceno', + code: 'BCdPartyFace', callback: function (_data) { - callback(_data['partyface']); + 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 57ea27d54..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); } }); } @@ -212,12 +211,11 @@ var bootstrap = function ($, learun) { { label: "政治面貌", name: "Political", width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) { - learun.clientdata.getAsync('custmerData', { - url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BCdPartyFace', + learun.clientdata.getAsync('dataItem', { key: value, - keyId: 'partyfaceno', + code: 'BCdPartyFace', callback: function (_data) { - callback(_data['partyface']); + 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 986f26210..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); } }); } @@ -379,12 +378,11 @@ var bootstrap = function ($, learun) { { label: "政治面貌", name: "Political", width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) { - learun.clientdata.getAsync('custmerData', { - url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BCdPartyFace', + learun.clientdata.getAsync('dataItem', { key: value, - keyId: 'partyfaceno', + code: 'BCdPartyFace', callback: function (_data) { - callback(_data['partyface']); + 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 79c529751..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); } }); } @@ -248,12 +247,11 @@ var bootstrap = function ($, learun) { { label: "政治面貌", name: "Political", width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) { - learun.clientdata.getAsync('custmerData', { - url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BCdPartyFace', + learun.clientdata.getAsync('dataItem', { key: value, - keyId: 'partyfaceno', + code: 'BCdPartyFace', callback: function (_data) { - callback(_data['partyface']); + 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 9c4e4d606..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); } }); } @@ -208,12 +207,11 @@ var bootstrap = function ($, learun) { { label: "政治面貌", name: "Political", width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) { - learun.clientdata.getAsync('custmerData', { - url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BCdPartyFace', + learun.clientdata.getAsync('dataItem', { key: value, - keyId: 'partyfaceno', + code: 'BCdPartyFace', callback: function (_data) { - callback(_data['partyface']); + 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 9605eafdf..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); } }); } @@ -246,12 +245,11 @@ var bootstrap = function ($, learun) { { label: "政治面貌", name: "Political", width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) { - learun.clientdata.getAsync('custmerData', { - url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BCdPartyFace', + learun.clientdata.getAsync('dataItem', { key: value, - keyId: 'partyfaceno', + code: 'BCdPartyFace', callback: function (_data) { - callback(_data['partyface']); + 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 abb9c443b..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); } }); } @@ -334,12 +333,11 @@ var bootstrap = function ($, learun) { { label: "政治面貌", name: "Political", width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) { - learun.clientdata.getAsync('custmerData', { - url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BCdPartyFace', + learun.clientdata.getAsync('dataItem', { key: value, - keyId: 'partyfaceno', + code: 'BCdPartyFace', callback: function (_data) { - callback(_data['partyface']); + 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 5048c2b27..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); } }); } @@ -312,12 +311,11 @@ var bootstrap = function ($, learun) { { label: "政治面貌", name: "Political", width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) { - learun.clientdata.getAsync('custmerData', { - url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BCdPartyFace', + learun.clientdata.getAsync('dataItem', { key: value, - keyId: 'partyfaceno', + code: 'BCdPartyFace', callback: function (_data) { - callback(_data['partyface']); + 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 b2a36d196..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); } }); } @@ -331,12 +330,11 @@ var bootstrap = function ($, learun) { { label: "政治面貌", name: "Political", width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) { - learun.clientdata.getAsync('custmerData', { - url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BCdPartyFace', + learun.clientdata.getAsync('dataItem', { key: value, - keyId: 'partyfaceno', + code: 'BCdPartyFace', callback: function (_data) { - callback(_data['partyface']); + 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 481635b8f..0378d1e11 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/Form.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/Form.js @@ -104,13 +104,13 @@ 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').lrDataSourceSelect({ code: 'BCdPartyFace', value: 'partyfaceno', text: 'partyface' }); - $('#HealthStatusNo').lrDataSourceSelect({ code: 'BCdHealthStatus', value: 'healthstatusno', text: 'healthstatus' }); + $('#PartyFaceNo').lrDataItemSelect({ code: 'BCdPartyFace' }); + $('#HealthStatusNo').lrDataItemSelect({ code: 'BCdHealthStatus' }); $('#Photo').lrUploader(); - $('#FamilyOriginNo').lrDataSourceSelect({ code: 'BCdFamilyOrigin', value: 'familyoriginno', text: 'familyorigin' }); - $('#OverseasChineseNo').lrDataSourceSelect({ code: 'BCdOverseasChinese', value: 'overseaschineseno', text: 'overseaschinesename' }); + $('#FamilyOriginNo').lrDataItemSelect({ code: 'BCdFamilyOrigin' }); + $('#OverseasChineseNo').lrDataItemSelect({ code: 'BCdOverseasChinese' }); $('#GraduateNo').lrDataItemSelect({ code: 'CollegeType' }); $('#EduSystem').lrDataItemSelect({ code: 'EduSystem' }); $('#StudyModality').lrDataItemSelect({ code: 'StudyModality' }); diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/FormOfDC.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/FormOfDC.js index 9efee1a5e..7de2fba10 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/FormOfDC.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/FormOfDC.js @@ -104,13 +104,13 @@ 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').lrDataSourceSelect({ code: 'BCdPartyFace', value: 'partyfaceno', text: 'partyface' }); - $('#HealthStatusNo').lrDataSourceSelect({ code: 'BCdHealthStatus', value: 'healthstatusno', text: 'healthstatus' }); + $('#PartyFaceNo').lrDataItemSelect({ code: 'BCdPartyFace' }); + $('#HealthStatusNo').lrDataItemSelect({ code: 'BCdHealthStatus' }); $('#Photo').lrUploader(); - $('#FamilyOriginNo').lrDataSourceSelect({ code: 'BCdFamilyOrigin', value: 'familyoriginno', text: 'familyorigin' }); - $('#OverseasChineseNo').lrDataSourceSelect({ code: 'BCdOverseasChinese', value: 'overseaschineseno', text: 'overseaschinesename' }); + $('#FamilyOriginNo').lrDataItemSelect({ code: 'BCdFamilyOrigin' }); + $('#OverseasChineseNo').lrDataItemSelect({ code: 'BCdOverseasChinese' }); $('#GraduateNo').lrDataItemSelect({ code: 'CollegeType' }); $('#EduSystem').lrDataItemSelect({ code: 'EduSystem' }); $('#StudyModality').lrDataItemSelect({ code: 'StudyModality' }); @@ -186,15 +186,15 @@ var bootstrap = function ($, learun) { $('#OneMembership').lrDataItemSelect({ code: 'FamilyRelation' }); $('#OneIsGuardian').lrDataItemSelect({ code: 'YesOrNoInt' }); $('#OneIdCardType').lrDataItemSelect({ code: 'IdCardType' }); - $('#OneNationalityNo').lrDataSourceSelect({ code: 'BCdNationality', value: 'nationalityno', text: 'nationality' }); - $('#OnePartyFaceNo').lrDataSourceSelect({ code: 'BCdPartyFace', value: 'partyfaceno', text: 'partyface' }); - $('#OneHealthStatus').lrDataSourceSelect({ code: 'BCdHealthStatus', value: 'healthstatusno', text: 'healthstatus' }); + $('#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' }); - $('#TwoPartyFaceNo').lrDataSourceSelect({ code: 'BCdPartyFace', value: 'partyfaceno', text: 'partyface' }); - $('#TwoHealthStatus').lrDataSourceSelect({ code: 'BCdHealthStatus', value: 'healthstatusno', text: 'healthstatus' }); + $('#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 85395fd68..ee85a332c 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/FormView.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/FormView.cshtml @@ -166,26 +166,22 @@ }, 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; }, partyFaceNo: function (value) { var result; - top.learun.clientdata.getAsync('custmerData', { - sync: true, - url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BCdPartyFace', + top.learun.clientdata.getAsync('dataItem', { key: value, - keyId: 'partyfaceno', + code: 'BCdPartyFace', callback: function (_data) { - result = _data['partyface']; + result = _data.text; } }); return result; @@ -231,30 +227,24 @@ }, overseasChineseNo: function (value) { var result; - top.learun.clientdata.getAsync('custmerData', { - sync: true, - url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BCdOverseasChinese', + top.learun.clientdata.getAsync('dataItem', { key: value, - keyId: 'overseaschineseno', + code: 'BCdOverseasChinese', callback: function (_data) { - result = _data.overseaschinesename; + result = _data.text; } }); - return result; }, healthStatusNo: function (value) { var result; - top.learun.clientdata.getAsync('custmerData', { - sync: true, - url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BCdHealthStatus', + top.learun.clientdata.getAsync('dataItem', { key: value, - keyId: 'healthstatusno', + code: 'BCdHealthStatus', callback: function (_data) { - result = _data.healthstatus; + result = _data.text; } }); - return result; }, deptNo: function (value) { diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/FormView.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/FormView.js index b3cf73ed5..88141dcd8 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/FormView.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/FormView.js @@ -63,13 +63,13 @@ 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').lrDataSourceSelect({ code: 'BCdPartyFace', value: 'partyfaceno', text: 'partyface' }); - $('#HealthStatusNo').lrDataSourceSelect({ code: 'BCdHealthStatus', value: 'healthstatusno', text: 'healthstatus' }); + $('#PartyFaceNo').lrDataItemSelect({ code: 'BCdPartyFace' }); + $('#HealthStatusNo').lrDataItemSelect({ code: 'BCdHealthStatus' }); $('#Photo').lrUploader(); - $('#FamilyOriginNo').lrDataSourceSelect({ code: 'BCdFamilyOrigin', value: 'familyoriginno', text: 'familyorigin' }); - $('#OverseasChineseNo').lrDataSourceSelect({ code: 'BCdOverseasChinese', value: 'overseaschineseno', text: 'overseaschinesename' }); + $('#FamilyOriginNo').lrDataItemSelect({ code: 'BCdFamilyOrigin' }); + $('#OverseasChineseNo').lrDataItemSelect({ code: 'BCdOverseasChinese' }); $('#GraduateNo').lrDataItemSelect({ code: 'CollegeType' }); $('#DeptNo').lrselect({ value: "deptno", 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 426a7ea21..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); } }); } @@ -324,12 +323,11 @@ var bootstrap = function ($, learun) { { label: "政治面貌", name: "PartyFaceNo", width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) { - learun.clientdata.getAsync('custmerData', { - url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BCdPartyFace', + learun.clientdata.getAsync('dataItem', { key: value, - keyId: 'partyfaceno', + code: 'BCdPartyFace', callback: function (_data) { - callback(_data['partyface']); + 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 70704caf7..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); } }); } @@ -389,12 +388,11 @@ var bootstrap = function ($, learun) { { label: "政治面貌", name: "PartyFaceNo", width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) { - learun.clientdata.getAsync('custmerData', { - url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BCdPartyFace', + learun.clientdata.getAsync('dataItem', { key: value, - keyId: 'partyfaceno', + code: 'BCdPartyFace', callback: function (_data) { - callback(_data['partyface']); + callback(_data.text); } }); } @@ -402,12 +400,11 @@ var bootstrap = function ($, learun) { { label: "健康状况", name: "HealthStatusNo", width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) { - learun.clientdata.getAsync('custmerData', { - url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BCdHealthStatus', + learun.clientdata.getAsync('dataItem', { key: value, - keyId: 'healthstatusno', + code: 'BCdHealthStatus', callback: function (_data) { - callback(_data['healthstatus']); + callback(_data.text); } }); } @@ -541,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); } }); } @@ -554,12 +550,11 @@ var bootstrap = function ($, learun) { { label: "成员1政治面貌", name: "OnePartyFaceNo", width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) { - learun.clientdata.getAsync('custmerData', { - url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BCdPartyFace', + learun.clientdata.getAsync('dataItem', { key: value, - keyId: 'partyfaceno', + code: 'BCdPartyFace', callback: function (_data) { - callback(_data['partyface']); + callback(_data.text); } }); } @@ -567,12 +562,11 @@ var bootstrap = function ($, learun) { { label: "成员1健康状况", name: "OneHealthStatus", width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) { - learun.clientdata.getAsync('custmerData', { - url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BCdHealthStatus', + learun.clientdata.getAsync('dataItem', { key: value, - keyId: 'healthstatusno', + code: 'BCdHealthStatus', callback: function (_data) { - callback(_data['healthstatus']); + callback(_data.text); } }); } @@ -619,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); } }); } @@ -632,12 +625,11 @@ var bootstrap = function ($, learun) { { label: "成员2政治面貌", name: "TwoPartyFaceNo", width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) { - learun.clientdata.getAsync('custmerData', { - url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BCdPartyFace', + learun.clientdata.getAsync('dataItem', { key: value, - keyId: 'partyfaceno', + code: 'BCdPartyFace', callback: function (_data) { - callback(_data['partyface']); + callback(_data.text); } }); } @@ -645,12 +637,11 @@ var bootstrap = function ($, learun) { { label: "成员2健康状况", name: "TwoHealthStatus", width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) { - learun.clientdata.getAsync('custmerData', { - url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BCdHealthStatus', + learun.clientdata.getAsync('dataItem', { key: value, - keyId: 'healthstatusno', + code: 'BCdHealthStatus', callback: function (_data) { - callback(_data['healthstatus']); + 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 768eafe9e..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); } }); } @@ -167,12 +166,11 @@ var bootstrap = function ($, learun) { { label: '政治面貌', name: 'PartyFaceNo', width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) { - learun.clientdata.getAsync('custmerData', { - url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BCdPartyFace', + learun.clientdata.getAsync('dataItem', { key: value, - keyId: 'partyfaceno', + code: 'BCdPartyFace', callback: function (_data) { - callback(_data['partyface']); + 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 8b8387548..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 @@ -16,9 +16,9 @@ var bootstrap = function ($, learun) { }, bind: function () { $("#GenderNo").lrDataItemSelect({ code: 'usersex' }); - $('#PartyFaceNo').lrDataSourceSelect({ code: 'BCdPartyFace', value: 'partyfaceno', text: 'partyface' }); + $("#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 f0a92f494..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 @@ -17,9 +17,9 @@ var bootstrap = function ($, learun) { bind: function () { $("#GenderNo").lrDataItemSelect({ code: 'usersex' }); $("#IsAccommodate").lrDataItemSelect({ code: 'YesOrNoInt' }); - $('#PartyFaceNo').lrDataSourceSelect({ code: 'BCdPartyFace', value: 'partyfaceno', text: 'partyface' }); + $("#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 fd0717a2b..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 @@ -17,9 +17,9 @@ var bootstrap = function ($, learun) { }, bind: function () { $("#GenderNo").lrDataItemSelect({ code: 'usersex' }); - $('#PartyFaceNo').lrDataSourceSelect({ code: 'BCdPartyFace', value: 'partyfaceno', text: 'partyface' }); + $("#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 216545315..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 @@ -16,9 +16,9 @@ var bootstrap = function ($, learun) { }, bind: function () { $("#GenderNo").lrDataItemSelect({ code: 'usersex' }); - $('#PartyFaceNo').lrDataSourceSelect({ code: 'BCdPartyFace', value: 'partyfaceno', text: 'partyface' }); + $("#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 29aaae063..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); } }); } @@ -268,12 +267,11 @@ var bootstrap = function ($, learun) { { label: '政治面貌', name: 'PartyFaceNo', width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) { - learun.clientdata.getAsync('custmerData', { - url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BCdPartyFace', + learun.clientdata.getAsync('dataItem', { key: value, - keyId: 'partyfaceno', + code: 'BCdPartyFace', callback: function (_data) { - callback(_data['partyface']); + 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 116bc4ae9..0a38bd286 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Accommodation/Room.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Accommodation/Room.cshtml @@ -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; @@ -277,26 +275,22 @@ filter_BCdPartyFace: function (value) { var result; - top.learun.clientdata.getAsync('custmerData', { - sync: true, - url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BCdPartyFace', + top.learun.clientdata.getAsync('dataItem', { key: value, - keyId: 'partyfaceno', + code: 'BCdPartyFace', callback: function (_data) { - result = _data['partyface']; + result=_data.text; } }); return result; }, filter_BCdFamilyOrigin: function (value) { var result; - top.learun.clientdata.getAsync('custmerData', { - sync: true, - url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BCdFamilyOrigin', + top.learun.clientdata.getAsync('dataItem', { key: value, - keyId: 'familyoriginno', + code: 'BCdFamilyOrigin', callback: function (_data) { - result = _data['familyorigin']; + result = _data.text; } }); return result; @@ -357,16 +351,13 @@ }, filter_BCdOverseasChinese: function (value) { var result; - top.learun.clientdata.getAsync('custmerData', { - sync: true, - url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BCdOverseasChinese', + top.learun.clientdata.getAsync('dataItem', { key: value, - keyId: 'overseaschineseno', + code: 'BCdOverseasChinese', callback: function (_data) { - result = _data.overseaschinesename; + result=_data.text; } }); - return result; }, filter_CollegeType: function (value) { diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/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 ba0164eec..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 @@ -242,7 +242,9 @@ @item.WorkUnit @@ -339,9 +341,9 @@ 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"); - GetDataSourceStr("BCdPartyFace", "partyfaceno", "partyface", "@Model.PoliticsFace", "#PoliticsFace"); + GetDataItemStr("BCdPartyFace", "@Model.PoliticsFace", "#PoliticsFace"); GetDataSourceStr("BCdCultureDegree", "culturedegreeno", "culturedegree", "@Model.AP_OnlineStudentInfoEntity.CultureId", "#CultureId"); GetDataItemStr("MarriageType", "@Model.AP_OnlineStudentInfoEntity.MarriageId", "#MarriageId"); GetDataItemStr("ResidenceNo", "@Model.OriginId", "#OriginId"); 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 4bf55d393..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 @@ -549,17 +549,17 @@