Merge branch 'nice' into develop

src/modules/04_registryNew/components/detail/Salary/01_PositionSalary.vue

@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { ref, reactive, onMounted } from "vue";
+import { ref, reactive, onMounted, computed } from "vue";
 import { useQuasar } from "quasar";
 import { useRoute } from "vue-router";
 import http from "@/plugins/http";
@@ -37,7 +37,7 @@ const {
   success,
 } = useCounterMixin();
 
-const columns = ref<QTableProps["columns"]>([
+const baseColumns = ref<QTableProps["columns"]>([
   {
     name: "date",
     align: "left",
@@ -51,7 +51,7 @@ const columns = ref<QTableProps["columns"]>([
   {
     name: "amount",
     align: "left",
-    label: "เงินเดือน",
+    label: empType.value === "-employee" ? "ค่าตอบแทนรายเดือน" : "เงินเดือน",
     sortable: true,
     field: "amount",
     headerStyle: "font-size: 14px",
@@ -127,6 +127,20 @@ const columns = ref<QTableProps["columns"]>([
     style: "font-size: 14px",
   },
 ]);
+
+const columns = computed(() => {
+  if (empType.value === "-employee") {
+    if (baseColumns.value) {
+      return baseColumns.value.filter(
+        (column) =>
+          column.name !== "positionSalaryAmount" &&
+          column.name !== "mouthSalaryAmount"
+      );
+    }
+  }
+  return baseColumns.value;
+});
+
 const visibleColumns = ref<string[]>([
   "date",
   "amount",