From f6c3d491a69952f67731e14b998ccec6dc02dbc8 Mon Sep 17 00:00:00 2001 From: zhangli <1109134334@qq.com> Date: Thu, 27 Jan 2022 11:23:21 +0800 Subject: [PATCH] =?UTF-8?q?=E5=81=A5=E5=BA=B7=E7=8A=B6=E5=86=B5BCdHealthSt?= =?UTF-8?q?atus=E4=BF=AE=E6=94=B9=E4=B8=BA=E8=AF=BB=E5=8F=96=E5=AD=97?= =?UTF-8?q?=E5=85=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Views/EmpInfo/Form.js | 2 +- .../Views/EmpInfo/FormModify.js | 2 +- .../Views/EmpInfo/FormView.cshtml | 9 +++----- .../Views/EmpInfo/FormView.js | 4 ++-- .../Views/EmpInfo/Index.js | 7 +++---- .../Views/StuInfoBasic/Form.js | 2 +- .../Views/StuInfoBasic/FormOfDC.js | 6 +++--- .../Views/StuInfoBasic/FormView.cshtml | 9 +++----- .../Views/StuInfoBasic/FormView.js | 2 +- .../Views/StuInfoBasic/IndexOfDC.js | 21 ++++++++----------- .../Views/UserCenter/Index.cshtml | 17 ++++++--------- .../Views/UserCenter/IndexForDC.cshtml | 18 ++++++---------- .../Views/UserCenter/IndexInTeacher.cshtml | 18 ++++++---------- 13 files changed, 45 insertions(+), 72 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 1bbaa170c..cb46f9fc1 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 @@ -119,7 +119,7 @@ var bootstrap = function ($, learun) { }); $('#RegionNo').lrselect(); $('#OverseasChineseNo').lrDataSourceSelect({ code: 'BCdOverseasChinese', value: 'overseaschineseno', text: 'overseaschinesename' }); - $('#HealthStatusNo').lrDataSourceSelect({ code: 'BCdHealthStatus', value: 'healthstatusno', text: 'healthstatus' }); + $('#HealthStatusNo').lrDataItemSelect({ code: 'BCdHealthStatus', allowSearch: true }); //初始学历 $('#CultureDegreeNo').lrDataItemSelect({ code: 'CollegeType', allowSearch: true }); $('#DegreeNo').lrDataItemSelect({ code: 'BCdDegree', allowSearch: true }); 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 6b9a53383..766137ce1 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 = ['BCdPartyFace', 'BCdDegree', 'BCdFamilyOrigin', 'BCdForeignLanguage','usersexbit', 'JobStatus', 'jsgw', 'PositionLevel', 'CompilationCategory', 'ObtainWay', 'ObtainWay', 'ObtainWayOfDegree', 'ObtainWayOfDegree', 'TechnicalPost', 'TechnicalLevelOfWorker', 'EmpFullTime', 'YesOrNoBit']; +var colDataItemCode = ['BCdPartyFace', 'BCdDegree', 'BCdFamilyOrigin', 'BCdForeignLanguage', 'BCdHealthStatus','usersexbit', 'JobStatus', 'jsgw', 'PositionLevel', 'CompilationCategory', 'ObtainWay', 'ObtainWay', 'ObtainWayOfDegree', 'ObtainWayOfDegree', 'TechnicalPost', 'TechnicalLevelOfWorker', 'EmpFullTime', 'YesOrNoBit']; var colDataSourceArr = ['PartyFaceNo', 'NationalityNo', 'HealthStatusNo', 'FamilyOriginNo', 'OverseasChineseNo', 'F_CompanyId', 'F_DepartmentId', 'DeptNo', 'PostRank', 'HighestRecord', 'CultureDegreeNo', 'DegreeNo', 'InitialDegree', 'SubjectSpeciesNo', 'ForeignLanguageNo']; var colDataSourceCode = ['BCdPartyFace', 'BCdNationality', 'BCdHealthStatus', 'BCdFamilyOrigin', 'BCdOverseasChinese', 'company', 'classdata', 'CdDeptInfo', 'BCdTitleOfTechPost', 'BCdCultureDegree', 'BCdCultureDegree', 'BCdDegree', 'BCdSubjectSpecies', 'BCdForeignLanguage']; var colDataSourceValue = ['partyfaceno', 'nationalityno', 'healthstatusno', 'familyoriginno', 'overseaschineseno', 'f_companyid', 'f_departmentid', 'deptno', 'titleoftechpostno', 'culturedegreeno', 'culturedegreeno', 'degreeno', 'degreeno', 'subjectspeciesno', 'foreignlanguageno']; 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 67c9002e5..b6d8696f7 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 @@ -182,16 +182,13 @@ }, healthStatusNo: function (value) { var result; - top.learun.clientdata.getAsync('custmerData', { - sync: true, - url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BCdHealthStatus', + top.learun.clientdata.getAsync('dataItem', { key: value, - keyId: 'healthstatusno', + code: 'BCdHealthStatus', callback: function (_data) { - result = _data.healthstatus; + result = _data.text; } }); - return result; }, deptNo: function (value) { 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 8db72e3b5..94264deb9 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 @@ -67,8 +67,8 @@ var bootstrap = function ($, learun) { } }); $('#RegionNo').lrselect(); - $('#OverseasChineseNo').lrDataSourceSelect({ code: 'BCdOverseasChinese',value: 'overseaschineseno',text: 'overseaschinesename' }); - $('#HealthStatusNo').lrDataSourceSelect({ code: 'BCdHealthStatus',value: 'healthstatusno',text: 'healthstatus' }); + $('#OverseasChineseNo').lrDataSourceSelect({ code: 'BCdOverseasChinese', value: 'overseaschineseno', text: 'overseaschinesename' }); + $('#HealthStatusNo').lrDataItemSelect({ code: 'BCdHealthStatus' }); $('#CultureDegreeNo').lrDataSourceSelect({ code: 'BCdCultureDegree',value: 'culturedegreeno',text: 'culturedegree' }); $('#DegreeNo').lrDataItemSelect({ code: 'BCdDegree' }); $('#FamilyOriginNo').lrDataItemSelect({ code: 'BCdFamilyOrigin' }); 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 3bcf20366..d99f4eeeb 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 @@ -513,12 +513,11 @@ var bootstrap = function ($, learun) { { label: "健康状况", name: "HealthStatusNo", width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) { - learun.clientdata.getAsync('custmerData', { - url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BCdHealthStatus', + learun.clientdata.getAsync('dataItem', { key: value, - keyId: 'healthstatusno', + code: 'BCdHealthStatus', callback: function (_data) { - callback(_data['healthstatus']); + callback(_data.text); } }); } 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 2e27f1eec..7d97f3c89 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) { $('#NationalityNo').lrDataSourceSelect({ code: 'BCdNationality', value: 'nationalityno', text: 'nationality' }); $('#GenderNo').lrDataItemSelect({ code: 'usersexbit' }); $('#PartyFaceNo').lrDataItemSelect({ code: 'BCdPartyFace' }); - $('#HealthStatusNo').lrDataSourceSelect({ code: 'BCdHealthStatus', value: 'healthstatusno', text: 'healthstatus' }); + $('#HealthStatusNo').lrDataItemSelect({ code: 'BCdHealthStatus' }); $('#Photo').lrUploader(); $('#FamilyOriginNo').lrDataItemSelect({ code: 'BCdFamilyOrigin' }); $('#OverseasChineseNo').lrDataSourceSelect({ code: 'BCdOverseasChinese', value: 'overseaschineseno', text: 'overseaschinesename' }); 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 e92d374e4..a2887e4e9 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 @@ -107,7 +107,7 @@ var bootstrap = function ($, learun) { $('#NationalityNo').lrDataSourceSelect({ code: 'BCdNationality', value: 'nationalityno', text: 'nationality' }); $('#GenderNo').lrDataItemSelect({ code: 'usersexbit' }); $('#PartyFaceNo').lrDataItemSelect({ code: 'BCdPartyFace' }); - $('#HealthStatusNo').lrDataSourceSelect({ code: 'BCdHealthStatus', value: 'healthstatusno', text: 'healthstatus' }); + $('#HealthStatusNo').lrDataItemSelect({ code: 'BCdHealthStatus' }); $('#Photo').lrUploader(); $('#FamilyOriginNo').lrDataItemSelect({ code: 'BCdFamilyOrigin' }); $('#OverseasChineseNo').lrDataSourceSelect({ code: 'BCdOverseasChinese', value: 'overseaschineseno', text: 'overseaschinesename' }); @@ -188,13 +188,13 @@ var bootstrap = function ($, learun) { $('#OneIdCardType').lrDataItemSelect({ code: 'IdCardType' }); $('#OneNationalityNo').lrDataSourceSelect({ code: 'BCdNationality', value: 'nationalityno', text: 'nationality' }); $('#OnePartyFaceNo').lrDataItemSelect({ code: 'BCdPartyFace' }); - $('#OneHealthStatus').lrDataSourceSelect({ code: 'BCdHealthStatus', value: 'healthstatusno', text: 'healthstatus' }); + $('#OneHealthStatus').lrDataItemSelect({ code: 'BCdHealthStatus' }); $('#TwoMembership').lrDataItemSelect({ code: 'FamilyRelation' }); $('#TwoIsGuardian').lrDataItemSelect({ code: 'YesOrNoInt' }); $('#TwoIdCardType').lrDataItemSelect({ code: 'IdCardType' }); $('#TwoNationalityNo').lrDataSourceSelect({ code: 'BCdNationality', value: 'nationalityno', text: 'nationality' }); $('#TwoPartyFaceNo').lrDataItemSelect({ code: 'BCdPartyFace' }); - $('#TwoHealthStatus').lrDataSourceSelect({ code: 'BCdHealthStatus', value: 'healthstatusno', text: 'healthstatus' }); + $('#TwoHealthStatus').lrDataItemSelect({ code: 'BCdHealthStatus' }); diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/FormView.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/FormView.cshtml index d404cbc54..8c8663a0c 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 @@ -243,16 +243,13 @@ }, healthStatusNo: function (value) { var result; - top.learun.clientdata.getAsync('custmerData', { - sync: true, - url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BCdHealthStatus', + top.learun.clientdata.getAsync('dataItem', { key: value, - keyId: 'healthstatusno', + code: 'BCdHealthStatus', callback: function (_data) { - result = _data.healthstatus; + result = _data.text; } }); - return result; }, deptNo: function (value) { 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 6bb52c569..fca8190a3 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 @@ -66,7 +66,7 @@ var bootstrap = function ($, learun) { $('#NationalityNo').lrDataSourceSelect({ code: 'BCdNationality', value: 'nationalityno', text: 'nationality' }); $('#GenderNo').lrDataItemSelect({ code: 'usersexbit' }); $('#PartyFaceNo').lrDataItemSelect({ code: 'BCdPartyFace' }); - $('#HealthStatusNo').lrDataSourceSelect({ code: 'BCdHealthStatus', value: 'healthstatusno', text: 'healthstatus' }); + $('#HealthStatusNo').lrDataItemSelect({ code: 'BCdHealthStatus' }); $('#Photo').lrUploader(); $('#FamilyOriginNo').lrDataItemSelect({ code: 'BCdFamilyOrigin' }); $('#OverseasChineseNo').lrDataSourceSelect({ code: 'BCdOverseasChinese', value: 'overseaschineseno', text: 'overseaschinesename' }); 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 58d6a7cf8..26b137980 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 @@ -401,12 +401,11 @@ var bootstrap = function ($, learun) { { label: "健康状况", name: "HealthStatusNo", width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) { - learun.clientdata.getAsync('custmerData', { - url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BCdHealthStatus', + learun.clientdata.getAsync('dataItem', { key: value, - keyId: 'healthstatusno', + code: 'BCdHealthStatus', callback: function (_data) { - callback(_data['healthstatus']); + callback(_data.text); } }); } @@ -565,12 +564,11 @@ var bootstrap = function ($, learun) { { label: "成员1健康状况", name: "OneHealthStatus", width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) { - learun.clientdata.getAsync('custmerData', { - url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BCdHealthStatus', + learun.clientdata.getAsync('dataItem', { key: value, - keyId: 'healthstatusno', + code: 'BCdHealthStatus', callback: function (_data) { - callback(_data['healthstatus']); + callback(_data.text); } }); } @@ -642,12 +640,11 @@ var bootstrap = function ($, learun) { { label: "成员2健康状况", name: "TwoHealthStatus", width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) { - learun.clientdata.getAsync('custmerData', { - url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BCdHealthStatus', + learun.clientdata.getAsync('dataItem', { key: value, - keyId: 'healthstatusno', + code: 'BCdHealthStatus', callback: function (_data) { - callback(_data['healthstatus']); + callback(_data.text); } }); } diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/UserCenter/Index.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/UserCenter/Index.cshtml index 40d97a188..66b798321 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 @@ -300,13 +300,11 @@ }, healthStatusNo: function (value) { var result; - top.learun.clientdata.getAsync('custmerData', { - sync: true, - url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BCdHealthStatus', + top.learun.clientdata.getAsync('dataItem', { key: value, - keyId: 'healthstatusno', + code: 'BCdHealthStatus', callback: function (_data) { - result = _data.healthstatus; + result = _data.text; } }); @@ -523,16 +521,13 @@ }, healthStatusNo: function (value) { var result; - top.learun.clientdata.getAsync('custmerData', { - sync: true, - url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BCdHealthStatus', + top.learun.clientdata.getAsync('dataItem', { key: value, - keyId: 'healthstatusno', + code: 'BCdHealthStatus', callback: function (_data) { - result = _data.healthstatus; + result = _data.text; } }); - return result; }, deptNo: function (value) { diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/UserCenter/IndexForDC.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/UserCenter/IndexForDC.cshtml index 57c4baf99..a3936e916 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/UserCenter/IndexForDC.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/UserCenter/IndexForDC.cshtml @@ -300,16 +300,13 @@ }, healthStatusNo: function (value) { var result; - top.learun.clientdata.getAsync('custmerData', { - sync: true, - url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BCdHealthStatus', + top.learun.clientdata.getAsync('dataItem', { key: value, - keyId: 'healthstatusno', + code: 'BCdHealthStatus', callback: function (_data) { - result = _data.healthstatus; + result = _data.text; } }); - return result; }, deptNo: function (value) { @@ -531,16 +528,13 @@ }, healthStatusNo: function (value) { var result; - top.learun.clientdata.getAsync('custmerData', { - sync: true, - url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BCdHealthStatus', + top.learun.clientdata.getAsync('dataItem', { key: value, - keyId: 'healthstatusno', + code: 'BCdHealthStatus', callback: function (_data) { - result = _data.healthstatus; + result = _data.text; } }); - return result; }, deptNo: function (value) { 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 f005a02a3..ad6642b33 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 @@ -286,16 +286,13 @@ }, healthStatusNo: function (value) { var result; - top.learun.clientdata.getAsync('custmerData', { - sync: true, - url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BCdHealthStatus', + top.learun.clientdata.getAsync('dataItem', { key: value, - keyId: 'healthstatusno', + code: 'BCdHealthStatus', callback: function (_data) { - result = _data.healthstatus; + result = _data.text; } }); - return result; }, deptNo: function (value) { @@ -572,16 +569,13 @@ }, healthStatusNo: function (value) { var result; - top.learun.clientdata.getAsync('custmerData', { - sync: true, - url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BCdHealthStatus', + top.learun.clientdata.getAsync('dataItem', { key: value, - keyId: 'healthstatusno', + code: 'BCdHealthStatus', callback: function (_data) { - result = _data.healthstatus; + result = _data.text; } }); - return result; }, deptNo: function (value) {