diff --git a/src/modules/22_issues/store.ts b/src/modules/22_issues/store.ts
index f7d19d0a6..a13c173c6 100644
--- a/src/modules/22_issues/store.ts
+++ b/src/modules/22_issues/store.ts
@@ -13,8 +13,10 @@ export const useIssueStore = defineStore("issue", () => {
   const statusOptions = ref<Options[]>([
     { label: "ทั้งหมด", value: "" },
     { label: "ใหม่", value: "NEW" },
-    { label: "กำลังดำเนินการ", value: "IN_PROGRESS" },
+    { label: "Dev กำลังดำเนินการ", value: "IN_PROGRESS" },
     { label: "แก้ไขแล้ว", value: "RESOLVED" },
+    { label: "Helpdesk กำลังดำเนินการ", value: "HELPDESK_IN_PROGRESS" },
+    { label: "แจ้งกลับแล้ว", value: "REPLIED " },
     { label: "ปิดแล้ว", value: "CLOSED" },
   ]);
 
@@ -29,6 +31,10 @@ export const useIssueStore = defineStore("issue", () => {
         return "แก้ไขแล้ว";
       case "CLOSED":
         return "ปิดแล้ว";
+      case "HELPDESK_IN_PROGRESS":
+        return "Helpdesk กำลังดำเนินการ";
+      case "REPLIED":
+        return "แจ้งกลับแล้ว";
       default:
         return "-";
     }
diff --git a/src/modules/22_issues/views/Main.vue b/src/modules/22_issues/views/Main.vue
index 7e7d27c32..72d6b6c5d 100644
--- a/src/modules/22_issues/views/Main.vue
+++ b/src/modules/22_issues/views/Main.vue
@@ -22,6 +22,7 @@ const { convertStatus, convertSystem } = store;
 const { systemOptions, statusOptions } = storeToRefs(store);
 
 const visibleColumns = ref<string[]>([
+  "codeIssue",
   "title",
   "description",
   "system",
@@ -34,6 +35,43 @@ const visibleColumns = ref<string[]>([
   "status",
 ]);
 const columns = ref<QTableProps["columns"]>([
+  {
+    name: "codeIssue",
+    align: "left",
+    label: "รหัส",
+    sortable: false,
+    field: "codeIssue",
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+  },
+  {
+    name: "createdAt",
+    align: "left",
+    label: "วันที่สร้าง",
+    sortable: false,
+    field: "createdAt",
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+    format: (val: string) => date2Thai(new Date(val), false, true),
+  },
+  {
+    name: "org",
+    align: "left",
+    label: "หน่วยงาน",
+    sortable: false,
+    field: "org",
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+  },
+  {
+    name: "createdFullName",
+    align: "left",
+    label: "ชื่อผู้สร้าง",
+    sortable: false,
+    field: "createdFullName",
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+  },
   {
     name: "title",
     align: "left",
@@ -72,15 +110,6 @@ const columns = ref<QTableProps["columns"]>([
     style: "font-size: 14px",
   },
 
-  {
-    name: "org",
-    align: "left",
-    label: "หน่วยงาน",
-    sortable: false,
-    field: "org",
-    headerStyle: "font-size: 14px",
-    style: "font-size: 14px",
-  },
   {
     name: "email",
     align: "left",
@@ -100,25 +129,6 @@ const columns = ref<QTableProps["columns"]>([
     style: "font-size: 14px",
   },
 
-  {
-    name: "createdAt",
-    align: "left",
-    label: "วันที่สร้าง",
-    sortable: false,
-    field: "createdAt",
-    headerStyle: "font-size: 14px",
-    style: "font-size: 14px",
-    format: (val: string) => date2Thai(new Date(val), false, true),
-  },
-  {
-    name: "createdFullName",
-    align: "left",
-    label: "ชื่อผู้สร้าง",
-    sortable: false,
-    field: "createdFullName",
-    headerStyle: "font-size: 14px",
-    style: "font-size: 14px",
-  },
   {
     name: "status",
     align: "left",