Merge branch 'develop' into dev

2026-01-30 14:52:27 +07:00 · 2026-01-30 14:52:27 +07:00 · 0ca65c44a2
commit 0ca65c44a2
parent a0628caf74 2fc2625699
1 changed files with 2 additions and 3 deletions
--- a/src/modules/04_registryPerson/views/detailView.vue
+++ b/src/modules/04_registryPerson/views/detailView.vue
@ -821,7 +821,6 @@ onMounted(async () => {
              'SYS_PLACEMENT_OTHER',
              'SYS_TRANSFER_REQ',
              'SYS_RESIGN',
-          
            ])) ||
          leaveType === 'DISCIPLINE_TEMP_SUSPEND' ||
          leaveType === 'RETIRE_RESIGN' ||
@ -873,7 +872,7 @@ onMounted(async () => {
            'SYS_PROMOTION_EMP',
            'SYS_PASSAWAY',
            'SYS_DISMISS_EMP',
-            'SYS_RESIGN_EMP'
+            'SYS_RESIGN_EMP',
          ])
        "
        size="md"
@ -1211,8 +1210,8 @@ onMounted(async () => {
                >
                  {{ date2Thai(n.createdAt) }}

+                  <!-- v-if="!n.isActive" -->
                  <q-btn
-                    v-if="!n.isActive"
                    icon="delete"
                    unelevated
                    dense