Merge branch '塔里木分支' of http://123.57.209.16:3000/bjquanjiang/DigitalScholl into 塔里木分支

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

@@ -231,7 +231,7 @@
                         <span id="F_DepartmentId"></span>
                     </div>
                 </div>
-                <div class="rowx">
+                @*<div class="rowx">
                     <div class="col-xs-4 lr-form-item" data-table="EmpInfo">
                         <div class="lr-form-item-titles">系部：</div>
                         <span id="DeptNo"></span>
@@ -244,8 +244,8 @@
                         <div class="lr-form-item-titles">岗位名称：</div>
                         <span id="TitleOfTechPostNo"></span>
                     </div>
-                </div>
-                <div class="rowx">
+                </div>*@
+                @*<div class="rowx">
                     <div class="col-xs-4 lr-form-item" data-table="EmpInfo">
                         <div class="lr-form-item-titles">岗位职级：</div>
                         <span id="PostRank"></span>
@@ -258,7 +258,7 @@
                         <div class="lr-form-item-titles">聘任时间：</div>
                         <span id="InSchoolDate"></span>
                     </div>
-                </div>
+                </div>*@
                 <div class="rowx">
                     <div class="col-xs-4 lr-form-item" data-table="EmpInfo">
                         <div class="lr-form-item-titles">编制类别：</div>
@@ -269,11 +269,15 @@
                         <span id="WorkDate"></span>
                     </div>
                     <div class="col-xs-4 lr-form-item" data-table="EmpInfo">
+                        <div class="lr-form-item-titles">进入教育系统时间：</div>
+                        <span id="EducationalDate"></span>
+                    </div>
+                    @*<div class="col-xs-4 lr-form-item" data-table="EmpInfo">
                         <div class="lr-form-item-titles">工龄偏移量(月)：</div>
                         <span id="WorkOffset"></span>
-                    </div>
+                    </div>*@
                 </div>
-                <div class="rowx">
+                @*<div class="rowx">
                     <div class="col-xs-4 lr-form-item" data-table="EmpInfo">
                         <div class="lr-form-item-titles">工龄(减去偏移量)：</div>
                         <span id="WorkHours"></span>
@@ -286,22 +290,19 @@
                         <div class="lr-form-item-titles">集团龄偏移量(月)：</div>
                         <span id="GroupOffset"></span>
                     </div>
-                </div>
-                <div class="rowx">
+                </div>*@
+                @*<div class="rowx">
                     <div class="col-xs-4 lr-form-item" data-table="EmpInfo">
                         <div class="lr-form-item-titles">集团龄(减去偏移量)：</div>
                         <span id="GroupHours"></span>
                     </div>
-                    <div class="col-xs-4 lr-form-item" data-table="EmpInfo">
-                        <div class="lr-form-item-titles">进入教育系统时间：</div>
-                        <span id="EducationalDate"></span>
-                    </div>
+                
                     <div class="col-xs-4 lr-form-item" data-table="EmpInfo">
                         <div class="lr-form-item-titles">教龄偏移量(月)：</div>
                         <span id="EducationalOffset"></span>
                     </div>
-                </div>
-                <div class="rowx">
+                </div>*@
+                @*<div class="rowx">
                     <div class="col-xs-4 lr-form-item" data-table="EmpInfo">
                         <div class="lr-form-item-titles">教龄(减去偏移量)：</div>
                         <span id="EducationalHours"></span>
@@ -314,8 +315,8 @@
                         <div class="lr-form-item-titles">校龄偏移量(月)：</div>
                         <span id="SchoolOffset"></span>
                     </div>
-                </div>
-                <div class="rowx">
+                </div>*@
+                @*<div class="rowx">
                     <div class="col-xs-4 lr-form-item" data-table="EmpInfo">
                         <div class="lr-form-item-titles">校龄(减去偏移量)：</div>
                         <span id="SchoolHours"></span>
@@ -328,11 +329,15 @@
                         <div class="lr-form-item-titles">转正时间：</div>
                         <span id="FormalTime"></span>
                     </div>
-                </div>
+                </div>*@
                 <div class="rowx">
-                    <div class="col-xs-4 lr-form-item" data-table="EmpInfo">
+                    @*<div class="col-xs-4 lr-form-item" data-table="EmpInfo">
                         <div class="lr-form-item-titles">从教三十年表彰年度：</div>
                         <span id="CommendationYear"></span>
+                    </div>*@
+                    <div class="col-xs-4 lr-form-item" data-table="EmpInfo">
+                        <div class="lr-form-item-titles">来校时间：</div>
+                        <span id="SchoolDate"></span>
                     </div>
                 </div>
                 <div class="rowx">
@@ -363,10 +368,10 @@
                         <div class="lr-form-item-titles">初始学历：</div>
                         <span id="CultureDegreeNo"></span>
                     </div>
-                    <div class="col-xs-4 lr-form-item" data-table="EmpInfo">
+                    @*<div class="col-xs-4 lr-form-item" data-table="EmpInfo">
                         <div class="lr-form-item-titles">初始学历获取方式：</div>
                         <span id="ObtainWay"></span>
-                    </div>
+                    </div>*@
                 </div>
                 <div class="rowx">
                     <div class="col-xs-4 lr-form-item" data-table="EmpInfo">

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

@@ -7,12 +7,12 @@
 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', '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', '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 colDataItemArr = ['OverseasChineseNo', 'FamilyOriginNo', 'HealthStatusNo', 'PartyFaceNo', 'NationalityNo', 'GenderNo', 'IsInActiveStatus', 'CompilationCategory', 'HighestRecord', 'ObtainWayOfHighestRecord', 'CultureDegreeNo', 'DegreeNo', 'ObtainWayOfHighestDegree', 'InitialDegree', 'ObtainWayOfInitialDegree', 'JobRank', 'WorkLevel', 'EmpFullTimeNo', 'IsHasLesson', 'SubjectSpeciesNo','ForeignLanguageNo'];
+var colDataItemCode = ['BCdOverseasChinese', 'BCdFamilyOrigin', 'BCdHealthStatus', 'PolityStatus', 'National', 'usersexbit', 'JobStatus', 'CompilationCategory', 'RecordInSchool', 'ObtainWayOfDegree', 'RecordInSchool', 'DegreeInSchool', 'ObtainWayOfDegree', 'DegreeInSchool', 'ObtainWayOfDegree', 'TechnicalPost', 'TechnicalLevelOfWorker', 'EmpFullTime', 'YesOrNoBit', 'BCdSubjectSpecies','BCdForeignLanguage'];
+var colDataSourceArr = [  'F_CompanyId', 'F_DepartmentId'];
+var colDataSourceCode = ['company', 'classdata'];
+var colDataSourceValue = [ 'f_companyid', 'f_departmentid'];
+var colDataSourceText = ['f_fullname', 'f_fullname'];
 var bootstrap = function ($, learun) {
     "use strict";
     var ue;
@@ -43,11 +43,7 @@ var bootstrap = function ($, learun) {
                 $("#GraduateSchoolName").parent().hide();
                 $("#SubjectSpeciesNo").parent().hide();
                 $("#ForeignLanguageNo").parent().hide();
-                $("#EmpSortNo").parent().hide();
                 $("#EmpFullTimeNo").parent().hide();
-                $("#DeptNo").parent().hide();
-                $("#TitleOfTechPostNo").parent().hide();
-                $("#InSchoolDate").parent().hide();
                 $("#resume").parent().hide();
                 $("#Photo").parent().hide();
             }

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

@@ -236,7 +236,7 @@
                                         var result;
                                         top.learun.clientdata.getAsync('dataItem', {
                                             key: value,
-                                            code: 'BCdPartyFace',
+                                            code: 'PolityStatus',
                                             callback: function (_data) {
                                                 result = _data.text;
                                             }
@@ -374,7 +374,7 @@
                                             <li>联系电话 : {{teacherInfo.mobile}}</li>
                                             <li>校 &nbsp; &nbsp; &nbsp; 区 : {{baseInfo.companyId | company}}</li>
                                             <li>教职工类别 : {{teacherInfo.EmpSortNo | empSortNo}}</li>
-                                            <li>聘任职称1 : {{teacherInfo.TitleOfTechPostNo | titleOfTechPostNo}}</li>
+                                            <li>聘任职称: {{teacherInfo.TitleOfTechPostNo | titleOfTechPostNo}}</li>
                                         </ul>
                                     </div>
                                 </div>
@@ -491,7 +491,7 @@
                                         var result;
                                         top.learun.clientdata.getAsync('dataItem', {
                                             key: value,
-                                            code: 'BCdPartyFace',
+                                            code: 'PolityStatus',
                                             callback: function (_data) {
                                                 result = _data.text;
                                             }
@@ -606,13 +606,11 @@
                                     },
                                     cultureDegreeNo: function (value) {
                                         var result;
-                                        top.learun.clientdata.getAsync('custmerData', {
-                                            sync: true,
-                                            url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BCdCultureDegree',
+                                        top.learun.clientdata.getAsync('dataItem', {
                                             key: value,
-                                            keyId: 'culturedegreeno',
+                                            code: 'RecordInSchool',
                                             callback: function (_data) {
-                                                result = _data['culturedegree'];
+                                                result = _data.text;
                                             }
                                         });
                                         return result;
@@ -621,7 +619,7 @@
                                         var result;
                                         top.learun.clientdata.getAsync('dataItem', {
                                             key: value,
-                                            code: 'BCdDegree',
+                                            code: 'DegreeInSchool',
                                             callback: function (_data) {
                                                 result = _data.text;
                                             }

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

@@ -222,7 +222,7 @@
                                     var result;
                                     top.learun.clientdata.getAsync('dataItem', {
                                         key: value,
-                                        code: 'BCdPartyFace',
+                                        code: 'PolityStatus',
                                         callback: function (_data) {
                                             result = _data.text;
                                         }
@@ -360,8 +360,8 @@
                                         <li>出生日期 : {{teacherInfo.Birthday | date}}</li>
                                         <li>联系电话 : {{teacherInfo.mobile}}</li>
                                         <li>校 &nbsp; &nbsp; &nbsp; 区 : {{baseInfo.companyId | company}}</li>
-                                        <li>岗位类别 : {{teacherInfo.EmpSortNo | jsgw}}</li>
-                                        <li>岗位职级 : {{teacherInfo.PostRank | titleOfTechPostNo}}</li>
+                                        @*<li>岗位类别 : {{teacherInfo.EmpSortNo | jsgw}}</li>
+                                        <li>岗位职级 : {{teacherInfo.PostRank | titleOfTechPostNo}}</li>*@
                                     </ul>
                                 </div>
                             </div>
@@ -395,28 +395,28 @@
                                     <ul class="userSec2List">
                                         <li>员工状态 : {{teacherInfo.IsInActiveStatus | isInActiveStatus}}  </li>
                                         <li>部门 : {{teacherInfo.F_DepartmentId | departmentId}}</li>
-                                        <li>系部 : {{teacherInfo.DeptNo | deptNo}} </li>
+                                        @*<li>系部 : {{teacherInfo.DeptNo | deptNo}} </li>
                                         <li>岗位类别 : {{teacherInfo.EmpSortNo | jsgw}}  </li>
                                         <li>岗位名称 : {{teacherInfo.TitleOfTechPostNo}}  </li>
                                         <li>岗位职级 : {{teacherInfo.PostRank | titleOfTechPostNo}}  </li>
                                         <li>现聘工资级别 : {{teacherInfo.PositionLevel | positionLevel}}  </li>
-                                        <li>聘任时间 : {{teacherInfo.InSchoolDate | date}}  </li>
+                                        <li>聘任时间 : {{teacherInfo.InSchoolDate | date}}  </li>*@
                                         <li>编制类别 : {{teacherInfo.CompilationCategory | compilationCategory}}  </li>
-                                        <li>参加工作时间 : {{teacherInfo.AddWorkDate | date}}  </li>
+                                        @*<li>参加工作时间 : {{teacherInfo.AddWorkDate | date}}  </li>
                                         <li>工龄偏移量(月) : {{teacherInfo.AddWorkOffset}}  </li>
                                         <li>工龄(减去偏移量) : {{teacherInfo.AddWorkHours}}  </li>
                                         <li>进入集团时间 : {{teacherInfo.GroupDate | date}}  </li>
                                         <li>集团龄偏移量(月) : {{teacherInfo.GroupOffset}}  </li>
-                                        <li>集团龄(减去偏移量) : {{teacherInfo.GroupHours}}  </li>
+                                        <li>集团龄(减去偏移量) : {{teacherInfo.GroupHours}}  </li>*@
                                         <li>进入教育系统时间 : {{teacherInfo.EducationalDate | date}}  </li>
-                                        <li>教龄偏移量(月) : {{teacherInfo.EducationalOffset}}  </li>
-                                        <li>教龄(减去偏移量) : {{teacherInfo.EducationalHours}}  </li>
+                                        @*<li>教龄偏移量(月) : {{teacherInfo.EducationalOffset}}  </li>
+                                        <li>教龄(减去偏移量) : {{teacherInfo.EducationalHours}}  </li>*@
                                         <li>来校时间 : {{teacherInfo.SchoolDate | date}}  </li>
-                                        <li>校龄偏移量(月) : {{teacherInfo.SchoolOffset}}  </li>
+                                        @*<li>校龄偏移量(月) : {{teacherInfo.SchoolOffset}}  </li>
                                         <li>校龄(减去偏移量) : {{teacherInfo.SchoolHours}}  </li>
                                         <li>拟退休时间 : {{teacherInfo.FictitiousRetireTime | date}}  </li>
                                         <li>转正时间 : {{teacherInfo.FormalTime | date}}  </li>
-                                        <li>从教三十年表彰年度 : {{teacherInfo.CommendationYear}}  </li>
+                                        <li>从教三十年表彰年度 : {{teacherInfo.CommendationYear}}  </li>*@
 
                                     </ul>
                                 </div>
@@ -428,7 +428,7 @@
                                         <li>最高学历获取方式 : {{teacherInfo.ObtainWayOfHighestRecord | obtainWay}}  </li>
                                         <li>学制（最高学历） : {{teacherInfo.EducationalSystem}}  </li>
                                         <li>初始学历 : {{teacherInfo.CultureDegreeNo | cultureDegreeNo}}  </li>
-                                        <li>初始学历获取方式 : {{teacherInfo.ObtainWay | obtainWay}}</li>
+                                        @*<li>初始学历获取方式 : {{teacherInfo.ObtainWay | obtainWay}}</li>*@
                                         <li>最高学位 : {{teacherInfo.DegreeNo | degreeNo}}  </li>
                                         <li>最高学位取得时间 : {{teacherInfo.HighestDegreeGetTime | date}}  </li>
                                         <li>最高学位获取方式 : {{teacherInfo.ObtainWayOfHighestDegree | obtainWayOfDegree}}  </li>
@@ -540,7 +540,7 @@
                                     var result;
                                     top.learun.clientdata.getAsync('dataItem', {
                                         key: value,
-                                        code: 'BCdPartyFace',
+                                        code: 'PolityStatus',
                                         callback: function (_data) {
                                             result =_data.text;
                                         }
@@ -654,51 +654,49 @@
                                     return result;
                                 },
                                 cultureDegreeNo: function (value) {
-                                    var result;
-                                    top.learun.clientdata.getAsync('custmerData', {
-                                        sync: true,
-                                        url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BCdCultureDegree',
-                                        key: value,
-                                        keyId: 'culturedegreeno',
-                                        callback: function (_data) {
-                                            result = _data['culturedegree'];
-                                        }
-                                    });
-                                    return result;
-                                },
-                                degreeNo: function (value) {
                                     var result;
                                     top.learun.clientdata.getAsync('dataItem', {
                                         key: value,
-                                        code: 'BCdDegree',
+                                        code: 'RecordInSchool',
                                         callback: function (_data) {
                                             result = _data.text;
                                         }
                                     });
                                     return result;
                                 },
-                                jsgw: function (value) {
-                                    var result;
-                                    top.learun.clientdata.getAsync('dataItem', {
-                                        key: value,
-                                        code: 'jsgw',
-                                        callback: function (_data) {
-                                            result = _data.text;
-                                        }
-                                    });
-                                    return result;
-                                },
-                                titleOfTechPostNo: function (value) {
+                                degreeNo: function (value) {
                                     var result;
                                     top.learun.clientdata.getAsync('dataItem', {
                                         key: value,
-                                        code: 'BCdTitleOfTechPost',
+                                        code: 'DegreeInSchool',
                                         callback: function (_data) {
                                             result = _data.text;
                                         }
                                     });
                                     return result;
                                 },
+                                //jsgw: function (value) {
+                                //    var result;
+                                //    top.learun.clientdata.getAsync('dataItem', {
+                                //        key: value,
+                                //        code: 'jsgw',
+                                //        callback: function (_data) {
+                                //            result = _data.text;
+                                //        }
+                                //    });
+                                //    return result;
+                                //},
+                                //titleOfTechPostNo: function (value) {
+                                //    var result;
+                                //    top.learun.clientdata.getAsync('dataItem', {
+                                //        key: value,
+                                //        code: 'BCdTitleOfTechPost',
+                                //        callback: function (_data) {
+                                //            result = _data.text;
+                                //        }
+                                //    });
+                                //    return result;
+                                //},
                                 isInActiveStatus: function (value) {
                                     var result;
                                     top.learun.clientdata.getAsync('dataItem', {
@@ -710,33 +708,33 @@
                                     });
                                     return result;
                                 },
-                                positionLevel: function (value) {
-                                    var result;
-                                    top.learun.clientdata.getAsync('dataItem', {
-                                        key: value,
-                                        code: 'PositionLevel',
-                                        callback: function (_data) {
-                                            result = _data.text;
-                                        }
-                                    });
-                                    return result;
-                                },
-                                compilationCategory: function (value) {
-                                    var result;
-                                    top.learun.clientdata.getAsync('dataItem', {
-                                        key: value,
-                                        code: 'CompilationCategory',
-                                        callback: function (_data) {
-                                            result = _data.text;
-                                        }
-                                    });
-                                    return result;
-                                },
+                                //positionLevel: function (value) {
+                                //    var result;
+                                //    top.learun.clientdata.getAsync('dataItem', {
+                                //        key: value,
+                                //        code: 'PositionLevel',
+                                //        callback: function (_data) {
+                                //            result = _data.text;
+                                //        }
+                                //    });
+                                //    return result;
+                                //},
+                                //compilationCategory: function (value) {
+                                //    var result;
+                                //    top.learun.clientdata.getAsync('dataItem', {
+                                //        key: value,
+                                //        code: 'CompilationCategory',
+                                //        callback: function (_data) {
+                                //            result = _data.text;
+                                //        }
+                                //    });
+                                //    return result;
+                                //},
                                 obtainWay: function (value) {
                                     var result;
                                     top.learun.clientdata.getAsync('dataItem', {
                                         key: value,
-                                        code: 'ObtainWay',
+                                        code: 'ObtainWayOfDegree',
                                         callback: function (_data) {
                                             result = _data.text;
                                         }