filter ออกคำสั่ง

src/modules/10_order/views/Main.vue

@@ -207,9 +207,9 @@ const OrderTypeFilter = async () => {
 };
 
 // รายการข้อมูลสถานะคำสั่ง
-const OrderStatus = ref<string>("");
+const OrderStatus = ref<string>("ทั้งหมด");
 const OrderStatusOption = reactive<DataOption1[]>([
-  { id: "", name: "ทั้งหมด" },
+  { id: "ทั้งหมด", name: "ทั้งหมด" },
 ]);
 const addedOrderStatusValues: string[] = [];
 const OrderStatusFilter = async () => {
@@ -245,13 +245,6 @@ const resetFilter = () => {
 const attrs = ref<any>(useAttrs());
 
 const searchFilterTable = async () => {
-  if (OrderType.value == "ทั้งหมด") {
-    OrderType.value = "";
-  }
-  if (OrderStatus.value == "ทั้งหมด") {
-    OrderStatus.value = "";
-  }
-
   // ส่งไป filter รายการข้อมูลตามเงื่อนไข
   await DataStore.DataUpdateOrder(
     OrderType.value,
@@ -355,7 +348,7 @@ const paginationLabel = (start: string, end: string, total: string) => {
                   map-options
                   option-label="name"
                   :options="OrderTypeOption"
-                  option-value="name"
+                  option-value="id"
                   lazy-rules
                   hide-bottom-space
                   :readonly="false"
@@ -365,7 +358,7 @@ const paginationLabel = (start: string, end: string, total: string) => {
                   @update:model-value="searchFilterTable"
                 />
               </div>
-              <div class="col-xs-12 col-sm-3 col-md-2">
+              <div class="col-xs-12 col-sm-3 col-md-3">
                 <q-select
                   v-model="OrderStatus"
                   label="สถานะ"
@@ -517,4 +510,4 @@ const paginationLabel = (start: string, end: string, total: string) => {
     top: 0;
   }
 }
-</style>
+</style>