diff --git a/Views/eva_create_evaluation_detail_agreementView/eva_create_evaluation_detail_agreement.cshtml b/Views/eva_create_evaluation_detail_agreementView/eva_create_evaluation_detail_agreement.cshtml index 3f875ae..e4e8e0c 100644 --- a/Views/eva_create_evaluation_detail_agreementView/eva_create_evaluation_detail_agreement.cshtml +++ b/Views/eva_create_evaluation_detail_agreementView/eva_create_evaluation_detail_agreement.cshtml @@ -66,6 +66,8 @@ + + diff --git a/wwwroot/js/eva_create_evaluation_detail_agreement/eva_create_evaluation_detail_agreement.js b/wwwroot/js/eva_create_evaluation_detail_agreement/eva_create_evaluation_detail_agreement.js index 77a80bd..ca7ccf5 100644 --- a/wwwroot/js/eva_create_evaluation_detail_agreement/eva_create_evaluation_detail_agreement.js +++ b/wwwroot/js/eva_create_evaluation_detail_agreement/eva_create_evaluation_detail_agreement.js @@ -94,6 +94,10 @@ function eva_create_evaluation_detail_agreement_GoEdit(a) { window_open(appsite + "/eva_create_evaluation_detail_agreementView/eva_create_evaluation_detail_agreement_d?id=" + a); } +function eva_create_evaluation_detail_agreement_GoSelfReview(a) { + window_open(appsite + "/eva_create_evaluation_detail_processView/eva_create_evaluation_detail_process_d?id=" + a); +} + function eva_create_evaluation_detail_agreement_SetEditForm(a) { var successFunc = function (result) { eva_create_evaluation_detail_agreement_editMode = "UPDATE"; @@ -192,6 +196,8 @@ console.log(result); { "data": "org_id_external_linkage_external_name" }, { "data": "status_chief" }, { "data": "status_supervisor" }, + +{ "data": "id" } ], "columnDefs": [ @@ -201,6 +207,16 @@ console.log(result); "render": function (data, type, row, meta) { return " "; } + }, + { + "targets": -1, + "data": "id", + "render": function (data, type, row, meta) { +if(row.status_chief === "Y"){ + return " "; +} + + } }], "language": { "url": appsite + "/DataTables-1.10.16/thai.json" diff --git a/wwwroot/js/eva_create_evaluation_detail_process/eva_create_evaluation_detail_process_d.js b/wwwroot/js/eva_create_evaluation_detail_process/eva_create_evaluation_detail_process_d.js index 5ae5ea2..7102a89 100644 --- a/wwwroot/js/eva_create_evaluation_detail_process/eva_create_evaluation_detail_process_d.js +++ b/wwwroot/js/eva_create_evaluation_detail_process/eva_create_evaluation_detail_process_d.js @@ -190,8 +190,9 @@ function setPageByRoleAndStatus(role_code, status_self, status_chief, status_sup $("#eva_create_evaluation_detail_review01_supervisor1_remark").attr("disabled", true); } }else{ - alert('คุณไม่มีสิทธิเข้าถึงหน้าจอนี้!'); - window_close(); + console.log(role_code); + //alert('คุณไม่มีสิทธิเข้าถึงหน้าจอนี้!'); + //window_close(); } }