Merge branch 'develop' into devTee

src/modules/04_registry/components/Profile.vue

@@ -231,7 +231,7 @@
                 </q-item-section>
                 <q-item-section>ให้ออกจากราชการ</q-item-section>
               </q-item>
-              <q-separator />
+              <!-- <q-separator />
               <q-item
                 clickable
                 v-close-popup
@@ -252,7 +252,7 @@
                 <q-item-section style="min-width: 0px" avatar class="q-py-sm">
                 </q-item-section>
                 <q-item-section>ไล่ออกจากราชการ</q-item-section>
-              </q-item>
+              </q-item> -->
               <q-separator />
               <q-item
                 clickable

src/modules/11_discipline/components/9_Order/MainPage.vue

@@ -23,7 +23,6 @@ import { useOrderPlacementDataStore } from "@/modules/10_order/store";
 const $q = useQuasar(); //ใช้ noti quasar
 const mixin = useCounterMixin();
 const DataStore = useOrderPlacementDataStore();
-
 const stroe = useOrderStore();
 const { showLoader, hideLoader, messageError, date2Thai } = mixin;
 
@@ -120,9 +119,9 @@ const columns = ref<QTableProps["columns"]>([
 
 onMounted(async () => {
   await fiscalYearFilter();
-  await OrderStatusFilter();
   await OrderTypeFilter();
   await fetchOrderlist();
+  await OrderStatusFilter();
 });
 
 async function fetchOrderlist() {