From 5f6d5544410623bf01d007119bff167863a74aca Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Thu, 26 Dec 2024 13:48:50 +0700
Subject: [PATCH] =?UTF-8?q?fix=20=E0=B8=97=E0=B8=94=E0=B8=A5=E0=B8=AD?=
 =?UTF-8?q?=E0=B8=87=E0=B8=87=E0=B8=B2=E0=B8=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../probation/DialogOrder/DialogSendToCommand.vue         | 8 +++-----
 .../05_placement/components/probation/MainAppoint.vue     | 6 +++---
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/src/modules/05_placement/components/probation/DialogOrder/DialogSendToCommand.vue b/src/modules/05_placement/components/probation/DialogOrder/DialogSendToCommand.vue
index b614c5cdb..dc365122a 100644
--- a/src/modules/05_placement/components/probation/DialogOrder/DialogSendToCommand.vue
+++ b/src/modules/05_placement/components/probation/DialogOrder/DialogSendToCommand.vue
@@ -89,6 +89,9 @@ const columns = ref<QTableProps["columns"]>([
     field: "status",
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
+    format(val, row) {
+      return convertText(row.status);
+    },
   },
 ]);
 
@@ -224,11 +227,6 @@ watchEffect(() => {
                         1
                       }}
                     </div>
-                    <div v-else-if="col.name == 'status'">
-                      {{
-                        props.row.status ? convertText(props.row.status) : "-"
-                      }}
-                    </div>
 
                     <div v-else>
                       {{ col.value ? col.value : "-" }}
diff --git a/src/modules/05_placement/components/probation/MainAppoint.vue b/src/modules/05_placement/components/probation/MainAppoint.vue
index 7c29cb8d6..d0d6620a7 100644
--- a/src/modules/05_placement/components/probation/MainAppoint.vue
+++ b/src/modules/05_placement/components/probation/MainAppoint.vue
@@ -77,6 +77,9 @@ const columns = ref<QTableProps["columns"]>([
     field: "status",
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
+    format(val, row) {
+      return convertText(row.status);
+    },
   },
 ]);
 
@@ -285,9 +288,6 @@ onMounted(async () => {
                 <div v-if="col.name == 'no'">
                   {{ props.rowIndex + 1 }}
                 </div>
-                <div v-else-if="col.name == 'status'">
-                  {{ props.row.status ? convertText(props.row.status) : "-" }}
-                </div>
 
                 <div v-else>
                   {{ col.value ? col.value : "-" }}