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

เพิ่มคอลัม เงินประจำตำแหน่ง และค่าตอบแทน รายเดือน

Browse Source
This commit is contained in:
LAPTOP-KB8JC2K2\acer
2021-07-08 15:15:40 +07:00
parent 3a00d8c0f4
commit d17f470c8c
11 changed files with 1209 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
wwwroot/js/eva_adjust_postponement_normal/eva_adjust_postponement_normal.js
View File

@@ -39,6 +39,8 @@ function eva_adjust_postponement_normal_FeedDataToForm(data) {
DropDownClearFormAndFeedWithData($("#eva_adjust_postponement_normal_managed_by"), data, "id", "fullname", "item_managed_by", getCookie("emp_id"));
//DropDownClearFormAndFeedWithData($("#eva_adjust_postponement_normal_org_id"), data, "id", "external_name", "item_org_id", data.org_id);
$("#eva_salary_cylinder_position_allowance").val(data.position_allowance);
$("#eva_salary_cylinder_monthly_compensation").val(data.monthly_compensation);
}
function eva_adjust_postponement_normal_GetFromForm() {
@@ -55,6 +57,8 @@ function eva_adjust_postponement_normal_GetFromForm() {
eva_adjust_postponement_normalObject.managed_by = $("#eva_adjust_postponement_normal_managed_by").val();
//eva_adjust_postponement_normalObject.org_id = $("#eva_adjust_postponement_normal_org_id").val();
eva_salary_cylinderObject.position_allowance = $("#eva_salary_cylinder_position_allowance").val();
eva_salary_cylinderObject.monthly_compensation = $("#eva_salary_cylinder_monthly_compensation").val();
return eva_adjust_postponement_normalObject;
}

48
wwwroot/js/eva_salary_cylinder/eva_salary_cylinder.js
View File

@@ -21,17 +21,13 @@ function eva_salary_cylinder_FeedDataToForm(data) {
$("#eva_salary_cylinder_id").val(data.id);
DropDownClearFormAndFeedWithData($("#eva_salary_cylinder_position_type"), data, "id", "external_name", "item_position_type", data.position_type);
DropDownClearFormAndFeedWithData($("#eva_salary_cylinder_position_level"), data, "id", "external_name", "item_position_level", data.position_level);
// $("#eva_salary_cylinder_temporary_min").val(data.temporary_min);
// $("#eva_salary_cylinder_themin").val(data.themin);
// $("#eva_salary_cylinder_themax").val(data.themax);
// $("#eva_salary_cylinder_middle").val(data.middle);
// $("#eva_salary_cylinder_cost_living").val(data.cost_living);
$("#eva_salary_cylinder_temporary_min").maskMoney('mask',data.temporary_min);
$("#eva_salary_cylinder_themin").maskMoney('mask',data.themin);
$("#eva_salary_cylinder_themax").maskMoney('mask',data.themax);
$("#eva_salary_cylinder_middle").maskMoney('mask',data.middle);
$("#eva_salary_cylinder_cost_living").maskMoney('mask',data.cost_living);
$("#eva_salary_cylinder_temporary_min").val(data.temporary_min);
$("#eva_salary_cylinder_themin").val(data.themin);
$("#eva_salary_cylinder_themax").val(data.themax);
$("#eva_salary_cylinder_middle").val(data.middle);
$("#eva_salary_cylinder_cost_living").val(data.cost_living);
$("#eva_salary_cylinder_position_allowance").val(data.position_allowance);
$("#eva_salary_cylinder_monthly_compensation").val(data.monthly_compensation);
}
function eva_salary_cylinder_GetFromForm() {
@@ -39,12 +35,13 @@ function eva_salary_cylinder_GetFromForm() {
eva_salary_cylinderObject.id = $("#eva_salary_cylinder_id").val();
eva_salary_cylinderObject.position_type = $("#eva_salary_cylinder_position_type").val();
eva_salary_cylinderObject.position_level = $("#eva_salary_cylinder_position_level").val();
eva_salary_cylinderObject.temporary_min = $("#eva_salary_cylinder_temporary_min").val().replace(/[,-]/g,'');
eva_salary_cylinderObject.themin = $("#eva_salary_cylinder_themin").val().replace(/[,-]/g,'');
eva_salary_cylinderObject.themax = $("#eva_salary_cylinder_themax").val().replace(/[,-]/g,'');
eva_salary_cylinderObject.middle = $("#eva_salary_cylinder_middle").val().replace(/[,-]/g,'');
eva_salary_cylinderObject.cost_living = $("#eva_salary_cylinder_cost_living").val().replace(/[,-]/g,'');
eva_salary_cylinderObject.temporary_min = $("#eva_salary_cylinder_temporary_min").val();
eva_salary_cylinderObject.themin = $("#eva_salary_cylinder_themin").val();
eva_salary_cylinderObject.themax = $("#eva_salary_cylinder_themax").val();
eva_salary_cylinderObject.middle = $("#eva_salary_cylinder_middle").val();
eva_salary_cylinderObject.cost_living = $("#eva_salary_cylinder_cost_living").val();
eva_salary_cylinderObject.position_allowance = $("#eva_salary_cylinder_position_allowance").val();
eva_salary_cylinderObject.monthly_compensation = $("#eva_salary_cylinder_monthly_compensation").val();
return eva_salary_cylinderObject;
}
@@ -117,6 +114,7 @@ function eva_salary_cylinder_PutUpdate() {
}
var data = eva_salary_cylinder_GetFromForm();
console.log(data);
//Update Mode
if (eva_salary_cylinder_editMode === "UPDATE") {
@@ -176,6 +174,8 @@ var eva_salary_cylinder_setupTable = function (result) {
{ "data": "themax" },
{ "data": "middle" },
{ "data": "cost_living" },
{ "data": "position_allowance" },
{ "data": "monthly_compensation" },
],
"columnDefs": [
{
@@ -219,6 +219,20 @@ var eva_salary_cylinder_setupTable = function (result) {
"render": function (data, type, row, meta) {
return formatNumber(data);
}
},
{
"targets": 8,
"data": "position_allowance",
"render": function (data, type, row, meta) {
return formatNumber(data);
}
},
{
"targets": 9,
"data": "monthly_compensation",
"render": function (data, type, row, meta) {
return formatNumber(data);
}
}],
"language": {
"url": appsite + "/DataTables-1.10.16/thai.json"