ปรับ Table บันทึกผล

src/modules/07_insignia/storeResult.ts

@@ -43,10 +43,12 @@ export const useResultDataStore = defineStore("insigniaResult", () => {
       position: e.position,
       status: status(e.status),
       dateReceive: date2Thai(e.dateReceive),
-      name: e.fullName,
+      name: e.prefix + e.fullName,
       type: e.requestInsignia,
       employeeType: profileType(e.profileType),
       profileType: e.profileType,
+      volumeNo: e.volumeNo,
+      section: e.section,
       page: e.page,
       number: e.no,
       vatnumber: e.number,

src/modules/07_insignia/views/ResultPage.vue

@@ -85,7 +85,6 @@ const fecthInsigniaType = async () => {
     .catch((err) => {
       messageError($q, err);
       console.log("fecthInsigniaType");
-      
     });
 };
 const visibleColumns = ref<String[]>([
@@ -96,6 +95,8 @@ const visibleColumns = ref<String[]>([
   "type",
   "dateReceive",
   "employeeType",
+  "volumeNo",
+  "section",
   "page",
   "number",
   "vatnumber",
@@ -114,7 +115,6 @@ const columns = ref<QTableProps["columns"]>([
     sort: (a: string, b: string) =>
       a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
   },
-
   {
     name: "status",
     align: "left",
@@ -142,6 +142,15 @@ const columns = ref<QTableProps["columns"]>([
     sort: (a: string, b: string) =>
       a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
   },
+  {
+    name: "employeeType",
+    align: "left",
+    label: "สถานภาพ",
+    field: "employeeType",
+    sortable: true,
+    sort: (a: string, b: string) =>
+      a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
+  },
   {
     name: "type",
     align: "left",
@@ -161,14 +170,24 @@ const columns = ref<QTableProps["columns"]>([
       a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
   },
   {
-    name: "employeeType",
+    name: "volumeNo",
     align: "left",
-    label: "สถานภาพ",
-    field: "employeeType",
+    label: "เล่มในราชกิจนุเบกษา",
+    field: "volumeNo",
     sortable: true,
     sort: (a: string, b: string) =>
       a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
   },
+  {
+    name: "section",
+    align: "left",
+    label: "ตอนในราชกิจนุเบกษา",
+    field: "section",
+    sortable: true,
+    sort: (a: string, b: string) =>
+      a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
+  },
+
   {
     name: "page",
     align: "left",
@@ -540,7 +559,10 @@ const paginationLabel = (start: number, end: number, total: number) => {
                 :borderless="false"
                 style="min-width: 150px"
                 @update:model-value="
-                  DataStore.searchData(DataStore.invoiceType,DataStore.employeeClass)
+                  DataStore.searchData(
+                    DataStore.invoiceType,
+                    DataStore.employeeClass
+                  )
                 "
               />
             </div>
@@ -561,7 +583,10 @@ const paginationLabel = (start: number, end: number, total: number) => {
                 :borderless="false"
                 style="min-width: 150px"
                 @update:model-value="
-                  DataStore.searchData(DataStore.invoiceType,DataStore.employeeClass)
+                  DataStore.searchData(
+                    DataStore.invoiceType,
+                    DataStore.employeeClass
+                  )
                 "
               />
             </div>