From 0b9504e589ced45e36094aa135e5822700e27a65 Mon Sep 17 00:00:00 2001
From: waruneeta <warunee.auy@gmail.com>
Date: Fri, 22 Sep 2023 09:07:44 +0700
Subject: [PATCH] =?UTF-8?q?refactor=20=E0=B8=84=E0=B8=B3=E0=B8=AA=E0=B8=B1?=
 =?UTF-8?q?=E0=B9=88=E0=B8=87=20(=E0=B8=A2=E0=B8=B1=E0=B8=87=E0=B9=84?=
 =?UTF-8?q?=E0=B8=A1=E0=B9=88=E0=B9=80=E0=B8=AA=E0=B8=A3=E0=B9=87=E0=B8=88?=
 =?UTF-8?q?)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/modules/10_order/components/Main.vue      | 566 ------------------
 .../10_order/components/step/step04.vue       |   4 +-
 src/modules/10_order/router.ts                |   2 +-
 src/modules/10_order/views/Main.vue           | 519 +++++++++++++++-
 4 files changed, 519 insertions(+), 572 deletions(-)
 delete mode 100644 src/modules/10_order/components/Main.vue

diff --git a/src/modules/10_order/components/Main.vue b/src/modules/10_order/components/Main.vue
deleted file mode 100644
index 270f95849..000000000
--- a/src/modules/10_order/components/Main.vue
+++ /dev/null
@@ -1,566 +0,0 @@
-<script setup lang="ts">
-import { onMounted, reactive, ref, useAttrs, computed } from "vue";
-import type { QTableProps } from "quasar";
-import type { FormOrderPlacementMainData } from "@/modules/10_order/interface/request/Main";
-import type {
-  DataOption,
-  DataOption1,
-} from "@/modules/10_order/interface/index/Main";
-import { useCounterMixin } from "@/stores/mixin";
-import { useOrderPlacementDataStore } from "@/modules/10_order/store";
-import router from "@/router";
-import { useQuasar } from "quasar";
-import http from "@/plugins/http";
-import config from "@/app.config";
-import PopupHistory from "./PopupHistory.vue";
-const $q = useQuasar(); //ใช้ noti quasar
-const mixin = useCounterMixin();
-const { showLoader, hideLoader, messageError, date2Thai } = mixin;
-const DataStore = useOrderPlacementDataStore();
-
-const pagination = ref({
-  // sortBy: "OrderDate,OrderType",
-  descending: true,
-  page: 1,
-  rowsPerPage: 10,
-});
-
-const visibleColumns = ref<string[]>([
-  "Order",
-  "OrderType",
-  "OrderNum",
-  "OrderDate",
-  "OrderBy",
-  "Signer",
-  "OrderStatus",
-]);
-
-// หัวตาราง
-const columns = ref<QTableProps["columns"]>([
-  {
-    name: "Order",
-    align: "left",
-    label: "คำสั่ง",
-    sortable: true,
-    field: "Order",
-    headerStyle: "font-size: 14px",
-    style: "font-size: 14px",
-    sort: (a: string, b: string) =>
-      a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
-  },
-  {
-    name: "OrderNum",
-    align: "left",
-    label: "เลขที่คำสั่ง",
-    sortable: true,
-    field: "OrderNum",
-    headerStyle: "font-size: 14px",
-    style: "font-size: 14px",
-  },
-  {
-    name: "OrderType",
-    align: "left",
-    label: "ประเภท",
-    sortable: false,
-    field: "OrderType",
-    headerStyle: "font-size: 14px",
-    style: "font-size: 14px",
-    sort: (a: string, b: string) =>
-      a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
-  },
-  {
-    name: "OrderDate",
-    align: "left",
-    label: "สั่ง ณ วันที่/วันที่คำสั่งมีผล",
-    sortable: true,
-    field: "OrderDate",
-    headerStyle: "font-size: 14px",
-    style: "font-size: 14px",
-    sort: (a, b) => parseInt(a) - parseInt(b),
-  },
-  {
-    name: "OrderBy",
-    align: "left",
-    label: "คำสั่งโดย",
-    sortable: true,
-    field: "OrderBy",
-    headerStyle: "font-size: 14px",
-    style: "font-size: 14px",
-    sort: (a: string, b: string) =>
-      a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
-  },
-  {
-    name: "Signer",
-    align: "left",
-    label: "ผู้ลงนาม",
-    sortable: false,
-    field: "Signer",
-    headerStyle: "font-size: 14px",
-    style: "font-size: 14px",
-    sort: (a: string, b: string) =>
-      a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
-  },
-  {
-    name: "OrderStatus",
-    align: "center",
-    label: "สถานะคำสั่ง",
-    sortable: false,
-    field: "OrderStatus",
-    headerStyle: "font-size: 14px",
-    style: "font-size: 14px",
-    sort: (a: string, b: string) =>
-      a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
-  },
-  {
-    name: "fiscalYear",
-    align: "left",
-    label: "ปีงบประมาณ",
-    sortable: true,
-    field: "fiscalYear",
-    headerStyle: "font-size: 14px",
-    style: "font-size: 14px",
-  },
-]);
-
-// ข้อมูลตาราง (จำลอง)
-const rows = ref<FormOrderPlacementMainData[]>([]);
-
-let OriginalData = ref<FormOrderPlacementMainData[]>([]);
-let UpdataData = ref<FormOrderPlacementMainData[]>([]);
-
-onMounted(async () => {
-  await OriginalDataFetch();
-  fiscalYearFilter();
-  searchFilterTable();
-  OrderStatusFilter();
-  OrderTypeFilter();
-});
-
-const OriginalDataFetch = async () => {
-  showLoader();
-  await http
-    .get(config.API.listOrder())
-    .then((res: any) => {
-      rows.value = res.data.result.map((e: any) => ({
-        orderId: e.orderId,
-        Order: e.orderName,
-        OrderNum:
-          e.orderNo == "" ? "-" : `${e.orderNo}/${Number(e.fiscalYear) + 543}`,
-        fiscalYear: Number(e.fiscalYear),
-        OrderDate: date2Thai(e.orderDate),
-        OrderBy: e.orderBy,
-        Signer: e.signatoryBy,
-        OrderStatus: e.orderStatusName,
-        orderStatusValue: e.orderStatusValue,
-        OrderType: e.orderTypeName,
-        orderTypeValue: e.orderTypeValue,
-      }));
-    })
-    .catch((e: any) => {
-      messageError($q, e);
-    })
-    .finally(async () => {
-      hideLoader();
-    });
-  await DataStore.DataMainOrder(rows.value);
-  OriginalData.value = await DataStore.DataMainOrigOrder;
-  UpdataData.value = OriginalData.value;
-};
-
-// ดูรายการหน้าต่อไป
-const redirectToPage = (id?: string, status?: string) => {
-  let step = 1;
-  switch (status) {
-    case "จัดทำร่างคำสั่ง":
-      step = 1;
-      break;
-    case "บัญชีแนบท้าย":
-      step = 2;
-      break;
-    case "เลือกผู้ได้รับสำเนาคำสั่ง":
-      step = 3;
-      break;
-    default:
-      step = 4;
-      break;
-  }
-  router.push(`/order/detail/${id}?step=${step}`);
-};
-
-// const clickDelete = (id: string) => {
-//   dialogRemove(
-//     $q,
-//     () => deleteData(id),
-//   );
-
-// };
-
-// const deleteData = async (id: string) => {
-//   showLoader();
-//   await http
-//     .delete(config.API.deleteOrder(id))
-//     .then((res) => {
-//       success($q, "ลบข้อมูลสำเร็จ");
-//     })
-//     .catch((e) => {
-//       messageError($q, e);
-//     })
-//     .finally(async () => {
-//       hideLoader();
-//       await OriginalDataFetch();
-//       fiscalYearFilter();
-//       searchFilterTable();
-//       OrderStatusFilter();
-//       OrderTypeFilter();
-//     });
-// };
-
-const clickAdd = () => {
-  router.push({ name: "OrderAdd" });
-};
-
-// const viewDetail = (id: string, status: string) => {
-//   if (status == "checkPayment") {
-//     router.push(`${route.fullPath}/payment/${id}`);
-//   } else {
-//     router.push(`${route.fullPath}/profile/${id}`);
-//   }
-// };
-
-// เลือกปีงบประมาณ
-const fiscalyear = ref<number | null>(0);
-const fiscalyearOP = reactive<DataOption[]>([{ id: 0, name: "ทั้งหมด" }]);
-const addedfiscalYearValues: number[] = [];
-const fiscalYearFilter = async () => {
-  await http.get(config.API.yearOptionsOrder()).then((res) => {
-    const response = res.data.result;
-    fiscalyearOP.push(...response);
-  });
-};
-
-const OrderType = ref<string>("");
-const OrderTypeOption = reactive<DataOption1[]>([{ id: "", name: "ทั้งหมด" }]);
-const addedOrderTypeValues: string[] = [];
-const OrderTypeFilter = async () => {
-  await http
-    .get(config.API.typeOrder())
-    .then((res) => {
-      const response = res.data.result;
-      OrderTypeOption.push(...response);
-    })
-    .catch((e) => {
-      messageError($q, e);
-    });
-};
-const OrderStatus = ref<string>("");
-const OrderStatusText = ref<FormOrderPlacementMainData[]>(
-  DataStore.DataMainOrigOrder
-);
-const OrderStatusOption = reactive<DataOption1[]>([
-  { id: "", name: "ทั้งหมด" },
-]);
-const addedOrderStatusValues: string[] = [];
-const OrderStatusFilter = async () => {
-  for (let data of OriginalData.value) {
-    const OrderStatusValue = data.OrderStatus;
-
-    if (
-      OrderStatusValue === null ||
-      parseInt(OrderStatusValue) > parseInt(OrderStatusValue)
-    ) {
-      OrderStatus.value = OrderStatusValue;
-    }
-
-    if (!addedOrderStatusValues.includes(OrderStatusValue)) {
-      OrderStatusOption.push({
-        // id: OrderStatusValue,
-        id: OrderStatusOption.length.toString(),
-        name: OrderStatusValue,
-      });
-      addedOrderStatusValues.push(OrderStatusValue);
-    }
-  }
-};
-// ค้นหาในตาราง
-const filterKeyword = ref<string>("");
-const filterRef = ref<any>(null);
-const resetFilter = () => {
-  filterKeyword.value = "";
-  filterRef.value.focus();
-};
-
-const attrs = ref<any>(useAttrs());
-
-const searchFilterTable = async () => {
-  if (OrderType.value == "ทั้งหมด") {
-    OrderType.value = "";
-  }
-  if (OrderStatus.value == "ทั้งหมด") {
-    OrderStatus.value = "";
-  }
-
-  await DataStore.DataUpdateOrder(
-    OrderType.value,
-    OrderStatus.value,
-    fiscalyear.value
-  );
-  UpdataData.value = DataStore.DataMainUpdateOrder;
-};
-
-const paging = ref<boolean>(true);
-const paginationLabel = (start: string, end: string, total: string) => {
-  if (paging.value == true) return " " + start + "-" + end + " ใน " + total;
-  else return start + "-" + end + " ใน " + total;
-};
-</script>
-
-<template>
-  <div class="toptitle text-dark col-12 row items-center">ออกคำสั่ง</div>
-  <div>
-    <q-card flat bordered class="col-12 q-mt-sm q-pa-md">
-      <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-"
-            v-model="fiscalyear"
-            label="ปีงบประมาณ"
-            dense
-            emit-value
-            map-options
-            :options="fiscalyearOP"
-            option-value="id"
-            option-label="name"
-            lazy-rules
-            hide-bottom-space
-            :readonly="false"
-            :borderless="false"
-            :outlined="true"
-            :hide-dropdown-icon="false"
-            @update:model-value="searchFilterTable"
-          />
-          <div>
-            <q-btn
-              size="12px"
-              flat
-              round
-              color="add"
-              icon="mdi-plus"
-              @click="clickAdd"
-            >
-              <q-tooltip>เพิ่มข้อมูล</q-tooltip>
-            </q-btn>
-          </div>
-          <q-space />
-
-          <q-input
-            class="col-xs-12 col-sm-3 col-md-2"
-            standout
-            dense
-            v-model="filterKeyword"
-            ref="filterRef"
-            outlined
-            debounce="300"
-            placeholder="ค้นหา"
-          >
-            <template v-slot:append>
-              <q-icon v-if="filterKeyword == ''" name="search" />
-              <q-icon
-                v-if="filterKeyword !== ''"
-                name="clear"
-                class="cursor-pointer"
-                @click="resetFilter"
-              />
-            </template>
-          </q-input>
-
-          <q-select
-            v-model="visibleColumns"
-            multiple
-            outlined
-            dense
-            options-dense
-            :display-value="$q.lang.table.columns"
-            emit-value
-            map-options
-            :options="columns"
-            option-value="name"
-            options-cover
-            style="min-width: 150px"
-            class="col-xs-12 col-sm-3 col-md-2"
-          />
-        </div>
-        <div class="col-12">
-          <q-card bordered class="col-12 filter-card q-pa-sm">
-            <div class="row col-12 q-col-gutter-sm">
-              <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 />
-              <div><PopupHistory :OrderTypeOption="OrderTypeOption" /></div>
-            </div>
-          </q-card>
-        </div>
-        <div class="col-12">
-          <q-table
-            ref="table"
-            :columns="columns"
-            :rows="UpdataData"
-            :filter="filterKeyword"
-            row-key="Order"
-            flat
-            bordered
-            :paging="true"
-            dense
-            class="custom-header-table"
-            v-bind="attrs"
-            :visible-columns="visibleColumns"
-            :pagination-label="paginationLabel"
-            v-model:pagination="pagination"
-          >
-            <template v-slot:header="props">
-              <q-tr :props="props">
-                <q-th v-for="col in props.cols" :key="col.name" :props="props">
-                  <span class="text-weight-medium">{{ col.label }}</span>
-                </q-th>
-                <!-- <q-th auto-width /> -->
-              </q-tr>
-            </template>
-            <template v-slot:body="props">
-              <q-tr
-                :props="props"
-                class="cursor-pointer"
-                @click="
-                  redirectToPage(props.row.orderId, props.row.OrderStatus)
-                "
-              >
-                <q-td key="Order" :props="props">
-                  {{ props.row.Order }}
-                </q-td>
-                <q-td key="OrderNum" :props="props">
-                  {{ props.row.OrderNum }}
-                </q-td>
-                <q-td key="OrderType" :props="props">
-                  {{ props.row.OrderType }}
-                </q-td>
-                <q-td key="OrderDate" :props="props">
-                  {{ props.row.OrderDate }}
-                </q-td>
-                <q-td key="OrderBy" :props="props">
-                  {{ props.row.OrderBy }}
-                </q-td>
-                <q-td key="Signer" :props="props">
-                  {{ props.row.Signer }}
-                </q-td>
-                <q-td key="OrderStatus" :props="props">
-                  {{ props.row.OrderStatus }}
-                </q-td>
-                <!-- <q-td auto-width>
-                  <q-btn dense size="12px" flat round color="red" @click.stop="clickDelete(props.row.orderId)"
-                    icon="mdi-delete">
-                    <q-tooltip>ลบข้อมูล</q-tooltip>
-                  </q-btn>
-                </q-td> -->
-              </q-tr>
-            </template>
-            <template v-slot:pagination="scope">
-              <q-pagination
-                v-model="pagination.page"
-                active-color="primary"
-                color="dark"
-                :max="scope.pagesNumber"
-                :max-pages="5"
-                size="sm"
-                boundary-links
-                direction-links
-              ></q-pagination>
-            </template>
-          </q-table>
-        </div>
-      </div>
-    </q-card>
-  </div>
-</template>
-
-<style lang="scss" scope>
-.filter-card {
-  background-color: #f1f1f1b0;
-}
-
-.toggle-expired-account {
-  font-size: 12px;
-  font-weight: 400;
-  font-size: 15px;
-  line-height: 150%;
-  color: #35373c;
-}
-
-.icon-color {
-  color: #4154b3;
-}
-
-.custom-header-table {
-  max-height: 64vh;
-
-  .q-table tr:nth-child(odd) td {
-    background: white;
-  }
-
-  .q-table tr:nth-child(even) td {
-    background: #f8f8f8;
-  }
-
-  .q-table thead tr {
-    background: #ecebeb;
-  }
-
-  .q-table thead tr th {
-    position: sticky;
-    z-index: 1;
-  }
-
-  /* this will be the loading indicator */
-  .q-table thead tr:last-child th {
-    /* height of all previous header rows */
-    top: 48px;
-  }
-
-  .q-table thead tr:first-child th {
-    top: 0;
-  }
-}
-</style>
diff --git a/src/modules/10_order/components/step/step04.vue b/src/modules/10_order/components/step/step04.vue
index d2c1d305f..7ea3fc69c 100644
--- a/src/modules/10_order/components/step/step04.vue
+++ b/src/modules/10_order/components/step/step04.vue
@@ -562,7 +562,7 @@ const viewFileUpload = async (url: string) => {
                         @click="viewFileUpload(OrderPDFUpload)">
                         <q-tooltip>ดูไฟล์คำสั่ง</q-tooltip>
                       </q-btn>
-                      <q-btn type="a" :href="OrderPDFUpload" size="12px" flat dense color="red" icon="mdi-download"
+                      <q-btn type="a" :href="OrderPDFUpload" download="คำสั่ง.pdf" size="12px" flat dense color="red" icon="mdi-download"
                         target="_blank">
                         <q-tooltip>ดาวน์โหลดไฟล์คำสั่ง</q-tooltip>
                       </q-btn>
@@ -590,7 +590,7 @@ const viewFileUpload = async (url: string) => {
                         @click="viewFileUpload(TailerPDFUpload)">
                         <q-tooltip>ดูเอกสารแนบท้าย</q-tooltip>
                       </q-btn>
-                      <q-btn type="a" :href="TailerPDFUpload" size="12px" flat dense color="red" icon="mdi-download"
+                      <q-btn type="a" :href="TailerPDFUpload" download="เอกสารแนบท้าย.pdf" size="12px" flat dense color="red" icon="mdi-download"
                         target="_blank">
                         <q-tooltip>ดาวน์โหลดเอกสารแนบท้าย</q-tooltip>
                       </q-btn>
diff --git a/src/modules/10_order/router.ts b/src/modules/10_order/router.ts
index b037ac2af..34b147be8 100644
--- a/src/modules/10_order/router.ts
+++ b/src/modules/10_order/router.ts
@@ -1,4 +1,4 @@
-const MainOrder = () => import("@/modules/10_order/components/Main.vue");
+const MainOrder = () => import("@/modules/10_order/views/Main.vue");
 const DetailPage = () => import("@/modules/10_order/components/Detail.vue");
 
 export default [
diff --git a/src/modules/10_order/views/Main.vue b/src/modules/10_order/views/Main.vue
index dc47857b9..51c527d70 100644
--- a/src/modules/10_order/views/Main.vue
+++ b/src/modules/10_order/views/Main.vue
@@ -1,7 +1,520 @@
 <script setup lang="ts">
+import { onMounted, reactive, ref, useAttrs } from "vue";
+import type { QTableProps } from "quasar";
+import type { FormOrderPlacementMainData } from "@/modules/10_order/interface/request/Main";
+import type {
+  DataOption,
+  DataOption1,
+} from "@/modules/10_order/interface/index/Main";
+import { useCounterMixin } from "@/stores/mixin";
+import { useOrderPlacementDataStore } from "@/modules/10_order/store";
+import router from "@/router";
+import { useQuasar } from "quasar";
+import http from "@/plugins/http";
+import config from "@/app.config";
+import PopupHistory from "@/modules/10_order/components/PopupHistory.vue";
+const $q = useQuasar(); //ใช้ noti quasar
+const mixin = useCounterMixin();
+const { showLoader, hideLoader, messageError, date2Thai } = mixin;
+const DataStore = useOrderPlacementDataStore();
+
+const pagination = ref({
+  descending: true,
+  page: 1,
+  rowsPerPage: 10,
+});
+
+const visibleColumns = ref<string[]>([
+  "Order",
+  "OrderNum",
+  "OrderType",
+  "OrderDate",
+  "OrderBy",
+  "Signer",
+  "OrderStatus",
+]);
+
+// คอลัมน์ของตาราง
+const columns = ref<QTableProps["columns"]>([
+  {
+    name: "Order",
+    align: "left",
+    label: "คำสั่ง",
+    sortable: true,
+    field: "Order",
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+    sort: (a: string, b: string) =>
+      a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
+  },
+  {
+    name: "OrderNum",
+    align: "left",
+    label: "เลขที่คำสั่ง",
+    sortable: true,
+    field: "OrderNum",
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+  },
+  {
+    name: "OrderType",
+    align: "left",
+    label: "ประเภท",
+    sortable: false,
+    field: "OrderType",
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+    sort: (a: string, b: string) =>
+      a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
+  },
+  {
+    name: "OrderDate",
+    align: "left",
+    label: "สั่ง ณ วันที่/วันที่คำสั่งมีผล",
+    sortable: true,
+    field: "OrderDate",
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+    sort: (a, b) => parseInt(a) - parseInt(b),
+  },
+  {
+    name: "OrderBy",
+    align: "left",
+    label: "คำสั่งโดย",
+    sortable: true,
+    field: "OrderBy",
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+    sort: (a: string, b: string) =>
+      a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
+  },
+  {
+    name: "Signer",
+    align: "left",
+    label: "ผู้ลงนาม",
+    sortable: true,
+    field: "Signer",
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+    sort: (a: string, b: string) =>
+      a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
+  },
+  {
+    name: "OrderStatus",
+    align: "center",
+    label: "สถานะคำสั่ง",
+    sortable: true,
+    field: "OrderStatus",
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+    sort: (a: string, b: string) =>
+      a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
+  },
+]);
+
+onMounted(async () => {
+  await OriginalDataFetch();
+  fiscalYearFilter();
+  searchFilterTable();
+  OrderStatusFilter();
+  OrderTypeFilter();
+});
+
+// ข้อมูลตาราง
+const rows = ref<FormOrderPlacementMainData[]>([]);
+let OriginalData = ref<FormOrderPlacementMainData[]>([]);
+let UpdataData = ref<FormOrderPlacementMainData[]>([]);
+
+const OriginalDataFetch = async () => {
+  showLoader();
+  await http
+    .get(config.API.listOrder())
+    .then((res: any) => {
+      rows.value = res.data.result.map((e: any) => ({
+        orderId: e.orderId,
+        Order: e.orderName,
+        OrderNum:
+          e.orderNo == "" ? "-" : `${e.orderNo}/${Number(e.fiscalYear) + 543}`,
+        fiscalYear: Number(e.fiscalYear),
+        OrderDate: date2Thai(e.orderDate),
+        OrderBy: e.orderBy,
+        Signer: e.signatoryBy,
+        OrderStatus: e.orderStatusName,
+        orderStatusValue: e.orderStatusValue,
+        OrderType: e.orderTypeName,
+        orderTypeValue: e.orderTypeValue,
+      }));
+    })
+    .catch((e: any) => {
+      messageError($q, e);
+    })
+    .finally(async () => {
+      hideLoader();
+    });
+  await DataStore.DataMainOrder(rows.value);
+  OriginalData.value = await DataStore.DataMainOrigOrder;
+  UpdataData.value = OriginalData.value;
+};
+
+// redirect ไปยัง step ปัจจุบัน
+const redirectToPage = (id?: string, status?: string) => {
+  let step = 1;
+  switch (status) {
+    case "จัดทำร่างคำสั่ง":
+      step = 1;
+      break;
+    case "บัญชีแนบท้าย":
+      step = 2;
+      break;
+    case "เลือกผู้ได้รับสำเนาคำสั่ง":
+      step = 3;
+      break;
+    default:
+      step = 4;
+      break;
+  }
+  router.push(`/order/detail/${id}?step=${step}`);
+};
+
+// สร้างคำสั่งใหม่
+const clickAdd = () => {
+  router.push({ name: "OrderAdd" });
+};
+
+// รายการข้อมูลปีงบประมาณ
+const fiscalyear = ref<number | null>(0);
+const fiscalyearOP = reactive<DataOption[]>([{ id: 0, name: "ทั้งหมด" }]);
+const fiscalYearFilter = async () => {
+  await http.get(config.API.yearOptionsOrder()).then((res) => {
+    const response = res.data.result;
+    fiscalyearOP.push(...response);
+  });
+};
+
+// รายการข้อมูลประเภทคำสั่ง
+const OrderType = ref<string>("");
+const OrderTypeOption = reactive<DataOption1[]>([{ id: "", name: "ทั้งหมด" }]);
+const OrderTypeFilter = async () => {
+  await http
+    .get(config.API.typeOrder())
+    .then((res) => {
+      const response = res.data.result;
+      OrderTypeOption.push(...response);
+    })
+    .catch((e) => {
+      messageError($q, e);
+    });
+};
+
+// รายการข้อมูลสถานะคำสั่ง
+const OrderStatus = ref<string>("");
+const OrderStatusOption = reactive<DataOption1[]>([
+  { id: "", name: "ทั้งหมด" },
+]);
+const addedOrderStatusValues: string[] = [];
+const OrderStatusFilter = async () => {
+  for (let data of OriginalData.value) {
+    const OrderStatusValue = data.OrderStatus;
+
+    if (
+      OrderStatusValue === null ||
+      parseInt(OrderStatusValue) > parseInt(OrderStatusValue)
+    ) {
+      OrderStatus.value = OrderStatusValue;
+    }
+
+    if (!addedOrderStatusValues.includes(OrderStatusValue)) {
+      OrderStatusOption.push({
+        // id: OrderStatusValue,
+        id: OrderStatusOption.length.toString(),
+        name: OrderStatusValue,
+      });
+      addedOrderStatusValues.push(OrderStatusValue);
+    }
+  }
+};
+
+// ค้นหาในตาราง
+const filterKeyword = ref<string>("");
+const filterRef = ref<any>(null);
+const resetFilter = () => {
+  filterKeyword.value = "";
+  filterRef.value.focus();
+};
+
+const attrs = ref<any>(useAttrs());
+
+const searchFilterTable = async () => {
+  if (OrderType.value == "ทั้งหมด") {
+    OrderType.value = "";
+  }
+  if (OrderStatus.value == "ทั้งหมด") {
+    OrderStatus.value = "";
+  }
+
+  // ส่งไป filter รายการข้อมูลตามเงื่อนไข
+  await DataStore.DataUpdateOrder(
+    OrderType.value,
+    OrderStatus.value,
+    fiscalyear.value
+  );
+  UpdataData.value = DataStore.DataMainUpdateOrder;
+};
+
+const paging = ref<boolean>(true);
+const paginationLabel = (start: string, end: string, total: string) => {
+  if (paging.value == true) return " " + start + "-" + end + " ใน " + total;
+  else return start + "-" + end + " ใน " + total;
+};
 </script>
+
 <template>
-  <div class="toptitle text-dark col-12 row items-center">
-    คำสั่ง
+  <div class="toptitle text-dark col-12 row items-center">ออกคำสั่ง</div>
+  <div>
+    <q-card flat bordered class="col-12 q-mt-sm q-pa-md">
+      <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-"
+            v-model="fiscalyear"
+            label="ปีงบประมาณ"
+            dense
+            emit-value
+            map-options
+            :options="fiscalyearOP"
+            option-value="id"
+            option-label="name"
+            lazy-rules
+            hide-bottom-space
+            :readonly="false"
+            :borderless="false"
+            :outlined="true"
+            :hide-dropdown-icon="false"
+            @update:model-value="searchFilterTable"
+          />
+          <div>
+            <q-btn
+              size="12px"
+              flat
+              round
+              color="add"
+              icon="mdi-plus"
+              @click="clickAdd"
+            >
+              <q-tooltip>เพิ่มข้อมูล</q-tooltip>
+            </q-btn>
+          </div>
+          <q-space />
+
+          <q-input
+            class="col-xs-12 col-sm-3 col-md-2"
+            standout
+            dense
+            v-model="filterKeyword"
+            ref="filterRef"
+            outlined
+            debounce="300"
+            placeholder="ค้นหา"
+          >
+            <template v-slot:append>
+              <q-icon v-if="filterKeyword == ''" name="search" />
+              <q-icon
+                v-if="filterKeyword !== ''"
+                name="clear"
+                class="cursor-pointer"
+                @click="resetFilter"
+              />
+            </template>
+          </q-input>
+
+          <q-select
+            v-model="visibleColumns"
+            multiple
+            outlined
+            dense
+            options-dense
+            :display-value="$q.lang.table.columns"
+            emit-value
+            map-options
+            :options="columns"
+            option-value="name"
+            options-cover
+            style="min-width: 150px"
+            class="col-xs-12 col-sm-3 col-md-2"
+          />
+        </div>
+        <div class="col-12">
+          <q-card bordered class="col-12 filter-card q-pa-sm">
+            <div class="row col-12 q-col-gutter-sm">
+              <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 />
+              <div><PopupHistory :OrderTypeOption="OrderTypeOption" /></div>
+            </div>
+          </q-card>
+        </div>
+        <div class="col-12">
+          <q-table
+            ref="table"
+            :columns="columns"
+            :rows="UpdataData"
+            :filter="filterKeyword"
+            row-key="Order"
+            flat
+            bordered
+            :paging="true"
+            dense
+            class="custom-header-table"
+            v-bind="attrs"
+            :visible-columns="visibleColumns"
+            :pagination-label="paginationLabel"
+            v-model:pagination="pagination"
+          >
+            <template v-slot:header="props">
+              <q-tr :props="props">
+                <q-th v-for="col in props.cols" :key="col.name" :props="props">
+                  <span class="text-weight-medium">{{ col.label }}</span>
+                </q-th>
+                <!-- <q-th auto-width /> -->
+              </q-tr>
+            </template>
+            <template v-slot:body="props">
+              <q-tr
+                :props="props"
+                class="cursor-pointer"
+                @click="
+                  redirectToPage(props.row.orderId, props.row.OrderStatus)
+                "
+              >
+                <q-td key="Order" :props="props">
+                  {{ props.row.Order }}
+                </q-td>
+                <q-td key="OrderNum" :props="props">
+                  {{ props.row.OrderNum }}
+                </q-td>
+                <q-td key="OrderType" :props="props">
+                  {{ props.row.OrderType }}
+                </q-td>
+                <q-td key="OrderDate" :props="props">
+                  {{ props.row.OrderDate }}
+                </q-td>
+                <q-td key="OrderBy" :props="props">
+                  {{ props.row.OrderBy }}
+                </q-td>
+                <q-td key="Signer" :props="props">
+                  {{ props.row.Signer }}
+                </q-td>
+                <q-td key="OrderStatus" :props="props">
+                  {{ props.row.OrderStatus }}
+                </q-td>
+                <!-- <q-td auto-width>
+                  <q-btn dense size="12px" flat round color="red" @click.stop="clickDelete(props.row.orderId)"
+                    icon="mdi-delete">
+                    <q-tooltip>ลบข้อมูล</q-tooltip>
+                  </q-btn>
+                </q-td> -->
+              </q-tr>
+            </template>
+            <template v-slot:pagination="scope">
+              <q-pagination
+                v-model="pagination.page"
+                active-color="primary"
+                color="dark"
+                :max="scope.pagesNumber"
+                :max-pages="5"
+                size="sm"
+                boundary-links
+                direction-links
+              ></q-pagination>
+            </template>
+          </q-table>
+        </div>
+      </div>
+    </q-card>
   </div>
-</template>
\ No newline at end of file
+</template>
+
+<style lang="scss" scope>
+.filter-card {
+  background-color: #f1f1f1b0;
+}
+
+.toggle-expired-account {
+  font-size: 12px;
+  font-weight: 400;
+  font-size: 15px;
+  line-height: 150%;
+  color: #35373c;
+}
+
+.icon-color {
+  color: #4154b3;
+}
+
+.custom-header-table {
+  max-height: 64vh;
+
+  .q-table tr:nth-child(odd) td {
+    background: white;
+  }
+
+  .q-table tr:nth-child(even) td {
+    background: #f8f8f8;
+  }
+
+  .q-table thead tr {
+    background: #ecebeb;
+  }
+
+  .q-table thead tr th {
+    position: sticky;
+    z-index: 1;
+  }
+
+  /* this will be the loading indicator */
+  .q-table thead tr:last-child th {
+    /* height of all previous header rows */
+    top: 48px;
+  }
+
+  .q-table thead tr:first-child th {
+    top: 0;
+  }
+}
+</style>
\ No newline at end of file