diff --git a/src/modules/06_retirement/components/resign/DialogSendToCommand.vue b/src/modules/06_retirement/components/resign/DialogSendToCommand.vue
index c7a0773fd..f4b9afb0c 100644
--- a/src/modules/06_retirement/components/resign/DialogSendToCommand.vue
+++ b/src/modules/06_retirement/components/resign/DialogSendToCommand.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { ref, watchEffect,computed } from "vue";
+import { ref, watchEffect, computed } from "vue";
 import { useQuasar } from "quasar";
 
 import { useCounterMixin } from "@/stores/mixin";
@@ -116,7 +116,10 @@ const columns = ref<QTableProps["columns"]>([
     align: "left",
     label: "วันที่ยื่น",
     sortable: true,
-    field: (row) => date2Thai(new Date(row.createdAt)),
+    field: "createdAt",
+    format(val, row) {
+      return date2Thai(new Date(val));
+    },
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
     sortOrder: "da",
@@ -214,7 +217,6 @@ watchEffect(() => {
                 map-options
                 :options="columns"
                 option-value="name"
-                
                 style="min-width: 140px"
                 class="gt-xs q-ml-sm"
               />
diff --git a/src/modules/06_retirement/components/resignEMP/DialogSendToCommand.vue b/src/modules/06_retirement/components/resignEMP/DialogSendToCommand.vue
index 76156f5eb..a8d5658ec 100644
--- a/src/modules/06_retirement/components/resignEMP/DialogSendToCommand.vue
+++ b/src/modules/06_retirement/components/resignEMP/DialogSendToCommand.vue
@@ -116,7 +116,10 @@ const columns = ref<QTableProps["columns"]>([
     align: "left",
     label: "วันที่ยื่น",
     sortable: true,
-    field: (row) => date2Thai(new Date(row.createdAt)),
+    field: "createdAt",
+    format(val, row) {
+      return date2Thai(new Date(val));
+    },
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
     sortOrder: "da",
diff --git a/src/modules/06_retirement/components/resignEMP/Table.vue b/src/modules/06_retirement/components/resignEMP/Table.vue
index 9dcedea08..118c0f190 100644
--- a/src/modules/06_retirement/components/resignEMP/Table.vue
+++ b/src/modules/06_retirement/components/resignEMP/Table.vue
@@ -99,7 +99,10 @@ const columns = ref<QTableProps["columns"]>([
     align: "left",
     label: "วันที่ยื่น",
     sortable: true,
-    field: (row) => date2Thai(new Date(row.createdAt)),
+    field: "createdAt",
+    format(val, row) {
+      return date2Thai(new Date(val));
+    },
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
     sortOrder: "da",
@@ -256,7 +259,7 @@ onMounted(async () => {
               </q-item>
             </template>
           </q-select>
-          
+
           <q-btn
             v-if="checkPermission($route)?.attrIsUpdate"
             @click="openModalOrder"