学位改为字典

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

@@ -124,8 +124,9 @@ var bootstrap = function ($, learun) {
             $('#RegionNo').lrselect();
             $('#OverseasChineseNo').lrDataSourceSelect({ code: 'BCdOverseasChinese', value: 'overseaschineseno', text: 'overseaschinesename' });
             $('#HealthStatusNo').lrDataSourceSelect({ code: 'BCdHealthStatus', value: 'healthstatusno', text: 'healthstatus' });
-            $('#CultureDegreeNo').lrDataSourceSelect({ code: 'BCdCultureDegree', value: 'culturedegreeno', text: 'culturedegree' });
-            $('#DegreeNo').lrDataSourceSelect({ code: 'BCdDegree', value: 'degreeno', text: 'degreename' });
+            //初始学历
+            $('#CultureDegreeNo').lrDataItemSelect({ code: 'CollegeType', allowSearch: true });
+            $('#DegreeNo').lrDataItemSelect({ code: 'BCdDegree', allowSearch: true });
             $('#FamilyOriginNo').lrDataSourceSelect({ code: 'BCdFamilyOrigin', value: 'familyoriginno', text: 'familyorigin' });
             $('#SubjectSpeciesNo').lrDataSourceSelect({ code: 'BCdSubjectSpecies', value: 'subjectspeciesno', text: 'subjectspecies' });
             $('#ForeignLanguageNo').lrDataSourceSelect({ code: 'BCdForeignLanguage', value: 'foreignlanguageno', text: 'foreignlanguagename' });
@@ -137,7 +138,7 @@ var bootstrap = function ($, learun) {
             $('#Photo').lrUploader();
             $('#HighestRecord').lrDataSourceSelect({ code: 'BCdCultureDegree', value: 'culturedegreeno', text: 'culturedegree' });
             $('#ObtainWayOfHighestRecord').lrDataItemSelect({ code: 'ObtainWay' });
-            $('#InitialDegree').lrDataSourceSelect({ code: 'BCdDegree', value: 'degreeno', text: 'degreename' });
+            $('#InitialDegree').lrDataItemSelect({ code: 'BCdDegree', allowSearch: true });
             $('#ObtainWayOfInitialDegree').lrDataItemSelect({ code: 'ObtainWayOfDegree' });
             $('#ObtainWayOfHighestDegree').lrDataItemSelect({ code: 'ObtainWayOfDegree' });
             $('#PositionLevel').lrDataItemSelect({ code: 'PositionLevel' });

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

@@ -323,13 +323,13 @@
                 },
             });
             $.ajax({
-                url: "/LR_SystemModule/DataSource/GetMap?code=" + "BCdDegree",
+                url: "/EducationalAdministration/EmpInfoEnternal/GetDataItemMap?code=" + "BCdDegree",
                 async: false,
                 success: function (msg) {
-                    var companys = $.parseJSON(msg).data.data;
+                    var companys = $.parseJSON(msg).data;
                     var str = '<option value="">请选择</option>';
                     $.each(companys, function (i, item) {
-                        str += '<option value="' + item.degreeno + '">' + item.degreename + '</option>'
+                        str += '<option value="' + item["F_ItemValue"] + '">' + item["F_ItemName"] + '</option>'
                     })
                     $("#DegreeNo").html(str);
                 },

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

@@ -10,7 +10,7 @@ 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', 'BCdSubjectSpecies', 'BCdOverseasChinese', 'BCdHealthStatus', 'BCdTitleOfTechPost','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', 'BCdDegree', 'BCdSubjectSpecies', 'BCdForeignLanguage'];
+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'];
 var colDataSourceText = ['partyface', 'nationality', 'healthstatus', 'familyorigin', 'overseaschinesename', 'f_fullname', 'f_fullname', 'deptname', 'titleoftechpost', 'culturedegree', 'culturedegree', 'degreename', 'degreename', 'subjectspecies', 'foreignlanguagename'];
 var bootstrap = function ($, learun) {

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

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

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

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

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

@@ -60,6 +60,35 @@ var bootstrap = function ($, learun) {
             //是否审核
             $('#CheckMark').lrDataItemSelect({ code: 'YesOrNoInt' });
             //学位
+            $('#DegreeNo').lrDataItemSelect({ code: 'BCdDegree' });
+            
+            // 部门选择
+            $('#F_DepartmentId').lrselect({
+                type: 'tree',
+                // 是否允许搜索
+                allowSearch: true,
+                // 访问数据接口地址
+                url: top.$.rootUrl + '/LR_OrganizationModule/Department/GetTreeNoCheck',
+                // 访问数据接口参数
+            });
+            //职工状态
+            $('#IsInActiveStatus').lrDataItemSelect({ code: 'JobStatus' });
+            //编制类别
+            $('#CompilationCategory').lrDataItemSelect({
+                code: 'CompilationCategory', select: function (item) {
+                    if (!!item && item.id == "02") {//编外
+                        //用工类型
+                        $('#EmployType').lrselectRefresh({
+                            url: '/LR_SystemModule/DataItem/GetDetailList',
+                            param: { itemCode: 'EmployType' },
+                            value: 'F_ItemValue',
+                            text: 'F_ItemName'
+                        });
+                    } else {
+                        $('#EmployType').lrselectRefresh({
+                            url: "",
+                            data: []
+                        });
             $('#DegreeNo').lrDataSourceSelect({ code: 'BCdDegree', value: 'degreeno', text: 'degreename' });
             //职称
             $('#ProfessionalTitle').lrDataItemSelect({ code: 'jszc' });
@@ -476,12 +505,11 @@ var bootstrap = function ($, learun) {
                     {
                         label: "最高学位", name: "DegreeNo", width: 100, align: "left",
                         formatterAsync: function (callback, value, row, op, $cell) {
-                            learun.clientdata.getAsync('custmerData', {
-                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BCdDegree',
+                            learun.clientdata.getAsync('dataItem', {
                                 key: value,
-                                keyId: 'degreeno',
+                                code: 'BCdDegree',
                                 callback: function (_data) {
-                                    callback(_data['degreename']);
+                                    callback(_data.text);
                                 }
                             });
                         }

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfoEnternal/FormAdd.cshtml

@@ -350,13 +350,13 @@
                 },
             });
             $.ajax({
-                url: "/EducationalAdministration/EmpInfoEnternal/GetMap?code=" + "BCdDegree",
+                url: "/EducationalAdministration/EmpInfoEnternal/GetDataItemMap?code=" + "BCdDegree",
                 async: false,
                 success: function (msg) {
-                    var companys = $.parseJSON(msg).data.data;
+                    var msgObject = $.parseJSON(msg);
                     var str = '<option value="">请选择</option>';
-                    $.each(companys, function (i, item) {
-                        str += '<option value="' + item.degreeno + '">' + item.degreename + '</option>'
+                    $.each(msgObject.data, function (i, item) {
+                        str += '<option value="' + item["F_ItemValue"] + '">' + item["F_ItemName"] + '</option>'
                     })
                     $("#DegreeNo").html(str);
                 },

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

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

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

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

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

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

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Excel/Import/ExcelImportBLL.cs

@@ -844,7 +844,7 @@ namespace Learun.Application.Excel
                         empinfoEntity.HighestRecord = dataSourceIBLL.GetKeyByValue("BCdCultureDegree", "culturedegree", dr["最高学历"].ToString(), "culturedegreeno");
                         empinfoEntity.HighestRecordGetTime = Convert.ToDateTime(dr["最高学历取得时间"].ToString());
                         empinfoEntity.EducationalSystem = dr["学制（最高学历）"].ToString();
-                        empinfoEntity.DegreeNo = dataSourceIBLL.GetKeyByValue("BCdDegree", "degreename", dr["最高学位"].ToString(), "degreeno");
+                        empinfoEntity.DegreeNo = FindDataItemValue(dataItemIBLL.GetDetailList("BCdDegree"), dr["最高学位"].ToString(), "最高学位", false);
                         empinfoEntity.HighestDegreeGetTime = dr["最高学位取得时间"].ToString();
                         empinfoEntity.JobRank = FindDataItemValue(dataItemIBLL.GetDetailList("TechnicalPost"), dr["专业技术职务等级"].ToString(), "专业技术职务等级", false);
                         empinfoEntity.JobTitle = dr["专业技术职务名称"].ToString();