Merge branch 'nice_dev' into develop

2024-03-19 13:30:37 +07:00 · 2024-03-19 13:30:37 +07:00 · 8f80776549
commit 8f80776549
parent a0f8eb3108 90960dd551
12 changed files with 138 additions and 121 deletions
--- a/src/modules/13_salary/components/SalaryLists/DialogMoveLevel.vue
+++ b/src/modules/13_salary/components/SalaryLists/DialogMoveLevel.vue
@ -48,7 +48,7 @@ const typeRangeOps = computed(() => {
        { id: "FULL", name: "1 ขั้น" },
        { id: "FULLHAFT", name: "1.5 ขั้น" },
      ]
-    : store.roundMainCode == "ARP"
+    : store.roundMainCode == "APR"
    ? [
        { id: "NONE", name: "ไม่ได้เลื่อน" },
        { id: "HAFT", name: "0.5 ขั้น" },