diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Form.cshtml index 95fd5f38c..07bd69272 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Form.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Form.cshtml @@ -68,10 +68,18 @@
政治面貌
+
+
婚姻状况
+
+
入党(团)时间
+
+
正式党员时间
+ +
联系电话*
@@ -80,6 +88,10 @@
电子邮箱
+
+
档案号*
+ +
紧急联系人
@@ -90,20 +102,20 @@
联系人电话
- -
-
-
健康状况
-
-
-
-
家庭出身
-
-
-
-
港澳台侨
-
+
+ @*
+
健康状况
+
+
+
+
家庭出身
+
+
+
+
港澳台侨
+
+
*@
户籍省份
@@ -121,7 +133,7 @@
-
家庭住址
+
现居住地址
@@ -152,9 +164,9 @@
@*
-
系部
-
-
*@ +
系部
+
+ *@
岗位类别
@@ -180,7 +192,7 @@
-
用工类型
+
经费渠道
@@ -196,15 +208,15 @@
-
进入集团时间
+
进入本校时间
-
集团龄偏移量(月)
+
本校龄偏移量(月)
-
集团龄(减去偏移量)
+
本校龄(减去偏移量)
@@ -341,7 +353,7 @@
-
学科门类
+
所学专业
@@ -366,9 +378,9 @@
@*
-
教师简介
- -
*@ +
教师简介
+ + *@
教师简介
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Form.js index 47f8da822..cbcf0c500 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Form.js +++ b/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' }); diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/FormModify.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/FormModify.cshtml index e713088b6..50cce5892 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/FormModify.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/FormModify.cshtml @@ -160,7 +160,7 @@
-
+ @*
健康状况:
@@ -173,7 +173,7 @@
港澳台侨:
-
+
*@
户籍省份:
@@ -279,17 +279,17 @@
-
进入集团时间:
+
进入本校时间:
-
集团龄偏移量(月):
+
本校龄偏移量(月):
-
集团龄(减去偏移量):
+
本校龄(减去偏移量):
@@ -440,7 +440,7 @@
-
学科门类:
+
所学专业:
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Index.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Index.cshtml index f490eeb0f..9b7c44850 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Index.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Index.cshtml @@ -67,7 +67,7 @@
-
用工类型
+
经费渠道
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Index.js index 57b2fcf43..7fae0d5f3 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Index.js +++ b/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, diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/Form.cshtml index af473cdaa..5da3371aa 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/Form.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/Form.cshtml @@ -136,8 +136,8 @@
-
五年一贯制
- +
分段培养方式
+
是否单亲
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/Form.js index da8381873..67ea8c085 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/Form.js +++ b/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 () { diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/FormTran.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/FormTran.cshtml index ed32f556e..94992ced8 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/FormTran.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/FormTran.cshtml @@ -136,8 +136,8 @@
-
五年一贯制
- +
分段培养方式
+
是否单亲
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/FormTran.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/FormTran.js index 50a6eba73..aecef23df 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/FormTran.js +++ b/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) { diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/Index.js index a695f96a6..6b5e36cd1 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/Index.js +++ b/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) { diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/EmpInfo/EmpInfoEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/EmpInfo/EmpInfoEntity.cs index 0a6dc0df2..4a428f19f 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/EmpInfo/EmpInfoEntity.cs +++ b/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 /// /// 工资编号 /// - [Column(name:"SALARYNUMBER")] + [Column(name: "SALARYNUMBER")] public string SalaryNumber { get; set; } /// @@ -351,12 +351,17 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration [Column("OBTAINWAY")] public string ObtainWay { get; set; } - + /// /// 入党(团)时间 /// [Column("JOINPARTYTIME")] public string JoinPartyTime { get; set; } + /// + /// 转为正式党员日期 + /// + [Column("OFFICIALPARTYTIME")] + public DateTime? OfficialPartyTime { get; set; } /// /// 岗位职级 @@ -533,7 +538,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration /// [Column("WORKERTECHNOLOGYSTATUS")] public bool? WorkerTechnologyStatus { get; set; } - + /// /// 任同职级职务时间 /// @@ -590,7 +595,18 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration /// [Column("EMPLOYTYPE")] public string EmployType { get; set; } + /// + /// 档案号 + /// + [Column("FILENUMBER")] + public string FileNumber { get; set; } + /// + /// 婚姻状况 + /// + [Column("MARITAL")] + public string Marital { get; set; } + #endregion #region 扩展操作