diff --git a/src/modules/07_insignia/components/5_Borrow/Main.vue b/src/modules/07_insignia/components/5_Borrow/Main.vue
index f7d1b2ce9..293f6edd7 100644
--- a/src/modules/07_insignia/components/5_Borrow/Main.vue
+++ b/src/modules/07_insignia/components/5_Borrow/Main.vue
@@ -39,7 +39,6 @@ const fecthRound = async () => {
     .then(async (res) => {
       let data = res.data.result;
       if (data.length !== 0) {
-        await fecthInsigniaType();
         selectRoundAllOption.value = [
           {
             name: "ทั้งหมด",
@@ -63,6 +62,9 @@ const fecthRound = async () => {
         selectRound.value = data[0].id;
         yearRound.value = data[0].year;
         roundYear.value = data[0].year;
+        if (roundYear.value !== "") {
+          await fecthInsigniaType();
+        }
       }
     })
     .catch((err) => {
diff --git a/src/modules/10_order/components/Main.vue b/src/modules/10_order/components/Main.vue
index cd2a2cdb0..d98e57fe6 100644
--- a/src/modules/10_order/components/Main.vue
+++ b/src/modules/10_order/components/Main.vue
@@ -333,7 +333,7 @@ const paginationLabel = (start: string, end: string, total: string) => {
       <div class="row q-col-gutter-sm">
         <div class="row col-12 q-col-gutter-sm">
           <q-select
-            class="col-xs-12 col-sm-3 col-md-2"
+            class="col-xs-12 col-sm-3 col-md-"
             v-model="fiscalyear"
             label="ปีงบประมาณ"
             dense
@@ -404,44 +404,46 @@ const paginationLabel = (start: string, end: string, total: string) => {
         <div class="col-12">
           <q-card bordered class="col-12 filter-card q-pa-sm">
             <div class="row col-12 q-col-gutter-sm">
-              <q-select
-                class="col-xs-12 col-sm-3 col-md-2"
-                v-model="OrderType"
-                label="ประเภท"
-                dense
-                emit-value
-                map-options
-                option-label="name"
-                :options="OrderTypeOption"
-                option-value="name"
-                lazy-rules
-                hide-bottom-space
-                :readonly="false"
-                :borderless="false"
-                :outlined="true"
-                :hide-dropdown-icon="false"
-                @update:model-value="searchFilterTable"
-              />
-              <q-select
-                class="col-xs-12 col-sm-3 col-md-2"
-                v-model="OrderStatus"
-                label="สถานะ"
-                dense
-                emit-value
-                map-options
-                option-label="name"
-                :options="OrderStatusOption"
-                option-value="name"
-                lazy-rules
-                hide-bottom-space
-                :readonly="false"
-                :borderless="false"
-                :outlined="true"
-                :hide-dropdown-icon="false"
-                @update:model-value="searchFilterTable"
-              />
+              <div class="col-xs-12 col-sm-3 col-md-4">
+                <q-select
+                  v-model="OrderType"
+                  label="ประเภท"
+                  dense
+                  emit-value
+                  map-options
+                  option-label="name"
+                  :options="OrderTypeOption"
+                  option-value="name"
+                  lazy-rules
+                  hide-bottom-space
+                  :readonly="false"
+                  :borderless="false"
+                  :outlined="true"
+                  :hide-dropdown-icon="false"
+                  @update:model-value="searchFilterTable"
+                />
+              </div>
+              <div class="col-xs-12 col-sm-3 col-md-2">
+                <q-select
+                  v-model="OrderStatus"
+                  label="สถานะ"
+                  dense
+                  emit-value
+                  map-options
+                  option-label="name"
+                  :options="OrderStatusOption"
+                  option-value="name"
+                  lazy-rules
+                  hide-bottom-space
+                  :readonly="false"
+                  :borderless="false"
+                  :outlined="true"
+                  :hide-dropdown-icon="false"
+                  @update:model-value="searchFilterTable"
+                />
+              </div>
               <q-space />
-              <PopupHistory :OrderTypeOption="OrderTypeOption" />
+              <div><PopupHistory :OrderTypeOption="OrderTypeOption" /></div>
             </div>
           </q-card>
         </div>