diff --git a/src/modules/06_webservices/view/listView.vue b/src/modules/06_webservices/view/listView.vue index 8ee8bdb5..56fb82db 100644 --- a/src/modules/06_webservices/view/listView.vue +++ b/src/modules/06_webservices/view/listView.vue @@ -37,7 +37,6 @@ const visibleColumns = ref([ "amount", "createdAt", "createdFullName", - "accessType", ]); const columns = ref([ { @@ -63,22 +62,6 @@ const columns = ref([ .join(""); }, }, - { - name: "accessType", - align: "left", - label: "การเข้าถึง", - sortable: true, - field: "accessType", - headerStyle: "font-size: 14px", - style: "font-size: 14px", - format(val, row) { - if (val === "ALL") { - return `ทั้งหมด`; - } else { - return `${val} (${row.orgName})`; - } - }, - }, { name: "amount", align: "left", @@ -164,7 +147,7 @@ function serchDataTable() { rows.value = onSearchDataTable( keyword.value, rowsMain.value, - columns.value ? columns.value : [], + columns.value ? columns.value : [] ); } diff --git a/src/modules/07_issues/store.ts b/src/modules/07_issues/store.ts index 0c983f7d..efddccdc 100644 --- a/src/modules/07_issues/store.ts +++ b/src/modules/07_issues/store.ts @@ -13,10 +13,8 @@ export const useIssueStore = defineStore("issue", () => { const statusOptions = ref([ { label: "ทั้งหมด", value: "" }, { label: "ใหม่", value: "NEW" }, - { label: "Dev กำลังดำเนินการ", value: "IN_PROGRESS" }, + { label: "กำลังดำเนินการ", value: "IN_PROGRESS" }, { label: "แก้ไขแล้ว", value: "RESOLVED" }, - { label: "Helpdesk กำลังดำเนินการ", value: "HELPDESK_IN_PROGRESS" }, - { label: "แจ้งกลับแล้ว", value: "REPLIED" }, { label: "ปิดแล้ว", value: "CLOSED" }, ]); @@ -26,15 +24,11 @@ export const useIssueStore = defineStore("issue", () => { case "NEW": return "ใหม่"; case "IN_PROGRESS": - return "Dev กำลังดำเนินการ"; + return "กำลังดำเนินการ"; case "RESOLVED": return "แก้ไขแล้ว"; case "CLOSED": return "ปิดแล้ว"; - case "HELPDESK_IN_PROGRESS": - return "Helpdesk กำลังดำเนินการ"; - case "REPLIED": - return "แจ้งกลับแล้ว"; default: return "-"; } diff --git a/src/modules/07_issues/views/Main.vue b/src/modules/07_issues/views/Main.vue index 34977d08..3eac5f83 100644 --- a/src/modules/07_issues/views/Main.vue +++ b/src/modules/07_issues/views/Main.vue @@ -22,7 +22,6 @@ const { convertStatus, convertSystem } = store; const { systemOptions, statusOptions } = storeToRefs(store); const visibleColumns = ref([ - "codeIssue", "title", "description", "system", @@ -35,43 +34,6 @@ const visibleColumns = ref([ "status", ]); const columns = ref([ - { - 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: "createdFullName", - align: "left", - label: "ชื่อผู้สร้าง", - sortable: false, - field: "createdFullName", - headerStyle: "font-size: 14px", - style: "font-size: 14px", - }, - { - name: "org", - align: "left", - label: "หน่วยงาน", - sortable: false, - field: "org", - headerStyle: "font-size: 14px", - style: "font-size: 14px", - }, { name: "title", align: "left", @@ -109,6 +71,16 @@ const columns = ref([ headerStyle: "font-size: 14px", 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", @@ -128,6 +100,25 @@ const columns = ref([ 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", @@ -203,7 +194,6 @@ onMounted(async () => { await fetchListIssues(); }); -