Merge branch 'develop' into dev

2026-05-12 17:46:12 +07:00 · 2026-05-12 17:46:12 +07:00 · ae8e667922
commit ae8e667922
parent 9cbe56fb1e 5ead16e528
1 changed files with 3 additions and 1 deletions
--- a/src/modules/05_placement/components/Receive/DialogOrders.vue
+++ b/src/modules/05_placement/components/Receive/DialogOrders.vue
@ -89,7 +89,9 @@ const columns2 = ref<QTableProps["columns"]>([
    sort: (a: string, b: string) =>
      a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
    format(val, row) {
-      return `${row.prefix ?? ""}${row.firstName ?? ""} ${row.lastName ?? ""}`;
+      return `${row.rank ? row.rank : row.prefix ?? ""}${row.firstName ?? ""} ${
+        row.lastName ?? ""
+      }`;
    },
  },
  {