学科门类数据BCdSubjectSpecies数据源改为数据字典

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Form.js

@@ -128,8 +128,8 @@ var bootstrap = function ($, learun) {
             $('#CultureDegreeNo').lrDataItemSelect({ code: 'CollegeType', allowSearch: true });
             $('#DegreeNo').lrDataItemSelect({ code: 'BCdDegree', allowSearch: true });
             $('#FamilyOriginNo').lrDataItemSelect({ code: 'BCdFamilyOrigin', allowSearch: true });
-            $('#SubjectSpeciesNo').lrDataSourceSelect({ code: 'BCdSubjectSpecies', value: 'subjectspeciesno', text: 'subjectspecies' });
-            $('#ForeignLanguageNo').lrDataSourceSelect({ code: 'BCdForeignLanguage', value: 'foreignlanguageno', text: 'foreignlanguagename' });
+            $('#SubjectSpeciesNo').lrDataItemSelect({ code: 'BCdSubjectSpecies', allowSearch: true });
+            $('#ForeignLanguageNo').lrDataItemSelect({ code: 'BCdForeignLanguage', allowSearch: true });
             $('#EmpSortNo').lrDataItemSelect({ code: 'jsgw' });
             $('#EmpFullTimeNo').lrDataItemSelect({ code: 'EmpFullTime' });
             $('#ObtainWay').lrDataItemSelect({ code: 'ObtainWay' });

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', 'BCdNationality', 'BCdDegree', 'BCdFamilyOrigin', 'BCdForeignLanguage', 'BCdOverseasChinese','BCdHealthStatus','usersexbit', 'JobStatus', 'jsgw', 'PositionLevel', 'CompilationCategory', 'ObtainWay', 'ObtainWay', 'ObtainWayOfDegree', 'ObtainWayOfDegree', 'TechnicalPost', 'TechnicalLevelOfWorker', 'EmpFullTime', 'YesOrNoBit'];
+var colDataItemCode = ['BCdPartyFace', 'BCdNationality', 'BCdDegree', 'BCdFamilyOrigin', 'BCdForeignLanguage', 'BCdSubjectSpecies', 'BCdOverseasChinese','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'];

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/FormView.cshtml

@@ -201,13 +201,12 @@
                 },
                 subjectSpeciesNo: function (value) {
                     var result;
-                    top.learun.clientdata.getAsync('custmerData', {
-                        url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BCdSubjectSpecies',
+                    top.learun.clientdata.getAsync('dataItem', {
                         key: value,
-                        keyId: 'subjectspeciesno',
+                        code: 'BCdSubjectSpecies',
                         callback: function (_data) {
-                            result = _data.subjectspecies;
-                        }.bind(this)
+                            result = _data.text;
+                        }
                     });
                     return result;
                 },

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/FormView.js

@@ -72,8 +72,8 @@ var bootstrap = function ($, learun) {
             $('#CultureDegreeNo').lrDataSourceSelect({ code: 'BCdCultureDegree',value: 'culturedegreeno',text: 'culturedegree' });
             $('#DegreeNo').lrDataItemSelect({ code: 'BCdDegree' });
             $('#FamilyOriginNo').lrDataItemSelect({ code: 'BCdFamilyOrigin' });
-            $('#SubjectSpeciesNo').lrDataSourceSelect({ code: 'BCdSubjectSpecies',value: 'subjectspeciesno',text: 'subjectspecies' });
-            $('#ForeignLanguageNo').lrDataSourceSelect({ code: 'BCdForeignLanguage',value: 'foreignlanguageno',text: 'foreignlanguagename' });
+            $('#SubjectSpeciesNo').lrDataItemSelect({ code: 'BCdSubjectSpecies' });
+            $('#ForeignLanguageNo').lrDataItemSelect({ code: 'BCdForeignLanguage' });
             $('#EmpSortNo').lrDataItemSelect({ code: 'EmpSort' });
             $('#EmpFullTimeNo').lrDataItemSelect({ code: 'EmpFullTime' });
             $('#DeptNo').lrDataSourceSelect({ code: 'CdDeptInfo', value: 'deptno', text: 'deptname' });$('#TitleOfTechPostNo').lrDataItemSelect({ code: 'BCdTitleOfTechPost', allowSearch: true });

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Index.js

@@ -582,12 +582,11 @@ var bootstrap = function ($, learun) {
                     {
                         label: "学科门类", name: "SubjectSpeciesNo", width: 100, align: "left",
                         formatterAsync: function (callback, value, row, op, $cell) {
-                            learun.clientdata.getAsync('custmerData', {
-                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BCdSubjectSpecies',
+                            learun.clientdata.getAsync('dataItem', {
                                 key: value,
-                                keyId: 'subjectspeciesno',
+                                code: 'BCdSubjectSpecies',
                                 callback: function (_data) {
-                                    callback(_data['subjectspecies']);
+                                    callback(_data.text);
                                 }
                             });
                         }

Learun.Framework.Ultimate V7/Learun.Application.Web/Views/UserCenter/Index.cshtml

@@ -534,13 +534,12 @@
                                     },
                                     subjectSpeciesNo: function (value) {
                                         var result;
-                                        top.learun.clientdata.getAsync('custmerData', {
-                                            url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BCdSubjectSpecies',
+                                        top.learun.clientdata.getAsync('dataItem', {
                                             key: value,
-                                            keyId: 'subjectspeciesno',
+                                            code: 'BCdSubjectSpecies',
                                             callback: function (_data) {
-                                                result = _data.subjectspecies;
-                                            }.bind(this)
+                                                result = _data.text;
+                                            }
                                         });
                                         return result;
                                     },

Learun.Framework.Ultimate V7/Learun.Application.Web/Views/UserCenter/IndexForDC.cshtml

@@ -544,13 +544,12 @@
                                     },
                                     subjectSpeciesNo: function (value) {
                                         var result;
-                                        top.learun.clientdata.getAsync('custmerData', {
-                                            url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BCdSubjectSpecies',
+                                        top.learun.clientdata.getAsync('dataItem', {
                                             key: value,
-                                            keyId: 'subjectspeciesno',
+                                            code: 'BCdSubjectSpecies',
                                             callback: function (_data) {
-                                                result = _data.subjectspecies;
-                                            }.bind(this)
+                                                result = _data.text;
+                                            }
                                         });
                                         return result;
                                     },

Learun.Framework.Ultimate V7/Learun.Application.Web/Views/UserCenter/IndexInTeacher.cshtml

@@ -583,13 +583,12 @@
                                 },
                                 subjectSpeciesNo: function (value) {
                                     var result;
-                                    top.learun.clientdata.getAsync('custmerData', {
-                                        url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BCdSubjectSpecies',
+                                    top.learun.clientdata.getAsync('dataItem', {
                                         key: value,
-                                        keyId: 'subjectspeciesno',
+                                        code: 'BCdSubjectSpecies',
                                         callback: function (_data) {
-                                            result = _data.subjectspecies;
-                                        }.bind(this)
+                                            result = _data.text;
+                                        }
                                     });
                                     return result;
                                 },