fix ตำแหน่งเงินเดือน

2025-03-11 11:11:31 +07:00 · 2025-03-11 11:11:31 +07:00 · e5b9299ee9
commit e5b9299ee9
parent 139437d793
6 changed files with 842 additions and 966 deletions
--- a/src/modules/04_registryPerson/components/detail/Salary/01_PositionSalary.vue
+++ b/src/modules/04_registryPerson/components/detail/Salary/01_PositionSalary.vue
--- a/src/modules/04_registryPerson/components/detail/Salary/01_PositionSalaryHistory.vue
+++ b/src/modules/04_registryPerson/components/detail/Salary/01_PositionSalaryHistory.vue
@ -4,6 +4,8 @@ import { useQuasar } from "quasar";

 import { useRoute } from "vue-router";
 import { useCounterMixin } from "@/stores/mixin";
+import { useSalaryDataStore } from "@/modules/04_registryPerson/stores/salary";
+
 import http from "@/plugins/http";
 import config from "@/app.config";

@ -14,6 +16,7 @@ import DialogHeader from "@/components/DialogHeader.vue";

 const $q = useQuasar();
 const route = useRoute();
+const store = useSalaryDataStore();
 const {
  date2Thai,
  showLoader,
@ -21,6 +24,7 @@ const {
  messageError,
  pathRegistryEmp,
  onSearchDataTable,
+  findOrgName,
 } = useCounterMixin();

 /** props*/
@ -36,7 +40,7 @@ const baseColumns = ref<QTableProps["columns"]>([
  {
    name: "commandDateAffect",
    align: "left",
-    label: "วัน เดือน ปี",
+    label: "วันที่คำสั่งมีผล",
    sortable: true,
    field: "commandDateAffect",
    headerStyle: "font-size: 14px",
@ -47,74 +51,6 @@ const baseColumns = ref<QTableProps["columns"]>([
        .toString()
        .localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
  },
-  {
-    name: "amount",
-    align: "left",
-    label: empType.value === "-employee" ? "ค่าตอบแทนรายเดือน" : "เงินเดือน",
-    sortable: true,
-    field: "amount",
-    headerStyle: "font-size: 14px",
-    style: "font-size: 14px",
-    format: (v) => Number(v).toLocaleString(),
-    sort: (a: string, b: string) =>
-      a
-        .toString()
-        .localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
-  },
-  {
-    name: "positionSalaryAmount",
-    align: "left",
-    label: "เงินประจำตำแหน่ง",
-    sortable: true,
-    field: "positionSalaryAmount",
-    headerStyle: "font-size: 14px",
-    format: (v) => Number(v).toLocaleString(),
-    style: "font-size: 14px",
-    sort: (a: string, b: string) =>
-      a
-        .toString()
-        .localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
-  },
-  {
-    name: "mouthSalaryAmount",
-    align: "left",
-    label: "เงินค่าตอบแทนรายเดือน",
-    sortable: true,
-    field: "mouthSalaryAmount",
-    headerStyle: "font-size: 14px",
-    format: (v) => Number(v).toLocaleString(),
-    style: "font-size: 14px",
-    sort: (a: string, b: string) =>
-      a
-        .toString()
-        .localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
-  },
-  {
-    name: "oc",
-    align: "left",
-    label: "สังกัด",
-    sortable: true,
-    field: "oc",
-    headerStyle: "font-size: 14px",
-    style: "font-size: 14px",
-    sort: (a: string, b: string) =>
-      a
-        .toString()
-        .localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
-  },
-  {
-    name: "positionName",
-    align: "left",
-    label: "ตำแหน่ง",
-    sortable: true,
-    field: "positionName",
-    headerStyle: "font-size: 14px",
-    style: "font-size: 14px",
-    sort: (a: string, b: string) =>
-      a
-        .toString()
-        .localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
-  },
  {
    name: "posNo",
    align: "left",
@ -125,7 +61,7 @@ const baseColumns = ref<QTableProps["columns"]>([
    style: "font-size: 14px",
    format(val, row) {
      return row.posNoAbb && row.posNo
-        ? `${row.posNoAbb}${row.posNo}`
+        ? `${row.posNoAbb}.${row.posNo}`
        : row.posNo
        ? row.posNo
        : "-";
@ -136,24 +72,11 @@ const baseColumns = ref<QTableProps["columns"]>([
        .localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
  },
  {
-    name: "positionLine",
+    name: "positionName",
    align: "left",
-    label: "สายงาน",
+    label: empType.value === "-employee" ? "ตำแหน่ง" : "ตำแหน่งในสายงาน",
    sortable: true,
-    field: "positionLine",
-    headerStyle: "font-size: 14px",
-    style: "font-size: 14px",
-    sort: (a: string, b: string) =>
-      a
-        .toString()
-        .localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
-  },
-  {
-    name: "positionPathSide",
-    align: "left",
-    label: "ด้าน/สาขา",
-    sortable: true,
-    field: "positionPathSide",
+    field: "positionName",
    headerStyle: "font-size: 14px",
    style: "font-size: 14px",
    sort: (a: string, b: string) =>
@ -164,7 +87,7 @@ const baseColumns = ref<QTableProps["columns"]>([
  {
    name: "positionType",
    align: "left",
-    label: "ตำแหน่งประเภท",
+    label: empType.value === "-employee" ? "กลุ่มงาน" : "ประเภทตำแหน่ง",
    sortable: true,
    field: "positionType",
    headerStyle: "font-size: 14px",
@ -177,7 +100,7 @@ const baseColumns = ref<QTableProps["columns"]>([
  {
    name: "positionLevel",
    align: "left",
-    label: "ระดับ",
+    label: empType.value === "-employee" ? "ระดับชั้นงาน" : "ระดับ",
    sortable: true,
    field: "positionLevel",
    format(val, row) {
@ -192,9 +115,7 @@ const baseColumns = ref<QTableProps["columns"]>([
    headerStyle: "font-size: 14px",
    style: "font-size: 14px",
    sort: (a: string, b: string) =>
-      a
-        .toString()
-        .localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
+      a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
  },
  {
    name: "positionExecutive",
@ -205,55 +126,64 @@ const baseColumns = ref<QTableProps["columns"]>([
    headerStyle: "font-size: 14px",
    style: "font-size: 14px",
    sort: (a: string, b: string) =>
-      a
-        .toString()
-        .localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
+      a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
  },
  {
-    name: "positionExecutiveSide",
+    name: "amount",
    align: "left",
-    label: "ด้านทางการบริหาร",
+    label: empType.value === "-employee" ? "ค่าตอบแทนรายเดือน" : "เงินเดือน",
    sortable: true,
-    field: "positionExecutiveSide",
+    field: "amount",
    headerStyle: "font-size: 14px",
    style: "font-size: 14px",
+    format(v, row) {
+      return row.amount
+        ? `${row.amount.toLocaleString()}${
+            row.amountSpecial !== 0 && row.amountSpecial
+              ? ` (${row.amountSpecial.toLocaleString()})`
+              : ""
+          }`
+        : "-";
+    },
    sort: (a: string, b: string) =>
      a
        .toString()
        .localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
  },
  {
-    name: "salaryClass",
+    name: "positionSalaryAmount",
    align: "left",
-    label: "ตำแหน่ง (รายละเอียด)",
+    label: "เงินประจำตำแหน่ง",
    sortable: true,
-    field: "salaryClass",
+    field: "positionSalaryAmount",
    headerStyle: "font-size: 14px",
    style: "font-size: 14px",
+    format: (v) => Number(v).toLocaleString(),
    sort: (a: string, b: string) =>
      a
        .toString()
        .localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
  },
  {
-    name: "commandName",
+    name: "mouthSalaryAmount",
    align: "left",
-    label: "เอกสารอ้างอิง",
+    label: "เงินค่าตอบแทนรายเดือน",
    sortable: true,
-    field: "commandName",
+    field: "mouthSalaryAmount",
    headerStyle: "font-size: 14px",
    style: "font-size: 14px",
+    format: (v) => Number(v).toLocaleString(),
    sort: (a: string, b: string) =>
      a
        .toString()
        .localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
  },
  {
-    name: "refCommandNo",
+    name: "commandNo",
    align: "left",
    label: "เลขที่คำสั่ง",
    sortable: true,
-    field: "refCommandNo",
+    field: "commandNo",
    format(val, row) {
      return row.commandNo && row.commandYear
        ? `${row.commandNo}/${row.commandYear}`
@ -261,11 +191,58 @@ const baseColumns = ref<QTableProps["columns"]>([
    },
    headerStyle: "font-size: 14px",
    style: "font-size: 14px",
+    sort: (a: string, b: string) =>
+      a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
+  },
+  {
+    name: "commandCode",
+    align: "left",
+    label: "ประเภทคำสั่ง",
+    sortable: true,
+    field: "commandCode",
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+    format(val, row) {
+      return store.convertCommandCodeName(val);
+    },
+
+    sort: (a: string, b: string) =>
+      a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
+  },
+  {
+    name: "commandDateSign",
+    align: "left",
+    label: "วันที่ลงนาม",
+    sortable: true,
+    field: "commandDateSign",
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+    format: (v) => date2Thai(v),
    sort: (a: string, b: string) =>
      a
        .toString()
        .localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
  },
+  {
+    name: "organization",
+    align: "left",
+    label: "สังกัด",
+    sortable: true,
+    field: "organization",
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+    format(val, row) {
+      return findOrgName({
+        root: row.orgRoot,
+        child1: row.orgChild1,
+        child2: row.orgChild2,
+        child3: row.orgChild3,
+        child4: row.orgChild4,
+      });
+    },
+    sort: (a: string, b: string) =>
+      a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
+  },
  {
    name: "remark",
    align: "left",
@ -309,21 +286,18 @@ const baseColumns = ref<QTableProps["columns"]>([
 ]);
 const visibleColumns = ref<string[]>([
  "commandDateAffect",
-  "amount",
-  "positionSalaryAmount",
-  "mouthSalaryAmount",
-  "oc",
-  "positionName",
  "posNo",
-  "positionLine",
-  "positionPathSide",
+  "positionName",
  "positionType",
  "positionLevel",
  "positionExecutive",
-  "positionExecutiveSide",
-  "salaryClass",
-  "commandName",
-  "refCommandNo",
+  "amount",
+  "positionSalaryAmount",
+  "mouthSalaryAmount",
+  "commandNo",
+  "commandCode",
+  "commandDateSign",
+  "organization",
  "remark",
  "lastUpdateFullName",
  "lastUpdatedAt",
--- a/src/modules/04_registryPerson/components/detail/Salary/Main.vue
+++ b/src/modules/04_registryPerson/components/detail/Salary/Main.vue
@ -30,7 +30,7 @@ const tab = ref<string>("1");
    dense
    class="text-grey q-pl-sm"
  >
-    <q-tab name="1" label="ตำแหน่ง/เงินเดือน" />
+    <q-tab name="1" label="เงินเดือน" />
    <q-tab name="2" label="บันทึกวันที่ไม่ได้รับเงินเดือนฯ" />
  </q-tabs>
  <q-separator />