From 52eef3cb358841eacf6bfb83563642e6d1f3867f Mon Sep 17 00:00:00 2001 From: zhangli <1109134334@qq.com> Date: Wed, 26 Jan 2022 16:32:42 +0800 Subject: [PATCH] =?UTF-8?q?=E6=94=BF=E6=B2=BB=E9=9D=A2=E8=B2=8C=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E4=B8=BA=E5=AD=97=E5=85=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Views/AP_OnlineUserInfo/DropOutIndex.js | 14 ++++++------- .../Views/AP_OnlineUserInfo/PaymentIndex.js | 7 +++---- .../Views/AP_OnlineUserInfo/RegistrateForm.js | 14 ++++++------- .../AP_OnlineUserInfo/RegistrateIndex.js | 7 +++---- .../Views/AP_OnlineUserInfo/ReportIndex.js | 7 +++---- .../Controllers/EmpInfoController.cs | 7 ++----- .../Controllers/EmpInfoEnternalController.cs | 16 ++++++++++++++ .../Views/EmpInfo/Form.js | 2 +- .../Views/EmpInfo/FormAdd.cshtml | 8 +++---- .../Views/EmpInfo/FormModify.js | 2 +- .../Views/EmpInfo/FormView.cshtml | 9 ++++---- .../Views/EmpInfo/FormView.js | 2 +- .../Views/EmpInfo/Index.js | 9 ++++---- .../Views/EmpInfo/IndexOfDC.js | 7 +++---- .../Views/EmpInfoEnternal/FormAdd.cshtml | 8 +++---- .../Views/SignUpAboutOnline/Form.js | 2 +- .../Views/SignUpAboutTrain/Form.js | 4 ++-- .../Views/SignUpAboutTrain/Index.js | 7 +++---- .../Views/StuEnroll/AllocationClass.js | 7 +++---- .../Views/StuEnroll/Form.js | 3 ++- .../Views/StuEnroll/FormView.js | 2 +- .../Views/StuEnroll/GetArticles.js | 7 +++---- .../Views/StuEnroll/GetCloth.js | 7 +++---- .../Views/StuEnroll/GetClothSize.js | 7 +++---- .../Views/StuEnroll/Index.js | 7 +++---- .../Views/StuEnroll/IsPay.js | 7 +++---- .../Views/StuEnroll/IsPhoto.js | 7 +++---- .../Views/StuEnroll/Military.js | 7 +++---- .../Views/StuEnroll/PayAfter.js | 7 +++---- .../Views/StuEnroll/Report.js | 7 +++---- .../Views/StuEnroll/StuTuition.js | 7 +++---- .../Views/StuInfoBasic/Form.js | 2 +- .../Views/StuInfoBasic/FormOfDC.js | 6 +++--- .../Views/StuInfoBasic/FormView.cshtml | 8 +++---- .../Views/StuInfoBasic/FormView.js | 2 +- .../Views/StuInfoBasic/Index.js | 7 +++---- .../Views/StuInfoBasic/IndexOfDC.js | 21 ++++++++----------- .../Views/StuInfoBasicTwo/Index.js | 7 +++---- .../Views/StuInfoFresh/Form.js | 2 +- .../Views/StuInfoFresh/FormDC.js | 2 +- .../Views/StuInfoFresh/FormOfStudent.js | 2 +- .../Views/StuInfoFresh/FormView.js | 2 +- .../Views/StuInfoFresh/StatusView.js | 7 +++---- .../Views/Accommodation/Room.cshtml | 8 +++---- .../OnlineRegistrate/RegistrateForm.cshtml | 8 ++++--- .../RegistrateFormEdit.cshtml | 14 ++++++------- .../Views/UserCenter/Index.cshtml | 16 ++++++-------- .../Views/UserCenter/IndexForDC.cshtml | 16 ++++++-------- .../Views/UserCenter/IndexInTeacher.cshtml | 16 ++++++-------- .../Modules/Feixing/UserApiController.cs | 9 ++++---- .../Import/ExcelImportBLL.cs | 2 +- 51 files changed, 172 insertions(+), 199 deletions(-) diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AdmissionsPlatform/Views/AP_OnlineUserInfo/DropOutIndex.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AdmissionsPlatform/Views/AP_OnlineUserInfo/DropOutIndex.js index 0f30d8369..87d6bfaf6 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: 'BCdNationality', 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..5f461c45d 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 @@ -130,12 +130,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..a259aa17e 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 @@ -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..8af6c386c 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 @@ -202,12 +202,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..6add32e76 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 @@ -132,12 +132,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..f91175957 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 @@ -122,11 +122,8 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers 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..0df9615e8 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 @@ -87,7 +87,7 @@ var bootstrap = function ($, learun) { $('#GenderNo').lrDataItemSelect({ code: 'usersexbit' }); $('#IsHasLesson').lrDataItemSelect({ code: 'YesOrNoBit' }); $('#NationalityNo').lrDataSourceSelect({ code: 'BCdNationality', value: 'nationalityno', text: 'nationality' }); - $('#PartyFaceNo').lrDataSourceSelect({ code: 'BCdPartyFace', value: 'partyfaceno', text: 'partyface' }); + $('#PartyFaceNo').lrDataItemSelect({ code: 'BCdPartyFace' }); $('#ProvinceNo').lrDataSourceSelect({ code: 'DIC_PROVINCE', value: 'pcode', text: 'pname', select: function (item) { diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/FormAdd.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/FormAdd.cshtml index 13c22c99e..ac9b28963 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) }, @@ -299,13 +299,13 @@ }, }); $.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); }, 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..b34f5461c 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/FormModify.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/FormModify.js @@ -8,7 +8,7 @@ var acceptClick; var keyValue = request('keyValue'); var isTeacher = request('isTeacher'); var colDataItemArr = ['GenderNo', 'IsInActiveStatus', 'EmpSortNo', 'PositionLevel', 'CompilationCategory', 'ObtainWayOfHighestRecord', 'ObtainWay', 'ObtainWayOfHighestDegree', 'ObtainWayOfInitialDegree', 'JobRank', 'WorkLevel', 'EmpFullTimeNo', 'IsHasLesson']; -var colDataItemCode = ['usersexbit', 'JobStatus', 'jsgw', 'PositionLevel', 'CompilationCategory', 'ObtainWay', 'ObtainWay', 'ObtainWayOfDegree', 'ObtainWayOfDegree', 'TechnicalPost', 'TechnicalLevelOfWorker', 'EmpFullTime', 'YesOrNoBit']; +var colDataItemCode = ['BCdPartyFace','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 colDataSourceValue = ['partyfaceno', 'nationalityno', 'healthstatusno', 'familyoriginno', 'overseaschineseno', 'f_companyid', 'f_departmentid', 'deptno', 'titleoftechpostno', 'culturedegreeno', 'culturedegreeno', 'degreeno', 'degreeno', 'subjectspeciesno', 'foreignlanguageno']; diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/FormView.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/FormView.cshtml index 8041578a5..50b69dd16 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 @@ -156,15 +156,14 @@ }, 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) { 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..bc5002b26 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 @@ -36,7 +36,7 @@ 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' }); + $('#PartyFaceNo').lrDataItemSelect({ code: 'BCdPartyFace' }); $('#ProvinceNo').lrDataSourceSelect({ code: 'DIC_PROVINCE', value: 'pcode', text: 'pname', select: function (item) { diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Index.js index d78d3927d..b6ce8d7cd 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,7 +48,7 @@ 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 }); @@ -434,12 +434,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/EmpInfo/IndexOfDC.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/IndexOfDC.js index ba41b046b..1839872a2 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 @@ -348,12 +348,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/EmpInfoEnternal/FormAdd.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfoEnternal/FormAdd.cshtml index f21e7877b..fe9d0f0e0 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 @@ -326,13 +326,13 @@ }, }); $.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); }, 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..d126c175b 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 @@ -19,7 +19,7 @@ var bootstrap = function ($, learun) { $('#NationalityNo').lrDataSourceSelect({ code: 'BCdNationality', value: 'nationalityno', text: 'nationality' }); $('#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/SignUpAboutTrain/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/SignUpAboutTrain/Form.js index 76191b205..d29c4350f 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').lrDataSourceSelect({ code: 'BCdNationality', value: 'nationalityno', text: 'nationality' }); + $('#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..5fed1ec2b 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 @@ -99,12 +99,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..6cf76b6b8 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 @@ -205,12 +205,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/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/Form.js index ceaac9785..3dde645a4 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 @@ -23,7 +23,8 @@ var bootstrap = function ($, learun) { //民族 $('#Nationals').lrDataSourceSelect({ code: 'BCdNationality', value: 'nationalityno', text: 'nationality' }); //政治面貌 - $('#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..698f04a0d 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 @@ -23,7 +23,7 @@ var bootstrap = function ($, learun) { //民族 $('#Nationals').lrDataSourceSelect({ code: 'BCdNationality', value: 'nationalityno', text: 'nationality' }); //政治面貌 - $('#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..a65fa0474 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 @@ -216,12 +216,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..951773d51 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 @@ -216,12 +216,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..11bb8b0bd 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 @@ -212,12 +212,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..58306614c 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 @@ -379,12 +379,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..043b25250 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 @@ -248,12 +248,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..8072a218a 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 @@ -208,12 +208,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..d1c81f8cb 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 @@ -246,12 +246,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/PayAfter.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/PayAfter.js index abb9c443b..63acb6a87 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 @@ -334,12 +334,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..91d8b6d8a 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 @@ -312,12 +312,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..fef5a18cb 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 @@ -331,12 +331,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..b4a455d12 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 @@ -106,7 +106,7 @@ var bootstrap = function ($, learun) { $('#F_SchoolId').lrDataSourceSelect({ code: 'company', value: 'f_companyid', text: 'f_fullname' }); $('#NationalityNo').lrDataSourceSelect({ code: 'BCdNationality', value: 'nationalityno', text: 'nationality' }); $('#GenderNo').lrDataItemSelect({ code: 'usersexbit' }); - $('#PartyFaceNo').lrDataSourceSelect({ code: 'BCdPartyFace', value: 'partyfaceno', text: 'partyface' }); + $('#PartyFaceNo').lrDataItemSelect({ code: 'BCdPartyFace' }); $('#HealthStatusNo').lrDataSourceSelect({ code: 'BCdHealthStatus', value: 'healthstatusno', text: 'healthstatus' }); $('#Photo').lrUploader(); $('#FamilyOriginNo').lrDataSourceSelect({ code: 'BCdFamilyOrigin', value: 'familyoriginno', text: 'familyorigin' }); 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..aad766060 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 @@ -106,7 +106,7 @@ var bootstrap = function ($, learun) { $('#F_SchoolId').lrDataSourceSelect({ code: 'company', value: 'f_companyid', text: 'f_fullname' }); $('#NationalityNo').lrDataSourceSelect({ code: 'BCdNationality', value: 'nationalityno', text: 'nationality' }); $('#GenderNo').lrDataItemSelect({ code: 'usersexbit' }); - $('#PartyFaceNo').lrDataSourceSelect({ code: 'BCdPartyFace', value: 'partyfaceno', text: 'partyface' }); + $('#PartyFaceNo').lrDataItemSelect({ code: 'BCdPartyFace' }); $('#HealthStatusNo').lrDataSourceSelect({ code: 'BCdHealthStatus', value: 'healthstatusno', text: 'healthstatus' }); $('#Photo').lrUploader(); $('#FamilyOriginNo').lrDataSourceSelect({ code: 'BCdFamilyOrigin', value: 'familyoriginno', text: 'familyorigin' }); @@ -187,13 +187,13 @@ var bootstrap = function ($, learun) { $('#OneIsGuardian').lrDataItemSelect({ code: 'YesOrNoInt' }); $('#OneIdCardType').lrDataItemSelect({ code: 'IdCardType' }); $('#OneNationalityNo').lrDataSourceSelect({ code: 'BCdNationality', value: 'nationalityno', text: 'nationality' }); - $('#OnePartyFaceNo').lrDataSourceSelect({ code: 'BCdPartyFace', value: 'partyfaceno', text: 'partyface' }); + $('#OnePartyFaceNo').lrDataItemSelect({ code: 'BCdPartyFace' }); $('#OneHealthStatus').lrDataSourceSelect({ code: 'BCdHealthStatus', value: 'healthstatusno', text: 'healthstatus' }); $('#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' }); + $('#TwoPartyFaceNo').lrDataItemSelect({ code: 'BCdPartyFace' }); $('#TwoHealthStatus').lrDataSourceSelect({ code: 'BCdHealthStatus', value: 'healthstatusno', text: 'healthstatus' }); 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..d404cbc54 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 @@ -179,13 +179,11 @@ }, 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; 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..f052d2981 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 @@ -65,7 +65,7 @@ var bootstrap = function ($, learun) { $('#F_SchoolId').lrDataSourceSelect({ code: 'company', value: 'f_companyid', text: 'f_fullname' }); $('#NationalityNo').lrDataSourceSelect({ code: 'BCdNationality', value: 'nationalityno', text: 'nationality' }); $('#GenderNo').lrDataItemSelect({ code: 'usersexbit' }); - $('#PartyFaceNo').lrDataSourceSelect({ code: 'BCdPartyFace', value: 'partyfaceno', text: 'partyface' }); + $('#PartyFaceNo').lrDataItemSelect({ code: 'BCdPartyFace' }); $('#HealthStatusNo').lrDataSourceSelect({ code: 'BCdHealthStatus', value: 'healthstatusno', text: 'healthstatus' }); $('#Photo').lrUploader(); $('#FamilyOriginNo').lrDataSourceSelect({ code: 'BCdFamilyOrigin', value: 'familyoriginno', text: 'familyorigin' }); 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..32b299e21 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 @@ -324,12 +324,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/IndexOfDC.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/IndexOfDC.js index 70704caf7..58d6a7cf8 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 @@ -389,12 +389,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); } }); } @@ -554,12 +553,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); } }); } @@ -632,12 +630,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); } }); } 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..e8bd357d4 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 @@ -167,12 +167,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/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/Form.js index 8b8387548..f588d59af 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,7 +16,7 @@ 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' }); $("#TestStuSortNo").lrDataItemSelect({ code: 'ExamineeType' }); 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..6c91de30f 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,7 +17,7 @@ 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' }); $("#TestStuSortNo").lrDataItemSelect({ code: 'ExamineeType' }); 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..de5fff142 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,7 +17,7 @@ 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' }); $("#TestStuSortNo").lrDataItemSelect({ code: 'ExamineeType' }); 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..59765f84e 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,7 +16,7 @@ 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' }); $("#TestStuSortNo").lrDataItemSelect({ code: 'ExamineeType' }); 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..e9acf7567 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 @@ -268,12 +268,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/LogisticsManagement/Views/Accommodation/Room.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Accommodation/Room.cshtml index 116bc4ae9..b3c3250c8 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 @@ -277,13 +277,11 @@ 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; 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..4830218e0 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 @@ -341,7 +343,7 @@ GetDataItemStr("usersex", "@Model.SexId", "#SexId"); GetDataSourceStr("BCdNationality", "nationalityno", "nationality", "@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..ca97b545a 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 @@