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

ปรับปรุงหลายส่วน

Browse Source
This commit is contained in:
nakorn
2021-11-15 13:53:13 +07:00
parent 6d0a2ace7d
commit 4b98790d2e
27 changed files with 2690 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
wwwroot/js/eva_create_evaluation/eva_create_evaluation.js
View File

@@ -28,6 +28,7 @@ function eva_create_evaluation_FeedDataToForm(data) {
DropDownClearFormAndFeedWithData($("#eva_create_evaluation_evaluation_group_id"), data, "id", "thegroup", "item_evaluation_group_id", data.evaluation_group_id);
DropDownClearFormAndFeedWithData($("#eva_create_evaluation_supervisor1_id"), data, "id", "fullname", "item_supervisor1_id", data.supervisor1_id);
DropDownClearFormAndFeedWithData($("#eva_create_evaluation_supervisor2_id"), data, "id", "fullname", "item_supervisor2_id", data.supervisor2_id);
DropDownClearFormAndFeedWithData($("#eva_create_evaluation_supervisor3_id"), data, "id", "fullname", "item_supervisor3_id", data.supervisor3_id);
}
@@ -41,6 +42,7 @@ function eva_create_evaluation_GetFromForm() {
eva_create_evaluationObject.evaluation_group_id = $("#eva_create_evaluation_evaluation_group_id").val();
eva_create_evaluationObject.supervisor1_id = $("#eva_create_evaluation_supervisor1_id").val();
eva_create_evaluationObject.supervisor2_id = $("#eva_create_evaluation_supervisor2_id").val();
eva_create_evaluationObject.supervisor3_id = $("#eva_create_evaluation_supervisor3_id").val();
return eva_create_evaluationObject;
}

2
wwwroot/js/eva_create_evaluation/eva_create_evaluation_d.js
View File

@@ -12,6 +12,7 @@ function eva_create_evaluation_FeedDataToForm(data) {
DropDownClearFormAndFeedWithData($("#eva_create_evaluation_evaluation_group_id"), data, "id", "thegroup", "item_evaluation_group_id", data.evaluation_group_id);
DropDownClearFormAndFeedWithData($("#eva_create_evaluation_supervisor1_id"), data, "id", "fullname", "item_supervisor1_id", data.supervisor1_id);
DropDownClearFormAndFeedWithData($("#eva_create_evaluation_supervisor2_id"), data, "id", "fullname", "item_supervisor2_id", data.supervisor2_id);
DropDownClearFormAndFeedWithData($("#eva_create_evaluation_supervisor3_id"), data, "id", "fullname", "item_supervisor3_id", data.supervisor3_id);
}
@@ -25,6 +26,7 @@ function eva_create_evaluation_GetFromForm() {
eva_create_evaluationObject.evaluation_group_id = $("#eva_create_evaluation_evaluation_group_id").val();
eva_create_evaluationObject.supervisor1_id = $("#eva_create_evaluation_supervisor1_id").val();
eva_create_evaluationObject.supervisor2_id = $("#eva_create_evaluation_supervisor2_id").val();
eva_create_evaluationObject.supervisor3_id = $("#eva_create_evaluation_supervisor3_id").val();
return eva_create_evaluationObject;
}

2
wwwroot/js/eva_create_evaluation_detail/eva_create_evaluation_detail.js
View File

@@ -29,6 +29,7 @@ function eva_create_evaluation_detail_FeedDataToForm(data) {
$("#eva_create_evaluation_detail_order_of_data").val(data.order_of_data);
DropDownClearFormAndFeedWithData($("#eva_create_evaluation_detail_help_org_id"), data, "id", "external_name", "item_help_org_id", data.help_org_id);
$("#eva_create_evaluation_detail_remark").val(data.remark);
DropDownClearFormAndFeedWithData($("#eva_create_evaluation_detail_supervisor3_id"), data, "id", "fullname", "item_supervisor3_id", data.supervisor3_id);
}
function eva_create_evaluation_detail_GetFromForm() {
@@ -44,6 +45,7 @@ function eva_create_evaluation_detail_GetFromForm() {
eva_create_evaluation_detailObject.order_of_data = $("#eva_create_evaluation_detail_order_of_data").val();
eva_create_evaluation_detailObject.help_org_id = $("#eva_create_evaluation_detail_help_org_id").val();
eva_create_evaluation_detailObject.remark = $("#eva_create_evaluation_detail_remark").val();
eva_create_evaluation_detailObject.supervisor3_id = $("#eva_create_evaluation_detail_supervisor3_id").val();
return eva_create_evaluation_detailObject;
}

5
wwwroot/js/eva_create_evaluation_detail_process/eva_create_evaluation_detail_process.js
View File

@@ -206,7 +206,8 @@ var eva_create_evaluation_detail_process_setupTable = function (result) {
{ "data": "txt_status_chief" },
{ "data": "txt_status_supervisor" },
{ "data": "txt_status_supervisor1A" },
{ "data": "txt_status_supervisor2A" }
{ "data": "txt_status_supervisor2A" },
{ "data": "txt_status_supervisor3A" }
],
"columnDefs": [
{
@@ -230,7 +231,7 @@ var eva_create_evaluation_detail_process_setupTable = function (result) {
api.column(groupColumn, { page: 'current' }).data().each(function (group, i) {
if (last !== group) {
$(rows).eq(i).before(
'<tr class="group"><td colspan="12">' + group + '</td></tr>'
'<tr class="group"><td colspan="13">' + group + '</td></tr>'
);
last = group;