Merge branch 'develop' into devTee

2025-03-31 14:12:28 +07:00 · 2025-03-31 14:12:28 +07:00 · 7fa0a1b11d
commit 7fa0a1b11d
parent 921b0ca27f 5ea175d675
3 changed files with 6 additions and 7 deletions
--- a/src/modules/02_organization/components/TableMain.vue
+++ b/src/modules/02_organization/components/TableMain.vue
@ -834,6 +834,7 @@ watch(
                  : ""
              }}
              <q-btn
+                v-if="props.row.positionIsSelected != 'ว่าง'"
                size="12px"
                dense
                flat
--- a/src/modules/13_salary/components/04_salaryLists/TableTypePending.vue
+++ b/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",