教师信息下拉框绑定项更新为塔里木库内容

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

@@ -125,8 +125,8 @@ var bootstrap = function ($, learun) {
             $('#OverseasChineseNo').lrDataItemSelect({ code: 'BCdOverseasChinese', allowSearch: true });
             $('#HealthStatusNo').lrDataItemSelect({ code: 'BCdHealthStatus', allowSearch: true });
             //初始学历
-            $('#CultureDegreeNo').lrDataItemSelect({ code: 'CollegeType', allowSearch: true });
-            $('#DegreeNo').lrDataItemSelect({ code: 'BCdDegree', allowSearch: true });
+            $('#CultureDegreeNo').lrDataItemSelect({ code: 'RecordInSchool', allowSearch: true });
+            $('#DegreeNo').lrDataItemSelect({ code: 'DegreeInSchool', allowSearch: true });
             $('#FamilyOriginNo').lrDataItemSelect({ code: 'BCdFamilyOrigin', allowSearch: true });
             $('#SubjectSpeciesNo').lrDataItemSelect({ code: 'BCdSubjectSpecies', allowSearch: true });
             $('#ForeignLanguageNo').lrDataItemSelect({ code: 'BCdForeignLanguage', allowSearch: true });
@@ -137,11 +137,11 @@ var bootstrap = function ($, learun) {
             $('#PostRank').lrDataItemSelect({ code: 'BCdTitleOfTechPost', allowSearch: true });
             $('#Photo').lrUploader();
             //$('#HighestRecord').lrDataSourceSelect({ code: 'BCdCultureDegree', value: 'culturedegreeno', text: 'culturedegree' });
-            $('#HighestRecord').lrDataItemSelect({ code: 'HighestEducation'});
+            $('#HighestRecord').lrDataItemSelect({ code: 'RecordInSchool'});
 
             //$('#ObtainWayOfHighestRecord').lrDataItemSelect({ code: 'ObtainWay' });
-            $('#ObtainWayOfHighestRecord').lrDataItemSelect({ code: 'HighestEducationAcquisitionMode' });
-            $('#InitialDegree').lrDataSourceSelect({ code: 'BCdDegree', value: 'degreeno', text: 'degreename' });
+            $('#ObtainWayOfHighestRecord').lrDataItemSelect({ code: 'ObtainWayOfDegree' });
+            $('#InitialDegree').lrDataItemSelect({ code: 'DegreeInSchool'});
             $('#ObtainWayOfInitialDegree').lrDataItemSelect({ code: 'ObtainWayOfDegree' });
             $('#ObtainWayOfHighestDegree').lrDataItemSelect({ code: 'ObtainWayOfDegree' });
             //$('#PositionLevel').lrDataItemSelect({ code: 'PositionLevel' });

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

@@ -54,10 +54,6 @@
                                     <div class="lr-form-item-title">政治面貌</div>
                                     <div id="PartyFaceNo"></div>
                                 </div>
-                                <div class="col-xs-6 lr-form-item">
-                                    <div class="lr-form-item-title">文化程度</div>
-                                    <div id="HighestRecord"></div>
-                                </div>
                                 <div class="col-xs-6 lr-form-item">
                                     <div class="lr-form-item-title">人员身份</div>
                                     <div id="CompilationCategory"></div>

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

@@ -50,7 +50,7 @@ var bootstrap = function ($, learun) {
             //政治面貌
             $('#PartyFaceNo').lrDataItemSelect({ code: 'PolityStatus', allowSearch: true });
             //最高学历
-            $('#HighestRecord').lrDataItemSelect({ code: 'HighestEducation'});
+            //$('#HighestRecord').lrDataItemSelect({ code: 'HighestEducation'});
 
 
             //民族
@@ -60,7 +60,7 @@ var bootstrap = function ($, learun) {
             //是否审核
             $('#CheckMark').lrDataItemSelect({ code: 'YesOrNoInt' });
             //学位
-            $('#DegreeNo').lrDataItemSelect({ code: 'BCdDegree' });
+            $('#DegreeNo').lrDataItemSelect({ code: 'DegreeInSchool' });
             //职称
             $('#ProfessionalTitle').lrDataItemSelect({ code: 'jszc' });
 
@@ -496,7 +496,7 @@ var bootstrap = function ($, learun) {
                         formatterAsync: function (callback, value, row, op, $cell) {
                             learun.clientdata.getAsync('dataItem', {
                                 key: value,
-                                code: 'HighestEducation',
+                                code: 'RecordInSchool',
                                 callback: function (_data) {
                                     callback(_data.text);
                                 }
@@ -508,7 +508,7 @@ var bootstrap = function ($, learun) {
                         formatterAsync: function (callback, value, row, op, $cell) {
                             learun.clientdata.getAsync('dataItem', {
                                 key: value,
-                                code: 'BCdDegree',
+                                code: 'DegreeInSchool',
                                 callback: function (_data) {
                                     callback(_data.text);
                                 }

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/PM_EducationExperience/Form.cshtml

@@ -21,7 +21,7 @@
     </div>
     <div class="col-xs-12 lr-form-item"  data-table="PM_EducationExperience" >
         <div class="lr-form-item-title">学位</div>
-        <input id="AcademicDegree" type="text" class="form-control"  />
+        <div id="AcademicDegree"></div>
     </div>
     <div class="col-xs-12 lr-form-item"  data-table="PM_EducationExperience" >
         <div class="lr-form-item-title">学制</div>

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

@@ -16,7 +16,8 @@ var bootstrap = function ($, learun) {
             page.initData();
         },
         bind: function () {
-            $('#Education').lrDataItemSelect({ code: 'CollegeType' });
+            $('#Education').lrDataItemSelect({ code: 'RecordInSchool' });
+            $('#AcademicDegree').lrDataItemSelect({ code: 'DegreeInSchool' });
             $('#EducationalSystem').lrDataItemSelect({ code: 'EductionalSystme' });
         },
         initData: function () {

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

@@ -122,14 +122,25 @@ var bootstrap = function ($, learun) {
                         formatterAsync: function (callback, value, row, op, $cell) {
                             learun.clientdata.getAsync('dataItem', {
                                 key: value,
-                                code: 'CollegeType',
+                                code: 'RecordInSchool',
+                                callback: function (_data) {
+                                    callback(_data.text);
+                                }
+                            });
+                        }
+                    },
+                    {
+                        label: "学位", name: "AcademicDegree", width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('dataItem', {
+                                key: value,
+                                code: 'DegreeInSchool',
                                 callback: function (_data) {
                                     callback(_data.text);
                                 }
                             });
                         }
                     },
-                    { label: "学位", name: "AcademicDegree", width: 100, align: "left" },
                     {
                         label: "学制", name: "EducationalSystem", width: 100, align: "left",
                         formatterAsync: function (callback, value, row, op, $cell) {