รวม code แก้ไข Change Request จากทีม

wwwroot/js/eva_create_evaluation_detail_agreement/eva_create_evaluation_detail_agreement.js

@@ -196,7 +196,6 @@ console.log(result);
 { "data": "org_id_external_linkage_external_name" },
                 { "data": "status_chief" },
 { "data": "status_supervisor" },
-
 { "data": "id" }
                     
         ],
@@ -214,10 +213,13 @@ console.log(result);
                 "render": function (data, type, row, meta) {
 if(row.status_chief === "Y"){
     return "<button type='button' class='btn btn-warning btn-sm' onclick='javascript:eva_create_evaluation_detail_agreement_GoSelfReview(" + tmp + data + tmp + ")'><i class='fa fa-pencil'></i></button> ";
+}else{
+    return "";
 }
                     
                 }
-            }],
+            }
+            ],
         "language": {
             "url": appsite + "/DataTables-1.10.16/thai.json"
         },

wwwroot/js/search_employee_for_group/search_employee_for_group.js

@@ -164,6 +164,7 @@ var search_employee_for_group_setupTable = function (result) {
     search_employee_for_groupTableV = $('#search_employee_for_groupTable').DataTable({
         "processing": true,
         "serverSide": false,
+        "ordering": false,
         "data": result,
 		"select": {
             "style": 'multi'
@@ -171,10 +172,10 @@ var search_employee_for_group_setupTable = function (result) {
         "columns": [
 		{ "data": "" },
                 { "data": "employee_number" },
+                { "data": "org_id_external_linkage_external_name" },
                 { "data": "fullname" },
                 { "data": "position_id_external_linkage_external_name" },
-                { "data": "level_name" },
-                { "data": "org_id_external_linkage_external_name" },
+                { "data": "level_name" },                
                 { "data": "remark" },            
         ],
         "columnDefs": [