Merge branch 'nice' into develop

src/modules/21_report/views/02_reportRegistry.vue

@@ -118,6 +118,7 @@ const visibleColumnsBase = ref<string[]>([
   "status",
   "education",
   "dateAppoint",
+  "dateRetireLaw",
   "age",
   "currentPosition",
   "lengthPosition",
@@ -260,6 +261,21 @@ const columns = computed<QTableProps["columns"]>(() => {
       sort: (a: string, b: string) =>
         a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
     },
+
+    {
+      name: "dateRetireLaw",
+      align: "left",
+      label: "วันที่เกษียณอายุราชการตามกฏหมาย",
+      sortable: true,
+      field: "dateRetireLaw",
+      headerStyle: "font-size: 14px",
+      style: "font-size: 14px",
+      format(val, row) {
+        return val ? date2Thai(row.dateRetireLaw) : "";
+      },
+      sort: (a: string, b: string) =>
+        a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
+    },
     {
       name: "age",
       align: "left",
@@ -531,6 +547,7 @@ async function onSearch() {
         currentPosition: item.currentPosition ?? "-",
         lengthPosition: item.lengthPosition ?? "-",
         empType: employeeClass.value,
+        dateRetireLaw: item.dateRetireLaw ?? "-",
       }));
     })
     .catch((e) => {
@@ -1298,6 +1315,7 @@ onMounted(async () => {
                         >
                           <div>
                             <q-input
+                              readonly
                               type="number"
                               style="max-width: 60px"
                               v-model="rangeAge.min"
@@ -1308,6 +1326,7 @@ onMounted(async () => {
                           <div class="q-px-sm text-grey-8">-</div>
                           <div>
                             <q-input
+                              readonly
                               type="number"
                               style="max-width: 60px"
                               v-model="rangeAge.max"