From 68b788491b87baaf65bbbe96e9344ec874beb863 Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Fri, 12 Jan 2024 09:56:39 +0700
Subject: [PATCH] =?UTF-8?q?=E0=B8=9B=E0=B8=A3=E0=B8=B1=E0=B8=9A=20=20?=
 =?UTF-8?q?=E0=B8=AD=E0=B8=AD=E0=B8=81=E0=B8=84=E0=B8=B3=E0=B8=AA=E0=B8=B1?=
 =?UTF-8?q?=E0=B9=88=E0=B8=87=E0=B8=A5=E0=B8=87=E0=B9=82=E0=B8=97=E0=B8=A9?=
 =?UTF-8?q?=E0=B8=97=E0=B8=B2=E0=B8=87=E0=B8=A7=E0=B8=B4=E0=B8=99=E0=B8=B1?=
 =?UTF-8?q?=E0=B8=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/modules/10_order/components/step/step02.vue | 6 +++++-
 src/modules/10_order/components/step/step04.vue | 3 +--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/modules/10_order/components/step/step02.vue b/src/modules/10_order/components/step/step02.vue
index 1d8780048..8ba0b009a 100644
--- a/src/modules/10_order/components/step/step02.vue
+++ b/src/modules/10_order/components/step/step02.vue
@@ -40,6 +40,8 @@ const {
 
 const route = useRoute();
 const $q = useQuasar();
+
+const routeName = ref<string>(route.name ? route.name.toString() : "");
 const modalData = ref<any>({
   salaryAmount: null,
   positionSalaryAmount: null,
@@ -715,7 +717,9 @@ const pagination = ref({
             :visible-columns="visibleColumns"
             :filter="filter"
             row-key="name"
-            selection="multiple"
+            :selection="
+              routeName === 'disciplineOrderDatail' ? 'single' : 'multiple'
+            "
             v-model:selected="selected"
           >
             <template v-slot:header="props">
diff --git a/src/modules/10_order/components/step/step04.vue b/src/modules/10_order/components/step/step04.vue
index 34cb354f8..a90a1df7a 100644
--- a/src/modules/10_order/components/step/step04.vue
+++ b/src/modules/10_order/components/step/step04.vue
@@ -50,11 +50,9 @@ const dataGen = ref<any>();
 const orderId = ref<string>(orderId_params.toString());
 onMounted(async () => {
   if (orderId.value) {
-    showLoader();
     await fetchAttachment(orderId.value);
     await fecthstatusOrder();
     await getCommandDetail();
-    hideLoader();
   }
 });
 
@@ -99,6 +97,7 @@ const genReportStatus = computed(() => {
 
 // เรียกข้อมูลคำสั่ง
 const getCommandDetail = async () => {
+  showLoader();
   await http
     .get(config.API.detailOrder(orderId.value))
     .then(async (res) => {