thamming_dev01/hrm_eva
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix op2672

Browse Source
This commit is contained in:
Prathan B
2020-07-09 19:39:15 +07:00
parent 4c32cbd562
commit d8d671dd51
4 changed files with 20 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Models/rep_position_salary/rep_position_salaryService.cs
View File

@@ -37,7 +37,8 @@ namespace TodoAPI2.Models
i.item_employee_id = (from x in emp.GetListByemployee_type(null,null) orderby x.fullname select x).ToList();
i.item_position_id = (from x in ext.GetPositionForReport() orderby x.external_name select x).ToList();
i.item_org_id = (from x in ext.GetDepartmentDataForReport() orderby x.external_name select x).ToList();
//position level op2672
i.item_position_level_id = (from x in ext.Gethrm_position_levels() orderby x.external_name select x).ToList();
return i;
}

2
Models/rep_position_salary/rep_position_salaryWithSelectionViewModel.cs
View File

@@ -10,6 +10,8 @@ namespace TodoAPI2.Models
public List<external_employeeViewModel> item_employee_id { get; set; }
public List<external_linkageViewModel> item_position_id { get; set; }
public List<external_linkageViewModel> item_org_id { get; set; }
public List<external_linkageViewModel> item_position_level_id { get; set; }
//position level op2672
}
}

5
Views/rep_position_salaryView/rep_position_salary_report.cshtml
View File

@@ -40,6 +40,10 @@
<label id='lab_s_rep_position_salary_org_id' for='s_rep_position_salary_org_id'>หน่วยงาน</label>
<select class="form-control" id="s_rep_position_salary_org_id" iLabel="หน่วยงาน" iRequire="false" iGroup="s_rep_position_salary" title='หน่วยงาน' placeholder='หน่วยงาน'></select>
</div>
<div class="form-group col-md-3">
<label id='lab_s_rep_position_salary_postion_level_id' for='s_rep_position_salary_position_level_id'>ระดับตำแหน่ง</label>
<select class="form-control" id="s_rep_position_salary_position_level_id" iLabel="ระดับตำแหน่ง" iRequire="false" iGroup="s_rep_position_salary" title='ระดับตำแหน่ง' placeholder='ระดับตำแหน่ง'></select>
</div>
</div>
</div>
@@ -62,6 +66,7 @@
$("#s_rep_position_salary_employee_id").select2();
$("#s_rep_position_salary_position_id").select2();
$("#s_rep_position_salary_org_id").select2();
$("#s_rep_position_salary_position_level_id").select2();
});
</script>
}

19
wwwroot/js/rep_position_salary/rep_position_salary_report.js
View File

@@ -4,10 +4,11 @@
function rep_position_salary_GetSearchParameter(fileType) {
var rep_position_salarySearchObject = new Object();
rep_position_salarySearchObject.employee_id = $("#s_rep_position_salary_employee_id").val();
rep_position_salarySearchObject.position_id = $("#s_rep_position_salary_position_id").val();
rep_position_salarySearchObject.org_id = $("#s_rep_position_salary_org_id").val();
rep_position_salarySearchObject.employee_id = $("#s_rep_position_salary_employee_id").val();
rep_position_salarySearchObject.position_id = $("#s_rep_position_salary_position_id").val();
rep_position_salarySearchObject.org_id = $("#s_rep_position_salary_org_id").val();
//position level op2672
rep_position_salarySearchObject.position_level_id = $("#s_rep_position_salary_position_level_id").val();
rep_position_salarySearchObject.fileType = fileType;
@@ -17,9 +18,11 @@ rep_position_salarySearchObject.org_id = $("#s_rep_position_salary_org_id").val(
}
function rep_position_salary_FeedDataToSearchForm(data) {
DropDownClearFormAndFeedWithData($("#s_rep_position_salary_employee_id"), data, "id", "fullname", "item_employee_id", data.employee_id);
DropDownClearFormAndFeedWithData($("#s_rep_position_salary_position_id"), data, "id", "external_name", "item_position_id", data.position_id);
DropDownClearFormAndFeedWithData($("#s_rep_position_salary_org_id"), data, "id", "external_name", "item_org_id", data.org_id);
DropDownClearFormAndFeedWithData($("#s_rep_position_salary_employee_id"), data, "id", "fullname", "item_employee_id", data.employee_id);
DropDownClearFormAndFeedWithData($("#s_rep_position_salary_position_id"), data, "id", "external_name", "item_position_id", data.position_id);
DropDownClearFormAndFeedWithData($("#s_rep_position_salary_org_id"), data, "id", "external_name", "item_org_id", data.org_id);
//position level op2672
DropDownClearFormAndFeedWithData($("#s_rep_position_salary_position_level_id"), data, "id", "external_name", "item_position_level_id", data.position_level_id);
}
@@ -50,7 +53,7 @@ function rep_position_salary_DoSearch(fileType) {
var report_url = apisite + "/api/rep_position_salary/rep_position_salary_report?" + p;
if (fileType === "pdf") {
if (fileType === "pdf") {
$("#report_result").attr("src", report_url);
$("#report_result").show();
//window.open(report_url);