Merge branch 'develop' into devTee

src/modules/04_registryPerson/views/detailView.vue

@@ -102,8 +102,6 @@ const baseItemsMenu = ref<DataOptionSys[]>([
 ]);
 
 const itemsMenu = computed(() => {
-  console.log(leaveReason.value);
-
   if (
     leaveReason.value ===
       "(พ้นจากราชการด้วยสาเหตุ: ได้รับโทษทางวินัย ให้ออกจากราชการไว้ก่อน)" ||

src/modules/13_salary/components/05_salaryListsEmployee/DialogAddPerson.vue

@@ -71,11 +71,11 @@ const columns = ref<QTableProps["columns"]>([
     style: "font-size: 14px",
   },
   {
-    name: "posTypeName",
+    name: "posType",
     align: "left",
     label: "กลุ่มงาน",
     sortable: true,
-    field: "posTypeName",
+    field: "posType",
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
   },
@@ -87,6 +87,9 @@ const columns = ref<QTableProps["columns"]>([
     field: "posLevelName",
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
+    format(val, row) {
+      return `${row.posTypeShort}${row.posLevel}`;
+    },
   },
 ]);
 /** ข้อมูุลค้นหา*/
@@ -227,7 +230,6 @@ watch(
             <q-input
               borderless
               dense
-              debounce="300"
               outlined
               placeholder="ค้นหา"
               v-model="formFilter.keyword"