Browse Source

empinfo list 多条件查询增加条件

大厂分支
zhichao lei 4 years ago
parent
commit
2b6d0c61fe
6 changed files with 58 additions and 0 deletions
  1. +8
    -0
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Index.cshtml
  2. +4
    -0
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Index.js
  3. +12
    -0
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_ManagementPlan/Index.js
  4. +12
    -0
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_PerformanceTracking/Index.js
  5. +12
    -0
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_QualityObjectives/Index.js
  6. +10
    -0
      Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/EmpInfo/EmpInfoService.cs

+ 8
- 0
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Index.cshtml View File

@@ -46,6 +46,14 @@
<div class="lr-form-item-title">户籍县区</div>
<div id="RegionNo"></div>
</div>
<div class="col-xs-6 lr-form-item">
<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="CultureDegreeNo"></div>
</div>
</div>
</div>
</div>


+ 4
- 0
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Index.js View File

@@ -65,6 +65,10 @@ var bootstrap = function ($, learun) {
}
}
});
//政治面貌
$('#PartyFaceNo').lrDataSourceSelect({ code: 'BCdPartyFace', value: 'partyfaceno', text: 'partyface' });
//文化程度
$('#CultureDegreeNo').lrDataSourceSelect({ code: 'BCdCultureDegree', value: 'culturedegreeno', text: 'culturedegree' });
// 部门选择
$('#F_DepartmentId').lrselect();
// 刷新


+ 12
- 0
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_ManagementPlan/Index.js View File

@@ -156,6 +156,18 @@ var bootstrap = function ($, learun) {
});
}
},
{
label: "是否合格", name: "MPConclusion", width: 100, align: "left", formatter: function (val) {

if (val === 1) {
return "合格";
} else if (val === 0) {
return "不合格";
} else {
return "";
}
}
},
//{ label: "说明", name: "MPRemark", width: 200, align: "left" },
],
mainId: 'MPId',


+ 12
- 0
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_PerformanceTracking/Index.js View File

@@ -142,6 +142,18 @@ var bootstrap = function ($, learun) {
});
}
},
{
label: "是否合格", name: "MPConclusion", width: 100, align: "left", formatter: function (val) {

if (val === 1) {
return "合格";
} else if (val === 0) {
return "不合格";
} else {
return "";
}
}
},
//{ label: "截止时间", name: "MPOverTime", width: 100, align: "left" },
//{ label: "说明", name: "MPRemark", width: 200, align: "left" },



+ 12
- 0
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_QualityObjectives/Index.js View File

@@ -165,6 +165,18 @@ var bootstrap = function ($, learun) {
});
}
},
{
label: "是否合格", name: "MPConclusion", width: 100, align: "left", formatter: function (val) {

if (val === 1) {
return "合格";
} else if (val === 0) {
return "不合格";
} else {
return "";
}
}
},

//{ label: "截止时间", name: "MPOverTime", width: 100, align: "left" },
//{ label: "说明", name: "MPRemark", width: 200, align: "left" },


+ 10
- 0
Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/EmpInfo/EmpInfoService.cs View File

@@ -82,6 +82,16 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
dp.Add("F_DepartmentId", queryParam["F_DepartmentId"].ToString(), DbType.String);
strSql.Append(" AND t.F_DepartmentId = @F_DepartmentId ");
}
if (!queryParam["BCdCultureDegree"].IsEmpty())
{
dp.Add("BCdCultureDegree", queryParam["BCdCultureDegree"].ToString(), DbType.String);
strSql.Append(" AND t.BCdCultureDegree = @BCdCultureDegree ");
}
if (!queryParam["BCdPartyFace"].IsEmpty())
{
dp.Add("BCdPartyFace", queryParam["BCdPartyFace"].ToString(), DbType.String);
strSql.Append(" AND t.BCdPartyFace = @BCdPartyFace ");
}
return this.BaseRepository("CollegeMIS").FindList<EmpInfoEntity>(strSql.ToString(), dp, pagination);
}
catch (Exception ex)


Loading…
Cancel
Save