ส่ง code แก้ไข OP Change Request 18 ข้อ

This commit is contained in:
Nakorn Rientrakrunchai
2020-05-24 00:33:22 +07:00
parent 017a29c136
commit eea05beb69
81 changed files with 1047 additions and 312 deletions

View File

@@ -176,7 +176,7 @@ function eva_create_evaluation_detail_process_GoDelete(a) {
var eva_create_evaluation_detail_processTableV;
var eva_create_evaluation_detail_process_setupTable = function (result) {
console.log(result);
var groupColumn = 5;
tmp = '"';
eva_create_evaluation_detail_processTableV = $('#eva_create_evaluation_detail_processTable').DataTable({
@@ -206,12 +206,28 @@ var eva_create_evaluation_detail_process_setupTable = function (result) {
"render": function (data, type, row, meta) {
return "<button type='button' class='btn btn-warning btn-sm' onclick='javascript:eva_create_evaluation_detail_process_GoEdit(" + tmp + data + tmp + "," + tmp + row["role_code"] + tmp + ")'><i class='fa fa-pencil'></i></button> ";
}
}],
},
{ "visible": false, "targets": groupColumn }],
"language": {
"url": appsite + "/DataTables-1.10.16/thai.json"
},
"paging": true,
"searching": false
"searching": false,
"drawCallback": function ( settings ) {
var api = this.api();
var rows = api.rows( {page:'current'} ).nodes();
var last=null;
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>'
);
last = group;
}
} );
}
});
endLoad();
};

View File

@@ -43,6 +43,8 @@ DropDownClearFormAndFeedWithData($("#eva_create_evaluation_detail_process_org_id
$("#eva_create_evaluation_detail_process_search_employee_code").val(data.search_employee_code);
$("#eva_create_evaluation_detail_process_search_employee_fullname").val(data.search_employee_fullname);
$("#remark_hrm_work_record").val(data.remark_hrm_work_record);
//console.log(data);
item_level_score = data.item_level_score;

View File

@@ -44,6 +44,8 @@ DropDownClearFormAndFeedWithData($("#eva_create_evaluation_detail_process_org_id
$("#eva_create_evaluation_detail_process_search_employee_code").val(data.search_employee_code);
$("#eva_create_evaluation_detail_process_search_employee_fullname").val(data.search_employee_fullname);
$("#remark_hrm_work_record").val(data.remark_hrm_work_record);
item_level_score = data.item_level_score;
$("#w1").text(data.create_evaluation_score1.toFixed(2)+"%");
@@ -151,6 +153,22 @@ function eva_create_evaluation_detail_process_GoDelete(a) {
//================= Control Function =========================================
function setViewOfComment(status_supervisor, status_supervisor1A, status_supervisor2A){
$("#eva_create_evaluation_detail_review02_supervisor2_result").hide();
$("#eva_create_evaluation_detail_review03_supervisor1A_result").hide();
$("#eva_create_evaluation_detail_review04_supervisor2A_result").hide();
if(status_supervisor === "Y"){
$("#eva_create_evaluation_detail_review02_supervisor2_result").show();
}
if(status_supervisor === "Y"){
$("#eva_create_evaluation_detail_review03_supervisor1A_result").show();
}
if(status_supervisor === "Y"){
$("#eva_create_evaluation_detail_review04_supervisor2A_result").show();
}
}
function setPageByRoleAndStatus(role_code, status_self, status_chief, status_supervisor, status_supervisor1A, status_supervisor2A){
$("#btn01").hide();
@@ -177,8 +195,12 @@ function setPageByRoleAndStatus(role_code, status_self, status_chief, status_sup
$("#btnd02").hide();
$("#btnd03").hide();
setViewOfComment(status_supervisor, status_supervisor1A, status_supervisor2A);
if(role_code === "2"){ // ความเห็น ความเห็นผู้ประเมินสูงสุด
$("#eva_create_evaluation_detail_review02_supervisor2_result").show();
if(status_chief === "Y" && status_self === "Y"){
$("#btn01").show();
$("#btn02").show();
@@ -208,6 +230,8 @@ function setPageByRoleAndStatus(role_code, status_self, status_chief, status_sup
}
else if(role_code === "3"){ // ความเห็น ผู้บังคับบัญชาการเหนือขึ้นไปอีกชั้นหนึ่ง
$("#eva_create_evaluation_detail_review03_supervisor1A_result").show();
if(status_supervisor === "Y" && status_chief === "Y" && status_self === "Y"){
$("#eva_create_evaluation_detail_review03_supervisor1A_result").attr("disabled", false);
$("#eva_create_evaluation_detail_review03_supervisor1A_date").attr("disabled", false);
@@ -231,6 +255,9 @@ function setPageByRoleAndStatus(role_code, status_self, status_chief, status_sup
}
else if(role_code === "4"){ // ความเห็น ผู้บังคับบัญชาการเหนือขึ้นไปอีกชั้นหนึ่ง (สูงสุด)
$("#eva_create_evaluation_detail_review04_supervisor2A_result").show();
if(status_supervisor1A === "Y" && status_supervisor === "Y" && status_chief === "Y" && status_self === "Y"){
$("#eva_create_evaluation_detail_review04_supervisor2A_result").attr("disabled", false);
$("#eva_create_evaluation_detail_review04_supervisor2A_date").attr("disabled", false);