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 809dbfab6..e27097c5a 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 d932d3131..aee50dcd7 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 @@ -91,7 +91,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/FormView.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/FormView.cshtml index 01b89525f..e114657be 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 9ebc6e4d1..f6df4577b 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 462fc1ffb..f692c276b 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').lrDataSourceSelect({ code: 'BCdCultureDegree', value: 'culturedegreeno', text: 'culturedegree' }); @@ -449,12 +449,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 f6cd0fbed..8cbebfbcb 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 dba4d2c34..a787ed1f3 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 fbeee4821..5123b2a9d 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 @@ -210,12 +210,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 8b37576d8..736e09eb4 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 @@ -210,12 +210,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 80813a07d..ecf3ca41d 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 @@ -206,12 +206,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 85145bfff..18a6ec33d 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 @@ -372,12 +372,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 691929fc6..e9245fc6c 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 @@ -242,12 +242,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 14a49d27d..3e6b71c10 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 @@ -202,12 +202,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 99bc91916..e4bf2b658 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 @@ -240,12 +240,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 1fbb443b0..c3e80b757 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 @@ -328,12 +328,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 ec38c618d..7179642ba 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 @@ -315,12 +315,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 new file mode 100644 index 000000000..fef5a18cb --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/StuTuition.js @@ -0,0 +1,441 @@ +/* * 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园(http://www.learun.cn) + * Copyright (c) 2013-2018 北京泉江科技有限公司 + * 创建人：超级管理员 + * 日 期：2019-07-17 11:20 + * 描 述：新生录取管理 + */ +var refreshGirdData; +var NowGrade; +var bootstrap = function ($, learun) { + "use strict"; + var page = { + init: function () { + var data_grade = learun.httpGet(top.$.rootUrl + '/EducationalAdministration/StuEnroll/GetYearListByMaxClass', + {}); + NowGrade = data_grade.info; + + page.initGird(); + page.bind(); + //page.refreshMoney(); + }, + bind: function () { + $('#multiple_condition_query').lrMultipleQuery(function (queryJson) { + page.search(queryJson); + //page.refreshMoney(); + }, 380, 400); + $("#IsSubsidize1").lrDataItemSelect({ code: "jyYewOrNot" }); + $('#Grade').lrselect({ + url: top.$.rootUrl + '/EducationalAdministration/StuEnroll/GetYearListByClass', + value: "year", + text: "year", + }); + $('#Grade').lrselectSet(NowGrade); + + $('#DeptNo').lrselect({ + allowSearch: true, + value: "deptno", + text: "deptname", + url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=CdDeptInfo', + select: function (item) { + if (item) { + $('#MajorNo').lrselectRefresh({ + allowSearch: true, + url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=CdMajorInfo', + param: { strWhere: "DeptNo='" + item.deptno + "' AND CheckMark=1" } + }); + } else { + $('#MajorNo').lrselectRefresh({ + allowSearch: true, + url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=CdMajorInfo', + param: { strWhere: "1=1 AND CheckMark=1" } + }); + } + + } + }); + $('#MajorNo').lrselect({ + allowSearch: true, + url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=CdMajorInfo', + value: "majorno", + text: "majorname", + param: { strWhere: "1=1 AND CheckMark=1" }, + select: function (item) { + if (item) { + $('#ClassNo').lrselectRefresh({ + allowSearch: true, + url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj', + param: { strWhere: "majorno='" + item.majorno + "' AND CheckMark=1" } + }); + } else { + $('#ClassNo').lrselectRefresh({ + allowSearch: true, + url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj', + param: { strWhere: "1=1 AND CheckMark=1" } + }); + } + } + }); + $('#ClassNo').lrselect({ + allowSearch: true, + url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj', + param: { strWhere: "1=1 AND CheckMark=1" }, + value: "classno", + text: "classname" + }); + // 刷新 + $('#lr_refresh').on('click', function () { + location.reload(); + }); + // 打印 + $('#lr_print').on('click', function () { + $('#gridtable').jqprintTable(); + }); + $('#lr_view').on('click', function () { + var keyValue = $('#gridtable').jfGridValue('StuId'); + if (learun.checkrow(keyValue)) { + learun.layerForm({ + id: 'form', + title: '查看', + url: top.$.rootUrl + '/EducationalAdministration/StuEnroll/FormView?keyValue=' + keyValue, + width: 800, + height: 600, + btn: null + }); + } + }); + //上传资料 + $('#lr_uploadFile').on('click', function () { + var keyValue = $('#gridtable').jfGridValue('StuId'); + if (learun.checkrow(keyValue)) { + learun.layerForm({ + id: 'form', + title: '编辑', + url: top.$.rootUrl + '/EducationalAdministration/StuEnroll/SubsidizeUrl?keyValue=' + keyValue, + width: 600, + height: 200, + callBack: function (id) { + return top[id].acceptClick(refreshGirdData); + } + }); + } + }); + + //确认免学费 + $("#lr_help").on('click', function () { + var data = $('#gridtable').jfGridGet('rowdata'); + if (data.length > 0) { + var IsManualSubsidize = $('#gridtable').jfGridValue('IsManualSubsidize'); + + if (IsManualSubsidize.indexOf('true') != -1) { + learun.alert.warning('选中项目包含多次操作免学费的数据！'); + return; + } + learun.layerConfirm('是否确认免学费!', + function (res) { + if (res) { + learun.postForm(top.$.rootUrl + '/EducationalAdministration/StuEnroll/Help', + { stuId: JSON.stringify(data), status: true }, + function (res) { + refreshGirdData(); + + }); + } + + + }); + + } + + }); + + //全部免学费 + $("#lr_allhelp").on('click', function () { + learun.layerConfirm('是否全部免学费!', + function (res) { + if (res) { + + learun.postForm(top.$.rootUrl + '/EducationalAdministration/StuEnroll/AllHelp', + {}, + function (res) { + refreshGirdData(); + + }); + } + + + }); + + + }); + + + //确认不免学费 + $("#lr_nohelp").on('click', function () { + var data = $('#gridtable').jfGridGet('rowdata'); + if (data.length > 0) { + learun.layerConfirm('是否确认不免学费!', + function (res) { + if (res) { + learun.postForm(top.$.rootUrl + '/EducationalAdministration/StuEnroll/Help', + { stuId: JSON.stringify(data), status: false }, + function (res) { + refreshGirdData(); + }); + } + }); + } + + }); + + //确认资助 + $('#lr_support').on('click', function () { + var keyValue = $('#gridtable').jfGridValue('StuId'); + if (learun.checkrow(keyValue)) { + learun.layerConfirm('是否确认资助？', function (res) { + if (res) { + learun.postForm(top.$.rootUrl + '/EducationalAdministration/StuEnroll/Support', { keyValue: keyValue }, function () { + refreshGirdData(); + }); + } + }); + } + }); + + + //学费变更 + $("#lr_change").on('click', function () { + var keyValue = $('#gridtable').jfGridValue('StuId'); + if (keyValue.indexOf(',') > 0) { + learun.alert.warning("只能选中一条记录变更！"); + return; + } + var isSupportChange = $('#gridtable').jfGridValue('IsSupportChange'); + //如果已变更，将不能重复变更 + if (isSupportChange) { + learun.alert.warning("选中记录中已变更，不可重复变更！"); + return; + } else { + if (learun.checkrow(keyValue)) { + learun.layerForm({ + id: 'form', + title: '学费变更', + url: top.$.rootUrl + '/EducationalAdministration/StuEnroll/HelpChange?keyValue=' + keyValue, + width: 600, + height: 400, + callBack: function (id) { + var res = false; + // 验证数据 + res = top[id].validForm(); + // 保存数据 + if (res) { + res = top[id].save('', function () { + page.search(); + }); + } + return res; + } + }); + } + + } + }); + + }, + // 初始化列表 + initGird: function () { + $('#gridtable').jfGrid({ + url: top.$.rootUrl + '/EducationalAdministration/StuEnroll/GetPageList', + headData: [ + { label: "姓名", name: "StuName", width: 100, align: "left" }, + { + label: "班级", name: "ClassNo", width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('custmerData', { + url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'bjsj', + key: value, + keyId: 'classno', + callback: function (_data) { + callback(_data['classname']); + } + }); + } + }, + { + label: "录取方式", name: "Admissions", width: 100, align: "left", + formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('dataItem', { + key: value, + code: 'enrollType', + callback: function (_data) { + callback(_data.text); + } + }); + } + }, + { label: "学生报名号", name: "RegistrationNo", width: 100, align: "left" }, + { + label: "招生类别", name: "EnrollType", width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('dataItem', { + key: value, + code: 'EnrollStudentType', + callback: function (_data) { + if (_data.text == "计划外") { + callback('计划外') + } else { + + callback(_data.text); + } + } + }); + } + }, + { + label: "免学费", name: "IsSubsidize1", width: 100, align: "left", formatter: function (value, row) { + if (row.IsSubsidize1) { + return '是'; + } else if (row.IsSubsidize1 == false) { + return '否'; + } else { + return "未处理"; + } + } + }, + { + label: "是否上传资料", name: "SubsidizeUrl", width: 100, align: "left", formatter: function (value) { + if (value) { + return '已上传'; + } else { + return '未上传'; + } + } + }, + { + label: "性别", name: "Gender", width: 100, align: "left", formatter: function (value) { + return value == "1" ? "男" : "女"; + + } + }, + { + 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', + key: value, + keyId: 'nationalityno', + callback: function (_data) { + callback(_data['nationality']); + } + }); + } + }, + { label: "出生年月", name: "Birthday", width: 100, align: "left", formatter: function (val) { return learun.formatDate(val, 'yyyy-MM-dd') } }, + { label: "身份证", name: "IDCard", width: 150, align: "left" }, + { + label: "政治面貌", name: "Political", width: 100, align: "left", + formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('dataItem', { + key: value, + code: 'BCdPartyFace', + callback: function (_data) { + callback(_data.text); + } + }); + } + }, + { + label: "届别", name: "FreshType", width: 100, align: "left", + formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('dataItem', { + key: value, + code: 'timeType', + callback: function (_data) { + callback(_data.text); + } + }); + } + }, + { + label: "户别", name: "ResidenceType", width: 100, align: "left", + formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('dataItem', { + key: value, + code: 'HouseholdCategory', + callback: function (_data) { + callback(_data.text); + } + }); + } + }, + { + label: "考生类别", name: "StuType", width: 100, align: "left", + formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('dataItem', { + key: value, + code: 'stuType', + callback: function (_data) { + callback(_data.text); + } + }); + } + }, + { label: "户口地", name: "ResidenceAddress", width: 100, align: "left" }, + { label: "非京籍报考类", name: "NonNative", width: 100, align: "left" }, + { label: "学籍所在学校", name: "FromSchool", width: 100, align: "left" }, + { label: "家庭住址", name: "HomeAddress", width: 100, align: "left" }, + { label: "第一监护人", name: "FirstGuardian", width: 100, align: "left" }, + { label: "与被监护人关系", name: "FirstRelationship", width: 100, align: "left" }, + { label: "工作单位", name: "FirstUnits", width: 100, align: "left" }, + { label: "联系电话", name: "FirstMobile", width: 100, align: "left" }, + { label: "第二监护人", name: "SecondGuardian", width: 100, align: "left" }, + { label: "与被监护人关系", name: "SecondRelationship", width: 100, align: "left" }, + { label: "工作单位", name: "SecondUnits", width: 100, align: "left" }, + { label: "联系电话", name: "SecondMobile", width: 100, align: "left" }, + { label: "接收通知书地址", name: "Acceptance", width: 100, align: "left" }, + { label: "收件人", name: "Recipient", width: 100, align: "left" }, + { label: "邮政编码", name: "ZipCode", width: 100, align: "left" }, + { label: "既往病史", name: "MedicalHistory", width: 100, align: "left" }, + { label: "加分照顾对象", name: "AdditionalCare", width: 100, align: "left" }, + { label: "录取专业代码", name: "MajorNo", width: 100, align: "left" }, + { label: "录取专业名称", name: "MajorName", width: 100, align: "left" }, + + { label: "是否住宿", name: "IsAccommodation", width: 100, align: "left" }, + { label: "准考证号", name: "ExamRegistration", width: 100, align: "left" }, + ], + isMultiselect: true, + mainId: 'StuId', + isPage: true + }); + page.search(); + }, + refreshMoney: function (queryJson) { + learun.httpAsyncGetWithParam(top.$.rootUrl + '/EducationalAdministration/StuEnroll/GetMilitaryStatistics', { queryJson: queryJson,type:2 }, function (res) { + //console.log(res); + $("#allAmount").html(res.data.aa); + $("#isAmount").html(res.data.bb); + }); + //$.post( + // top.$.rootUrl + '/EducationalAdministration/StuEnroll/GetHelpStatistics', + // { + // DeptNo: deptNo, + // MajorNo: majorNo, + // ClassNo: classNo + // }, + // function (res) { + // $("#allAmount").html(res.data.aa); + // $("#isAmount").html(res.data.bb); + // }, "json"); + }, + search: function (param) { + param = param || {}; + param.SqlParameter = ' AND IsReport=1'; + + if (!param.Grade && param.Grade == undefined) { + param.Grade = NowGrade; + } + $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) }); + page.refreshMoney(JSON.stringify(param)); + } + }; + refreshGirdData = function () { + page.search(); + }; + page.init(); +} 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 c53eb1050..b191ff80b 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 @@ -107,7 +107,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 dbcec20ae..14521eef5 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 eae134310..02aa0a9aa 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 @@ -262,12 +262,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 a7e80130d..f201c4a15 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 @@ -17,7 +17,7 @@ var bootstrap = function ($, learun) { bind: function () { $('#DepositBank').lrDataItemSelect({ code: 'DepositBank' }); $("#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 @@