diff --git a/src/modules/13_salary/views/commandSalary.vue b/src/modules/13_salary/views/commandSalary.vue index 01194df84..d9b435875 100644 --- a/src/modules/13_salary/views/commandSalary.vue +++ b/src/modules/13_salary/views/commandSalary.vue @@ -5,25 +5,18 @@ import { useQuasar, type QTableProps } from "quasar"; import http from "@/plugins/http"; import config from "@/app.config"; -import type { - DataOption, - DataOption1, -} from "@/modules/10_order/interface/index/Main"; - -// import PopupHistory from "@/modules/10_order/components/PopupHistory.vue"; -import TableOrder from "@/modules/11_discipline/components/9_Order/TableOrder.vue"; +import type { DataOption1 } from "@/modules/10_order/interface/index/Main"; import { useOrderStore } from "@/modules/11_discipline/store/OrderStore"; import { useCounterMixin } from "@/stores/mixin"; -import { useOrderPlacementDataStore } from "@/modules/10_order/store"; const rows = ref([]); const $q = useQuasar(); //ใช้ noti quasar const mixin = useCounterMixin(); -const DataStore = useOrderPlacementDataStore(); const stroe = useOrderStore(); const { showLoader, hideLoader, messageError } = mixin; + /** pagination */ const pagination = ref({ descending: true, @@ -159,8 +152,6 @@ async function fetchOrderlist() { ); stroe.fetchOrder(filterListOrder); - - rows.value = stroe.mainData; }) .catch((e: any) => { messageError($q, e); @@ -485,7 +476,7 @@ function redirectToPage(id: string, status: string) { for="table" ref="table" :columns="columns" - :rows="rows" + :rows="stroe.rows" :filter="filterKeyword" row-key="subject" flat