Merge branch 'develop' into devTee

src/components/Dialogs/AddPersonal.vue

@@ -9,7 +9,7 @@ import { useDisciplineMainStore } from "@/modules/11_discipline/store/Main";
 
 const mainStore = useDisciplineMainStore();
 
-const modal = defineModel<boolean>('modal',{required:true})
+const modal = defineModel<boolean>("modal", { required: true });
 const total = ref<number>(0);
 const totalList = ref<number>(1);
 
@@ -97,7 +97,7 @@ const emit = defineEmits(["returnData"]);
 
 /** ปิด dialog */
 async function close() {
-  modal.value = false
+  modal.value = false;
   rows.value = [];
   employeeClass.value = "officer";
   search.value = "";
@@ -115,7 +115,7 @@ function savePost() {
 /** save data หลังจาก ยืนยัน */
 function saveData() {
   props.save(selected.value, employeeClass.value);
-  close()
+  close();
 }
 
 const searchRef = ref<any>(null);
@@ -154,9 +154,7 @@ async function getSearch() {
         prefix: e.prefix,
         firstName: e.firstName,
         lastName: e.lastName,
-        name: `${e.prefix ? e.prefix : ""}${e.firstName ? e.firstName : ""}  ${
-          e.lastName ? e.lastName : ""
-        }`,
+        name: e.name,
         posNo: e.posNo ?? "-",
         position: e.position ?? "-",
         positionLevel: e.positionLevelName ?? "-",

src/modules/02_organization/components/TableMain.vue

@@ -834,6 +834,7 @@ watch(
                   : ""
               }}
               <q-btn
+                v-if="props.row.positionIsSelected != 'ว่าง'"
                 size="12px"
                 dense
                 flat

src/modules/13_salary/components/04_salaryLists/TableTypePending.vue

@@ -146,7 +146,7 @@ const columns = ref<QTableProps["columns"]>([
   {
     name: "posSalary",
     align: "center",
-    label: "ประวัติตำแหน่ง/เงินเดือน",
+    label: "ประวัติเงินเดือน/ค่าจ้าง",
     sortable: false,
     field: "posSalary",
     headerStyle: "font-size: 14px",