家庭出身 BCdFamilyOrigin改为字典

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

@@ -123,7 +123,7 @@ var bootstrap = function ($, learun) {
             //初始学历
             $('#CultureDegreeNo').lrDataItemSelect({ code: 'CollegeType', allowSearch: true });
             $('#DegreeNo').lrDataItemSelect({ code: 'BCdDegree', allowSearch: true });
-            $('#FamilyOriginNo').lrDataSourceSelect({ code: 'BCdFamilyOrigin', value: 'familyoriginno', text: 'familyorigin' });
+            $('#FamilyOriginNo').lrDataItemSelect({ code: 'BCdFamilyOrigin', allowSearch: true });
             $('#SubjectSpeciesNo').lrDataSourceSelect({ code: 'BCdSubjectSpecies', value: 'subjectspeciesno', text: 'subjectspecies' });
             $('#ForeignLanguageNo').lrDataSourceSelect({ code: 'BCdForeignLanguage', value: 'foreignlanguageno', text: 'foreignlanguagename' });
             $('#EmpSortNo').lrDataItemSelect({ code: 'jsgw' });

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

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

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

@@ -71,7 +71,7 @@ var bootstrap = function ($, learun) {
             $('#HealthStatusNo').lrDataSourceSelect({ code: 'BCdHealthStatus',value: 'healthstatusno',text: 'healthstatus' });
             $('#CultureDegreeNo').lrDataSourceSelect({ code: 'BCdCultureDegree',value: 'culturedegreeno',text: 'culturedegree' });
             $('#DegreeNo').lrDataItemSelect({ code: 'BCdDegree' });
-            $('#FamilyOriginNo').lrDataSourceSelect({ code: 'BCdFamilyOrigin',value: 'familyoriginno',text: 'familyorigin' });
+            $('#FamilyOriginNo').lrDataItemSelect({ code: 'BCdFamilyOrigin' });
             $('#SubjectSpeciesNo').lrDataSourceSelect({ code: 'BCdSubjectSpecies',value: 'subjectspeciesno',text: 'subjectspecies' });
             $('#ForeignLanguageNo').lrDataSourceSelect({ code: 'BCdForeignLanguage',value: 'foreignlanguageno',text: 'foreignlanguagename' });
             $('#EmpSortNo').lrDataItemSelect({ code: 'EmpSort' });

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

@@ -527,12 +527,11 @@ var bootstrap = function ($, learun) {
                     {
                         label: "家庭出身", name: "FamilyOriginNo", width: 100, align: "left",
                         formatterAsync: function (callback, value, row, op, $cell) {
-                            learun.clientdata.getAsync('custmerData', {
-                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BCdFamilyOrigin',
+                            learun.clientdata.getAsync('dataItem', {
                                 key: value,
-                                keyId: 'familyoriginno',
+                                code: 'BCdFamilyOrigin',
                                 callback: function (_data) {
-                                    callback(_data['familyorigin']);
+                                    callback(_data.text);
                                 }
                             });
                         }

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

@@ -109,7 +109,7 @@ var bootstrap = function ($, learun) {
             $('#PartyFaceNo').lrDataItemSelect({ code: 'BCdPartyFace' });
             $('#HealthStatusNo').lrDataSourceSelect({ code: 'BCdHealthStatus', value: 'healthstatusno', text: 'healthstatus' });
             $('#Photo').lrUploader();
-            $('#FamilyOriginNo').lrDataSourceSelect({ code: 'BCdFamilyOrigin', value: 'familyoriginno', text: 'familyorigin' });
+            $('#FamilyOriginNo').lrDataItemSelect({ code: 'BCdFamilyOrigin' });
             $('#OverseasChineseNo').lrDataSourceSelect({ code: 'BCdOverseasChinese', value: 'overseaschineseno', text: 'overseaschinesename' });
             $('#GraduateNo').lrDataItemSelect({ code: 'CollegeType' });
             $('#EduSystem').lrDataItemSelect({ code: 'EduSystem' });

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/FormOfDC.js

@@ -109,7 +109,7 @@ var bootstrap = function ($, learun) {
             $('#PartyFaceNo').lrDataItemSelect({ code: 'BCdPartyFace' });
             $('#HealthStatusNo').lrDataSourceSelect({ code: 'BCdHealthStatus', value: 'healthstatusno', text: 'healthstatus' });
             $('#Photo').lrUploader();
-            $('#FamilyOriginNo').lrDataSourceSelect({ code: 'BCdFamilyOrigin', value: 'familyoriginno', text: 'familyorigin' });
+            $('#FamilyOriginNo').lrDataItemSelect({ code: 'BCdFamilyOrigin' });
             $('#OverseasChineseNo').lrDataSourceSelect({ code: 'BCdOverseasChinese', value: 'overseaschineseno', text: 'overseaschinesename' });
             $('#GraduateNo').lrDataItemSelect({ code: 'CollegeType' });
             $('#EduSystem').lrDataItemSelect({ code: 'EduSystem' });

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

@@ -68,7 +68,7 @@ var bootstrap = function ($, learun) {
             $('#PartyFaceNo').lrDataItemSelect({ code: 'BCdPartyFace' });
             $('#HealthStatusNo').lrDataSourceSelect({ code: 'BCdHealthStatus', value: 'healthstatusno', text: 'healthstatus' });
             $('#Photo').lrUploader();
-            $('#FamilyOriginNo').lrDataSourceSelect({ code: 'BCdFamilyOrigin', value: 'familyoriginno', text: 'familyorigin' });
+            $('#FamilyOriginNo').lrDataItemSelect({ code: 'BCdFamilyOrigin' });
             $('#OverseasChineseNo').lrDataSourceSelect({ code: 'BCdOverseasChinese', value: 'overseaschineseno', text: 'overseaschinesename' });
             $('#GraduateNo').lrDataItemSelect({ code: 'CollegeType' });
             $('#DeptNo').lrselect({

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Accommodation/Room.cshtml

@@ -288,13 +288,11 @@
                 },
                 filter_BCdFamilyOrigin: function (value) {
                     var result;
-                    top.learun.clientdata.getAsync('custmerData', {
-                        sync: true,
-                        url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BCdFamilyOrigin',
+                    top.learun.clientdata.getAsync('dataItem', {
                         key: value,
-                        keyId: 'familyoriginno',
+                        code: 'BCdFamilyOrigin',
                         callback: function (_data) {
-                            result = _data['familyorigin'];
+                            result = _data.text;
                         }
                     });
                     return result;

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

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

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

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

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

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