Merge branch 'anandadev' into develop

src/modules/05_placement/components/OrderPlacement/MainOrderPlacement.vue

@@ -8,7 +8,6 @@
             v-model="fiscalyear"
             label="ปีงบประมาณ"
             dense
-            clearable
             emit-value
             map-options
             :options="fiscalyearOP"
@@ -83,7 +82,6 @@
                 v-model="OrderType"
                 label="ประเภท"
                 dense
-                clearable
                 emit-value
                 map-options
                 option-label="name"
@@ -103,7 +101,6 @@
                 v-model="OrderStatus"
                 label="สถานะ"
                 dense
-                clearable
                 emit-value
                 map-options
                 option-label="name"
@@ -220,14 +217,16 @@
 </template>
 
 <script setup lang="ts">
-import { onMounted, reactive, ref, useAttrs } from "vue";
+import { onMounted, reactive, ref, useAttrs, computed } from "vue";
 import type { QTableProps } from "quasar";
 import type { FormOrderPlacementMainData } from "@/modules/05_placement/interface/request/Main";
 import type { DataOption } from "@/modules/05_placement/interface/index/Main";
 import { useCounterMixin } from "@/stores/mixin";
 import { usePlacementDataStore } from "@/modules/05_placement/store";
 import router from "@/router";
+import { useQuasar } from "quasar";
 
+const $q = useQuasar(); //ใช้ noti quasar
 const DataStore = usePlacementDataStore();
 const pagination = ref({
   sortBy: "desc",
@@ -478,6 +477,14 @@ const rows = ref<FormOrderPlacementMainData[]>([
 let OriginalData = ref<FormOrderPlacementMainData[]>([]);
 let UpdataData = ref<FormOrderPlacementMainData[]>([]);
 
+onMounted(async () => {
+  await OriginalDataFetch();
+  fiscalYearFilter();
+  searchFilterTable();
+  OrderStatusFilter();
+  OrderTypeFilter();
+});
+
 const OriginalDataFetch = async () => {
   // API
   // await http
@@ -494,15 +501,7 @@ const OriginalDataFetch = async () => {
   UpdataData.value = OriginalData.value;
 };
 
-onMounted(async () => {
+// ดูรายการหน้าต่อไป
-  await OriginalDataFetch();
-  fiscalYearFilter();
-  searchFilterTable();
-  OrderStatusFilter();
-  OrderTypeFilter();
-});
-
-// ดูรายการสอบแข่งขัน หน้าต่อไป
 const redirectToPage = (id?: number) => {
   // router.push({ name: 'placementDetail'});
   router.push(`/placement/order/detail`);
@@ -542,7 +541,7 @@ const clickDelete = (id: string) => {
 // };
 
 const clickAdd = () => {
-  router.push({ name: "addOrderReplace" });
+  router.push({ name: "addOrderPlacement" });
 };
 
 // เลือกปีงบประมาณ

src/modules/05_placement/router.ts

@@ -10,14 +10,19 @@ const MainOther = () =>
   import("@/modules/05_placement/components/exams_other/Main.vue");
 const Placement2Detail = () =>
   import("@/modules/05_placement/components/exams_other/Detail.vue");
-const addOrderReplace = () =>
+const addOrderPlacement = () =>
-  import("@/modules/05_placement/components/OrderReplace/addOrderReplace.vue");
+  import(
+    "@/modules/05_placement/components/OrderPlacement/addOrderPlacement.vue"
+  );
 const MainOrderPlacement = () =>
-  import("@/modules/05_placement/components/OrderReplace/MainOrderReplace.vue");
+  import(
+    "@/modules/05_placement/components/OrderPlacement/MainOrderPlacement.vue"
+  );
 const detailOrderReplace = () =>
   import(
     "@/modules/05_placement/components/OrderReplace/detailOrderReplace.vue"
   );
+
 export default [
   {
     path: "/placement/Sorkorcho",
@@ -80,9 +85,9 @@ export default [
     },
   },
   {
-    path: "/placement/addOrderReplace",
+    path: "/placement/addOrderPlacement",
-    name: "addOrderReplace",
+    name: "addOrderPlacement",
-    component: addOrderReplace,
+    component: addOrderPlacement,
     meta: {
       Auth: true,
       Key: [8],