调整教师信息

调整学生学籍信息

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

@@ -68,10 +68,18 @@
             <div class="lr-form-item-title">政治面貌</div>
             <div id="PartyFaceNo"></div>
         </div>
+        <div class="col-xs-4 lr-form-item" data-table="EmpInfo">
+            <div class="lr-form-item-title">婚姻状况</div>
+            <div id="Marital" isvalid="yes" checkexpession="NotNull"></div>
+        </div>
         <div class="col-xs-4 lr-form-item" data-table="EmpInfo">
             <div class="lr-form-item-title">入党(团)时间</div>
             <input id="JoinPartyTime" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ dateFmt:'yyyy-MM-dd',onpicked: function () { $('#JoinPartyTime').trigger('change'); } })" />
         </div>
+        <div class="col-xs-4 lr-form-item" data-table="EmpInfo">
+            <div class="lr-form-item-title">正式党员时间</div>
+            <input id="OfficialPartyTime" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ dateFmt:'yyyy-MM-dd',onpicked: function () { $('#JoinPartyTime').trigger('change'); } })" />
+        </div>
         <div class="col-xs-4 lr-form-item" data-table="EmpInfo">
             <div class="lr-form-item-title">联系电话<font face="宋体">*</font></div>
             <input id="mobile" type="text" class="form-control" isvalid="yes" checkexpession="MobileOrPhone" />
@@ -80,6 +88,10 @@
             <div class="lr-form-item-title">电子邮箱</div>
             <input id="EMail" type="text" class="form-control" isvalid="yes" checkexpession="EmailOrNull" />
         </div>
+        <div class="col-xs-4 lr-form-item" data-table="EmpInfo">
+            <div class="lr-form-item-title">档案号<font face="宋体">*</font></div>
+            <input id="FileNumber" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
+        </div>
         <div class="col-xs-4 lr-form-item" data-table="EmpInfo">
             <div class="lr-form-item-title">紧急联系人</div>
             <input id="Linkman" type="text" class="form-control" />
@@ -90,20 +102,20 @@
         </div>
         <div class="col-xs-4 lr-form-item" data-table="EmpInfo">
             <div class="lr-form-item-title">联系人电话</div>
-            <input id="PhoneOfLinkman" type="text" class="form-control" checkexpession="MobileOrNull" />
-        </div>
-        <div class="col-xs-4 lr-form-item" data-table="EmpInfo">
-            <div class="lr-form-item-title">健康状况</div>
-            <div id="HealthStatusNo"></div>
-        </div>
-        <div class="col-xs-4 lr-form-item" data-table="EmpInfo">
-            <div class="lr-form-item-title">家庭出身</div>
-            <div id="FamilyOriginNo"></div>
-        </div>
-        <div class="col-xs-4 lr-form-item" data-table="EmpInfo">
-            <div class="lr-form-item-title">港澳台侨</div>
-            <div id="OverseasChineseNo"></div>
+            <input id="PhoneOfLinkman" type="text" class="form-control" checkexpession="NotNull" />
         </div>
+        @*<div class="col-xs-4 lr-form-item" data-table="EmpInfo">
+                <div class="lr-form-item-title">健康状况</div>
+                <div id="HealthStatusNo"></div>
+            </div>
+            <div class="col-xs-4 lr-form-item" data-table="EmpInfo">
+                <div class="lr-form-item-title">家庭出身</div>
+                <div id="FamilyOriginNo"></div>
+            </div>
+            <div class="col-xs-4 lr-form-item" data-table="EmpInfo">
+                <div class="lr-form-item-title">港澳台侨</div>
+                <div id="OverseasChineseNo"></div>
+            </div>*@
         <div class="col-xs-4 lr-form-item" data-table="EmpInfo">
             <div class="lr-form-item-title">户籍省份</div>
             <div id="ProvinceNo"></div>
@@ -121,7 +133,7 @@
             <input id="LocusOfResidence" type="text" class="form-control" />
         </div>
         <div class="col-xs-12 lr-form-item" data-table="EmpInfo">
-            <div class="lr-form-item-title">家庭住址</div>
+            <div class="lr-form-item-title">现居住地址</div>
             <input id="Homeaddress" type="text" class="form-control" />
         </div>
         <div class="col-xs-12 lr-form-item" data-table="EmpInfo">
@@ -152,9 +164,9 @@
             <div id="F_DepartmentId" checkexpession="NotNull"></div>
         </div>
         @*<div class="col-xs-4 lr-form-item" data-table="EmpInfo">
-            <div class="lr-form-item-title">系部</div>
-            <div id="DeptNo"></div>
-        </div>*@
+                <div class="lr-form-item-title">系部</div>
+                <div id="DeptNo"></div>
+            </div>*@
         <div class="col-xs-4 lr-form-item" data-table="EmpInfo">
             <div class="lr-form-item-title">岗位类别</div>
             <div id="EmpSortNo"></div>
@@ -180,7 +192,7 @@
             <div id="CompilationCategory"></div>
         </div>
         <div class="col-xs-4 lr-form-item" data-table="EmpInfo">
-            <div class="lr-form-item-title">用工类型</div>
+            <div class="lr-form-item-title">经费渠道</div>
             <div id="EmployType"></div>
         </div>
         <div class="col-xs-4 lr-form-item" data-table="EmpInfo">
@@ -196,15 +208,15 @@
             <input id="AddWorkHours" type="text" class="form-control" />
         </div>
         <div class="col-xs-4 lr-form-item" data-table="EmpInfo">
-            <div class="lr-form-item-title">进入集团时间</div>
+            <div class="lr-form-item-title">进入本校时间</div>
             <input id="GroupDate" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ dateFmt:'yyyy-MM-dd',onpicked: function () { $('#GroupDate').trigger('change'); } })" />
         </div>
         <div class="col-xs-4 lr-form-item" data-table="EmpInfo">
-            <div class="lr-form-item-title">集团龄偏移量(月)</div>
+            <div class="lr-form-item-title">本校龄偏移量(月)</div>
             <input id="GroupOffset" type="text" class="form-control" />
         </div>
         <div class="col-xs-4 lr-form-item" data-table="EmpInfo">
-            <div class="lr-form-item-title">集团龄(减去偏移量)</div>
+            <div class="lr-form-item-title">本校龄(减去偏移量)</div>
             <input id="GroupHours" type="text" class="form-control" />
         </div>
         <div class="col-xs-4 lr-form-item" data-table="EmpInfo">
@@ -341,7 +353,7 @@
             <div id="IsHasLesson" isvalid="yes" checkexpession="NotNull"></div>
         </div>
         <div class="col-xs-4 lr-form-item" data-table="EmpInfo">
-            <div class="lr-form-item-title">学科门类</div>
+            <div class="lr-form-item-title">所学专业</div>
             <div id="SubjectSpeciesNo"></div>
         </div>
         <div class="col-xs-4 lr-form-item" data-table="EmpInfo">
@@ -366,9 +378,9 @@
             <div id="Photo"></div>
         </div>
         @*<div class="col-xs-12 lr-form-item" data-table="EmpInfo">
-            <div class="lr-form-item-title">教师简介</div>
-            <textarea id="resume" class="form-control" style="height:200px;"></textarea>
-        </div>*@
+                <div class="lr-form-item-title">教师简介</div>
+                <textarea id="resume" class="form-control" style="height:200px;"></textarea>
+            </div>*@
 
         <div class="col-xs-12 lr-form-item">
             <div class="lr-form-item-title">教师简介</div>

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

@@ -124,7 +124,7 @@ var bootstrap = function ($, learun) {
             $('#CultureDegreeNo').lrDataItemSelect({ code: 'CollegeType', allowSearch: true });
             $('#DegreeNo').lrDataItemSelect({ code: 'BCdDegree', allowSearch: true });
             $('#FamilyOriginNo').lrDataItemSelect({ code: 'BCdFamilyOrigin', allowSearch: true });
-            $('#SubjectSpeciesNo').lrDataItemSelect({ code: 'BCdSubjectSpecies', allowSearch: true });
+            $('#SubjectSpeciesNo').lrDataItemSelect({ code: 'SubjectSpecies', allowSearch: true });
             $('#ForeignLanguageNo').lrDataItemSelect({ code: 'BCdForeignLanguage', allowSearch: true });
             $('#EmpSortNo').lrDataItemSelect({ code: 'jsgw' });
             $('#EmpFullTimeNo').lrDataItemSelect({ code: 'EmpFullTime' });
@@ -141,14 +141,15 @@ var bootstrap = function ($, learun) {
             $('#PositionLevel').lrDataItemSelect({ code: 'PositionLevel' });
             $('#JobRank').lrDataItemSelect({ code: 'TechnicalPost' });
             $('#WorkLevel').lrDataItemSelect({ code: 'WorkerTechnologyGrade' });
+            $('#Marital').lrDataItemSelect({ code: 'MaritalType', allowSearch: true });
             //编制类别
             $('#CompilationCategory').lrDataItemSelect({
                 code: 'CompilationCategory', select: function (item) {
                     if (!!item && item.id == "02") {//编外
-                        //用工类型
+                        //经费渠道
                         $('#EmployType').lrselectRefresh({
                             url: '/LR_SystemModule/DataItem/GetDetailList',
-                            param: { itemCode: 'EmployType' },
+                            param: { itemCode: 'FundingChannels' },
                             value: 'F_ItemValue',
                             text: 'F_ItemName'
                         });
@@ -160,7 +161,7 @@ var bootstrap = function ($, learun) {
                     }
                 }
             });
-            //用工类型
+            //经费渠道
             $('#EmployType').lrselect();
             $('#IsInActiveStatus').lrDataItemSelect({ code: 'JobStatus' });
             $('#ProfessionalTitle').lrDataItemSelect({ code: 'jszc' });

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

@@ -160,7 +160,7 @@
                         <input id="PhoneOfLinkman" type="text" class="form-control" checkexpession="MobileOrNull" />
                     </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="HealthStatusNo"></span>
@@ -173,7 +173,7 @@
                         <div class="lr-form-item-titles">港澳台侨：</div>
                         <span id="OverseasChineseNo"></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>
@@ -279,17 +279,17 @@
                         <span id="WorkHours"></span>
                     </div>
                     <div class="col-xs-4 lr-form-item" data-table="EmpInfo">
-                        <div class="lr-form-item-titles">进入集团时间：</div>
+                        <div class="lr-form-item-titles">进入本校时间：</div>
                         <span id="GroupDate"></span>
                     </div>
                     <div class="col-xs-4 lr-form-item" data-table="EmpInfo">
-                        <div class="lr-form-item-titles">集团龄偏移量(月)：</div>
+                        <div class="lr-form-item-titles">本校龄偏移量(月)：</div>
                         <span id="GroupOffset"></span>
                     </div>
                 </div>
                 <div class="rowx">
                     <div class="col-xs-4 lr-form-item" data-table="EmpInfo">
-                        <div class="lr-form-item-titles">集团龄(减去偏移量)：</div>
+                        <div class="lr-form-item-titles">本校龄(减去偏移量)：</div>
                         <span id="GroupHours"></span>
                     </div>
                     <div class="col-xs-4 lr-form-item" data-table="EmpInfo">
@@ -440,7 +440,7 @@
                         <span id="IsHasLesson"></span>
                     </div>
                     <div class="col-xs-4 lr-form-item" data-table="EmpInfo">
-                        <div class="lr-form-item-titles">学科门类：</div>
+                        <div class="lr-form-item-titles">所学专业：</div>
                         <span id="SubjectSpeciesNo"></span>
                     </div>
                 </div>

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

@@ -67,7 +67,7 @@
                                     <div id="CompilationCategory"></div>
                                 </div>
                                 <div class="col-xs-6 lr-form-item">
-                                    <div class="lr-form-item-title">用工类型</div>
+                                    <div class="lr-form-item-title">经费渠道</div>
                                     <div id="EmployType"></div>
                                 </div>
                             </div>

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

@@ -49,6 +49,7 @@ var bootstrap = function ($, learun) {
             $('#RegionNo').lrselect();
             //政治面貌
             $('#PartyFaceNo').lrDataItemSelect({ code: 'BCdPartyFace', allowSearch: true });
+            $('#Marital').lrDataItemSelect({ code: 'MaritalType', allowSearch: true });
             //最高学历
             $('#HighestRecord').lrDataItemSelect({ code: 'CollegeType', allowSearch: true });
 
@@ -76,10 +77,10 @@ var bootstrap = function ($, learun) {
             $('#CompilationCategory').lrDataItemSelect({
                 code: 'CompilationCategory', select: function (item) {
                     if (!!item && item.id == "02") {//编外
-                        //用工类型
+                        //经费渠道
                         $('#EmployType').lrselectRefresh({
                             url: '/LR_SystemModule/DataItem/GetDetailList',
-                            param: { itemCode: 'EmployType' },
+                            param: { itemCode: 'FundingChannels' },
                             value: 'F_ItemValue',
                             text: 'F_ItemName'
                         });
@@ -91,7 +92,7 @@ var bootstrap = function ($, learun) {
                     }
                 }
             });
-            //用工类型
+            //经费渠道
             $('#EmployType').lrselect();
             // 刷新
             $('#lr_refresh').on('click', function () {
@@ -535,7 +536,7 @@ var bootstrap = function ($, learun) {
                     },
                     { label: "毕业学校", name: "GraduateSchoolName", width: 100, align: "left" },
                     {
-                        label: "学科门类", name: "SubjectSpeciesNo", width: 100, align: "left",
+                        label: "所学专业", name: "SubjectSpeciesNo", width: 100, align: "left",
                         formatterAsync: function (callback, value, row, op, $cell) {
                             learun.clientdata.getAsync('dataItem', {
                                 key: value,

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

@@ -136,8 +136,8 @@
         <div id="OverseasChineseNo"></div>
     </div>
     <div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
-        <div class="lr-form-item-title">五年一贯制</div>
-        <input id="FiveYear" type="text" class="form-control" />
+        <div class="lr-form-item-title">分段培养方式</div>
+        <div id="FiveYear"></div>
     </div>
     <div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
         <div class="lr-form-item-title">是否单亲</div>

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

@@ -175,6 +175,7 @@ var bootstrap = function ($, learun) {
             $('#IsDisability').lrDataItemSelect({ code: 'YesOrNoBit' });
             $('#IsRunSchool').lrDataItemSelect({ code: 'YesOrNoBit' });
             $('#IsDdifficulty').lrDataItemSelect({ code: 'YesOrNoBit' });
+            $('#FiveYear').lrDataItemSelect({ code: 'PieceCultivateWay' });
 
         },
         initData: function () {

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/FormTran.cshtml

@@ -136,8 +136,8 @@
         <div id="OverseasChineseNo"></div>
     </div>
     <div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
-        <div class="lr-form-item-title">五年一贯制</div>
-        <input id="FiveYear" type="text" class="form-control" />
+        <div class="lr-form-item-title">分段培养方式</div>
+        <div id="FiveYear"></div>
     </div>
     <div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
         <div class="lr-form-item-title">是否单亲</div>

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

@@ -175,6 +175,7 @@ var bootstrap = function ($, learun) {
             $('#IsDisability').lrDataItemSelect({ code: 'YesOrNoBit' });
             $('#IsRunSchool').lrDataItemSelect({ code: 'YesOrNoBit' });
             $('#IsDdifficulty').lrDataItemSelect({ code: 'YesOrNoBit' });
+            $('#FiveYear').lrDataItemSelect({ code: 'PieceCultivateWay' });
         },
         initData: function () {
             if (!!keyValue) {

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

@@ -69,6 +69,7 @@ var bootstrap = function ($, learun) {
             });
             $('#GenderNo').lrDataItemSelect({ code: 'usersexbit' });
             $('#NationalityNo').lrDataSourceSelect({ code: 'BCdNationality', value: 'nationalityno', text: 'nationality' });
+            $('#FiveYear').lrDataItemSelect({ code: 'PieceCultivateWay' });
             // 刷新
             $('#lr_refresh').on('click', function () {
                 location.reload();
@@ -412,7 +413,18 @@ var bootstrap = function ($, learun) {
                     { label: "联系电话", name: "mobile", width: 100, align: "left" },
                     { label: "户口所在地", name: "FatherUnit", width: 100, align: "left" },
                     { label: "档案所在地", name: "MatherUnit", width: 100, align: "left" },
-                    { label: "五年一贯制", name: "IsFiveYears", width: 100, align: "left" },
+                    {
+                        label: "五年一贯制", name: "FiveYear", width: 100, align: "left"
+                        , formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('dataItem', {
+                                key: value,
+                                code: 'PieceCultivateWay',
+                                callback: function (_data) {
+                                    callback(_data.text);
+                                }
+                            });
+                        }
+                    },
                     //{
                     //    label: "异动状态", name: "AbmormityMoveMark", width: 80, align: "center",
                     //    formatter: function (cellvalue) {

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/EmpInfo/EmpInfoEntity.cs

@@ -40,7 +40,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         /// <summary>
         /// 工资编号
         /// </summary>
-        [Column(name:"SALARYNUMBER")]
+        [Column(name: "SALARYNUMBER")]
         public string SalaryNumber { get; set; }
 
         /// <summary>
@@ -351,12 +351,17 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
 
         [Column("OBTAINWAY")]
         public string ObtainWay { get; set; }
-        
+
         /// <summary>
         /// 入党（团）时间
         /// </summary>
         [Column("JOINPARTYTIME")]
         public string JoinPartyTime { get; set; }
+        /// <summary>
+        /// 转为正式党员日期
+        /// </summary>
+        [Column("OFFICIALPARTYTIME")]
+        public DateTime? OfficialPartyTime { get; set; }
 
         /// <summary>
         /// 岗位职级
@@ -533,7 +538,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         /// </summary>
         [Column("WORKERTECHNOLOGYSTATUS")]
         public bool? WorkerTechnologyStatus { get; set; }
-        
+
         /// <summary>
         /// 任同职级职务时间
         /// </summary>
@@ -590,7 +595,18 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         /// </summary>
         [Column("EMPLOYTYPE")]
         public string EmployType { get; set; }
+        /// <summary>
+        /// 档案号
+        /// </summary>
+        [Column("FILENUMBER")]
+        public string FileNumber { get; set; }
 
+        /// <summary>
+        /// 婚姻状况
+        /// </summary>
+        [Column("MARITAL")]
+        public string Marital { get; set; }
+        
         #endregion
 
         #region  扩展操作