From 2f459a4d27eff85a5a8b02d51c35884e73a8d02c Mon Sep 17 00:00:00 2001 From: ndbs Date: Thu, 10 Mar 2022 14:47:01 +0800 Subject: [PATCH] =?UTF-8?q?=E6=94=BF=E6=B2=BB=E9=9D=A2=E8=B2=8C=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E6=BA=90=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 --- .../Areas/EducationalAdministration/Views/EmpInfo/Form.js | 2 +- .../Areas/EducationalAdministration/Views/EmpInfo/Index.js | 2 +- .../EducationalAdministration/Views/StuInfoBasic/Form.js | 2 +- .../Views/StuInfoBasic/FormTran.js | 2 +- .../EducationalAdministration/Views/StuInfoBasic/Index.js | 7 +++---- .../EducationalAdministration/Views/StuInfoFresh/Form.js | 2 +- .../Views/StuInfoFresh/FormView.js | 2 +- .../Learun.Application.Web/Views/UserCenter/Index.cshtml | 2 +- .../Views/UserCenter/IndexInTeacher.cshtml | 6 +++--- 9 files changed, 13 insertions(+), 14 deletions(-) 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 ad89b6722..c61bdd0ad 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').lrDataItemSelect({ code: 'National' }); - $('#PartyFaceNo').lrDataItemSelect({ code: 'BCdPartyFace' }); + $('#PartyFaceNo').lrDataItemSelect({ code: 'PolityStatus' }); $('#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 7fae0d5f3..9e28416ba 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 @@ -436,7 +436,7 @@ var bootstrap = function ($, learun) { formatterAsync: function (callback, value, row, op, $cell) { learun.clientdata.getAsync('dataItem', { key: value, - code: 'BCdPartyFace', + code: 'PolityStatus', callback: function (_data) { 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 476d205a2..1194c81c6 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 @@ -108,7 +108,7 @@ var bootstrap = function ($, learun) { $('#F_SchoolId').lrDataSourceSelect({ code: 'company', value: 'f_companyid', text: 'f_fullname' }); $('#NationalityNo').lrDataItemSelect({ code: 'National' }); $('#GenderNo').lrDataItemSelect({ code: 'usersexbit' }); - $('#PartyFaceNo').lrDataSourceSelect({ code: 'BCdPartyFace', value: 'partyfaceno', text: 'partyface' }); + $('#PartyFaceNo').lrDataItemSelect({ code: 'PolityStatus' }); $('#HealthStatusNo').lrDataItemSelect({ code: 'StuHealthType' }); $('#Photo').lrUploader(); $('#FamilyOriginNo').lrDataItemSelect({ code: 'BCdFamilyOrigin' }); diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/FormTran.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/FormTran.js index ae0150bd4..26b3e4ad4 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/FormTran.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/FormTran.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: 'PolityStatus' }); $('#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 8d801587c..658244de8 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: 'PolityStatus', 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 66b1f454d..32a3553ca 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: 'PolityStatus' }); $('#FamilyOriginNo').lrDataItemSelect({ code: 'stuType' }); $("#NationalityNo").lrDataItemSelect({ code: 'National' }); $("#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 1d1fbd919..908a103bd 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").lrDataItemSelect({ code: 'BCdPartyFace' }); + $("#PartyFaceNo").lrDataItemSelect({ code: 'PolityStatus' }); $("#FamilyOriginNo").lrDataItemSelect({ code: 'ExamineeCategory' }); $("#NationalityNo").lrDataItemSelect({ code: 'National' }); $("#TestStuSortNo").lrDataItemSelect({ code: 'ExamineeType' }); diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/UserCenter/Index.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/UserCenter/Index.cshtml index a756ea398..abe15e070 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/UserCenter/Index.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/UserCenter/Index.cshtml @@ -190,7 +190,7 @@ }, filters: { sex: function (value) { - return value ? "男生" : "女生"; + return value ? "男" : "女"; }, company: function (value) { diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/UserCenter/IndexInTeacher.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/UserCenter/IndexInTeacher.cshtml index 19bb34707..76121064c 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/UserCenter/IndexInTeacher.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/UserCenter/IndexInTeacher.cshtml @@ -176,7 +176,7 @@ }, filters: { sex: function (value) { - return value ? "男生" : "女生"; + return value ? "男" : "女"; }, company: function (value) { @@ -222,7 +222,7 @@ var result; top.learun.clientdata.getAsync('dataItem', { key: value, - code: 'BCdPartyFace', + code: 'PolityStatus', callback: function (_data) { result = _data.text; } @@ -544,7 +544,7 @@ var result; top.learun.clientdata.getAsync('dataItem', { key: value, - code: 'BCdPartyFace', + code: 'PolityStatus', callback: function (_data) { result =_data.text; }