Merge branch 'develop' into dev

* develop:
  ปิดตารางประวัติตำแหน่งไปก่อน

src/modules/10_registry/02_Government/07_Position.vue

@@ -27,7 +27,7 @@ const {
 } = useCounterMixin();
 
 const checkType = ref<boolean>(
-  dataPerson.officerType == "OFFICER" ? true : false
+  dataPerson.officerType == "OFFICER" ? true : false,
 ); // เช็คประเภทผู้ใช้งาน
 const mode = ref<boolean>($q.screen.gt.xs); // เช็คขนาดหน้าจอ ถ้าเป็นขนาดใหญ่กว่า xs จะเป็นโหมดแสดงตาราง
 const isLoading = reactive({
@@ -320,25 +320,25 @@ const columns = computed<QTableColumn[]>(() => {
         (column) =>
           column.name !== "positionExecutive" &&
           column.name !== "lastUpdateFullName" &&
-          column.name !== "lastUpdatedAt"
+          column.name !== "lastUpdatedAt",
       );
     }
   }
   return baseColumns.value.filter(
     (e: QTableColumn) =>
-      e.name !== "lastUpdateFullName" && e.name !== "lastUpdatedAt"
+      e.name !== "lastUpdateFullName" && e.name !== "lastUpdatedAt",
   );
 });
 const visibleColumns = ref<String[]>(
   baseVisibleColumns.value.filter(
-    (e: string) => e !== "lastUpdateFullName" && e !== "lastUpdatedAt"
-  )
+    (e: string) => e !== "lastUpdateFullName" && e !== "lastUpdatedAt",
+  ),
 );
 const columnsHistory = computed<QTableColumn[]>(() => {
   if (!checkType.value) {
     if (baseColumns.value) {
       return baseColumns.value.filter(
-        (column) => column.name !== "positionExecutive"
+        (column) => column.name !== "positionExecutive",
       );
     }
   }
@@ -445,7 +445,7 @@ function onSearch() {
   rows.value = onSearchDataTable(
     filter.value,
     rowsData.value,
-    columns.value ? columns.value : []
+    columns.value ? columns.value : [],
   );
 }
 
@@ -491,7 +491,7 @@ onMounted(async () => {
       </div>
     </div>
 
-    <div class="row col-12">
+    <!-- <div class="row col-12">
       <q-space />
       <q-input
         v-if="mode"
@@ -522,9 +522,9 @@ onMounted(async () => {
         :options="columns"
         :display-value="$q.lang.table.columns"
       />
-    </div>
+    </div> -->
 
-    <div class="col-12 q-mt-sm">
+    <!-- <div class="col-12 q-mt-sm">
       <d-table
         flat
         dense
@@ -649,7 +649,7 @@ onMounted(async () => {
           </div>
         </template>
       </d-table>
-    </div>
+    </div> -->
   </div>
 
   <DialogHistory

src/modules/10_registry/tabs/02_government.vue

@@ -31,7 +31,7 @@ const router = useRouter();
 
   <div :class="`row q-my-sm ${$q.screen.gt.xs ? '' : 'mobileClass'}`">
     <Government />
-    <!-- <Position /> -->
+    <Position />
     <Actposition />
     <Assistance />
     <Discipline />