-
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 31097451c..fcd9ac5fe 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
@@ -15,7 +15,7 @@ var bootstrap = function ($, learun) {
bind: function () {
$('#multiple_condition_query').lrMultipleQuery(function (queryJson) {
page.search(queryJson);
- }, 280, 700);
+ }, 330, 700);
$('#DeptNo').lrDataSourceSelect({ code: 'CdDeptInfo', value: 'deptno', text: 'deptname' });
$('#ProvinceNo').lrDataSourceSelect({
code: 'DIC_PROVINCE', value: 'pcode', text: 'pname',
@@ -74,6 +74,27 @@ var bootstrap = function ($, learun) {
});
//职工状态
$('#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: []
+ });
+ }
+ }
+ });
+ //用工类型
+ $('#EmployType').lrselect();
// 刷新
$('#lr_refresh').on('click', function () {
location.reload();
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 96839dc85..0a6dc0df2 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
@@ -585,6 +585,11 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
///
[Column("PROFESSIONALTITLEGETTIME")]
public DateTime? ProfessionalTitleGetTime { get; set; }
+ ///
+ /// 用工类型
+ ///
+ [Column("EMPLOYTYPE")]
+ public string EmployType { get; set; }
#endregion
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/EmpInfo/EmpInfoService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/EmpInfo/EmpInfoService.cs
index 819953367..8e412e3eb 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/EmpInfo/EmpInfoService.cs
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/EmpInfo/EmpInfoService.cs
@@ -132,6 +132,16 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
dp.Add("IsInActiveStatus", queryParam["IsInActiveStatus"].ToString(), DbType.String);
strSql.Append(" AND t.IsInActiveStatus = @IsInActiveStatus ");
}
+ if (!queryParam["CompilationCategory"].IsEmpty())//编制类别
+ {
+ dp.Add("CompilationCategory", queryParam["CompilationCategory"].ToString(), DbType.String);
+ strSql.Append(" AND t.CompilationCategory = @CompilationCategory ");
+ }
+ if (!queryParam["EmployType"].IsEmpty())//用工类型
+ {
+ dp.Add("EmployType", queryParam["EmployType"].ToString(), DbType.String);
+ strSql.Append(" AND t.EmployType = @EmployType ");
+ }
return this.BaseRepository("CollegeMIS").FindList
(strSql.ToString(), dp, pagination);
}
catch (Exception ex)
From d4d56c077da65a07276553bf4bf12bc9d4b7ef30 Mon Sep 17 00:00:00 2001
From: dyy <18335927079@163.com>
Date: Thu, 13 May 2021 16:15:29 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E3=80=90=E4=BF=AE=E6=94=B9=E3=80=91?=
=?UTF-8?q?=E6=95=99=E5=B8=88=E4=BF=A1=E6=81=AF=E7=AE=A1=E7=90=86=EF=BC=9A?=
=?UTF-8?q?=E6=89=93=E5=8D=B0=EF=BC=9A=E6=9C=AC=E4=BA=BA=E7=AE=80=E5=8E=86?=
=?UTF-8?q?-=E6=94=B9=E6=88=90-=E5=B7=A5=E4=BD=9C=E7=BB=8F=E5=8E=86?=
=?UTF-8?q?=EF=BC=9B=E4=BF=AE=E6=94=B9=E5=92=8C=E5=BD=95=E5=85=A5=EF=BC=9A?=
=?UTF-8?q?=E5=B7=A5=E4=BD=9C=E7=AE=80=E5=8E=86-=E6=94=B9=E6=88=90-?=
=?UTF-8?q?=E5=B7=A5=E4=BD=9C=E7=BB=8F=E5=8E=86=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../Areas/EducationalAdministration/Views/EmpInfo/Form.cshtml | 2 +-
.../Areas/EducationalAdministration/Views/EmpInfo/Print.cshtml | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
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 b6d40d429..8c1f1934a 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
@@ -34,7 +34,7 @@
教育经历
专业技术职务经历
工人技术等级经历
- 工作简历
+ 工作经历
家庭情况