From 25932352a6a99330aebf50a4870eac7010d61a0c Mon Sep 17 00:00:00 2001
From: waruneeauy <warunee.auy@gmail.com>
Date: Fri, 19 Apr 2024 14:40:35 +0700
Subject: [PATCH] fix bug row table

---
 .../position-employee/03ListLevel.vue         |  2 +-
 .../components/4_Result/DialogHistory.vue     | 71 +++++++++++--------
 .../components/DialogHistoryPos.vue           |  2 +-
 3 files changed, 42 insertions(+), 33 deletions(-)

diff --git a/src/modules/01_metadataNew/components/position-employee/03ListLevel.vue b/src/modules/01_metadataNew/components/position-employee/03ListLevel.vue
index 8301bdeb0..f7d66f391 100644
--- a/src/modules/01_metadataNew/components/position-employee/03ListLevel.vue
+++ b/src/modules/01_metadataNew/components/position-employee/03ListLevel.vue
@@ -77,7 +77,7 @@ const columns = ref<QTableProps["columns"]>([
     style: "font-size: 14px",
   },
 ]);
-const rows = ref<any>();
+const rows = ref<any>([]);
 
 const visibleColumns = ref<string[]>([
   "no",
diff --git a/src/modules/11_discipline/components/4_Result/DialogHistory.vue b/src/modules/11_discipline/components/4_Result/DialogHistory.vue
index d955f2ad9..896000e5f 100644
--- a/src/modules/11_discipline/components/4_Result/DialogHistory.vue
+++ b/src/modules/11_discipline/components/4_Result/DialogHistory.vue
@@ -1,8 +1,5 @@
 <script setup lang="ts">
-import {
-  ref,
-  watch,
-} from "vue";
+import { ref, watch } from "vue";
 import { QForm, useQuasar } from "quasar";
 import { useCounterMixin } from "@/stores/mixin";
 import type { QTableProps } from "quasar";
@@ -12,9 +9,16 @@ import config from "@/app.config";
 
 const $q = useQuasar();
 const mixin = useCounterMixin();
-const { showLoader, success, messageError, dialogConfirm, hideLoader,date2Thai } = mixin;
+const {
+  showLoader,
+  success,
+  messageError,
+  dialogConfirm,
+  hideLoader,
+  date2Thai,
+} = mixin;
 const listCheck = ref<string>("");
-const id = ref<string>('')
+const id = ref<string>("");
 const props = defineProps({
   modal: Boolean,
   personId: {
@@ -23,7 +27,7 @@ const props = defineProps({
   },
   close: Function,
 });
-const rows = ref<any>();
+const rows = ref<any>([]);
 
 const columns = ref<QTableProps["columns"]>([
   {
@@ -55,40 +59,45 @@ const columns = ref<QTableProps["columns"]>([
   },
 ]);
 
-function getHistory(id:string){
-  showLoader()
+function getHistory(id: string) {
+  showLoader();
   http
-  .get(config.API.historyOrderById(id))
-  .then((res)=>{
-    const data = res.data.result;
-    rows.value = data.map((item:any)=>({
-      commandSubject:item.commandSubject ? item.commandSubject : '-',
-      createdAt:item.createdAt ? date2Thai(item.createdAt,false,true) : '-',
-      lastUpdatedAt:item.lastUpdatedAt ? date2Thai(item.lastUpdatedAt,false,true) : '-',
-    }))
-  }).catch((e)=>{
-    messageError($q,e)
-  }).finally(()=>{
-    hideLoader()
-  })
+    .get(config.API.historyOrderById(id))
+    .then((res) => {
+      const data = res.data.result;
+      rows.value = data.map((item: any) => ({
+        commandSubject: item.commandSubject ? item.commandSubject : "-",
+        createdAt: item.createdAt
+          ? date2Thai(item.createdAt, false, true)
+          : "-",
+        lastUpdatedAt: item.lastUpdatedAt
+          ? date2Thai(item.lastUpdatedAt, false, true)
+          : "-",
+      }));
+    })
+    .catch((e) => {
+      messageError($q, e);
+    })
+    .finally(() => {
+      hideLoader();
+    });
 }
 
-watch(()=>props.personId,()=>{
-  if(props.personId){
-    getHistory(props.personId)
+watch(
+  () => props.personId,
+  () => {
+    if (props.personId) {
+      getHistory(props.personId);
+    }
   }
-})
-
+);
 </script>
 
 <template>
   <q-dialog v-model="props.modal" persistent>
     <q-card style="min-width: 40vw">
       <q-form ref="myForm">
-        <DialogHeader
-          :title="`ประวัติการออกคำสั่ง`"
-          :close="props.close"
-        />
+        <DialogHeader :title="`ประวัติการออกคำสั่ง`" :close="props.close" />
         <q-separator />
         <q-card-section>
           <d-table
diff --git a/src/modules/16_positionEmployee/components/DialogHistoryPos.vue b/src/modules/16_positionEmployee/components/DialogHistoryPos.vue
index 7f1e3791e..1e0471168 100644
--- a/src/modules/16_positionEmployee/components/DialogHistoryPos.vue
+++ b/src/modules/16_positionEmployee/components/DialogHistoryPos.vue
@@ -71,7 +71,7 @@ const columns = ref<QTableProps["columns"]>([
     style: "font-size: 14px",
   },
 ]);
-const rows = ref<any>();
+const rows = ref<any>([]);
 
 const props = defineProps({
   rowId: {