updated

src/modules/11_discipline/components/7_ListSuspend/ListsPage.vue

@@ -27,7 +27,7 @@ const visibleColumns = ref<string[]>([
   "no",
   "title",
   "name",
-  "position",
+  "positionType",
   "positionLevel",
   "organization",
   "dateTotal",
@@ -70,23 +70,19 @@ const columns = ref<QTableProps["columns"]>([
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
   },
-  {
-    name: "position",
-    align: "left",
-    label: "ตำแหน่งในสายงาน",
-    sortable: true,
-    field: "position",
-    headerStyle: "font-size: 14px",
-    style: "font-size: 14px",
-  },
   {
     name: "positionLevel",
     align: "left",
-    label: "ระดับตำแหน่ง",
+    label: "ประเภทตำแหน่ง",
     sortable: true,
     field: "positionLevel",
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
+    format: (val, row) => {
+      return row.positionLevel
+        ? `${row.positionType} (${row.positionLevel})`
+        : "-";
+    },
   },
   {
     name: "organization",
@@ -160,7 +156,7 @@ function openModalOrder() {
       r.statusEn == "PENDING" &&
       r.name &&
       r.organization &&
-      r.position &&
+      r.positionType &&
       r.positionLevel &&
       r.posNo &&
       r.organization
@@ -244,6 +240,7 @@ onMounted(() => {
   dataStore.visibleColumns = visibleColumns.value;
 });
 </script>
+
 <template>
   <div class="toptitle text-dark col-12 row items-center">
     รายชื่อผู้ถูกพักราชการ