Merge branch 'develop' into dev

fix(roles-position-salary):filter org
2026-02-03 11:23:22 +07:00 · 2026-02-03 11:23:06 +07:00
1 changed files with 2 additions and 2 deletions
--- a/src/modules/02_users/views/06_rolePositionSalary.vue
+++ b/src/modules/02_users/views/06_rolePositionSalary.vue
@ -279,7 +279,7 @@ watch(
  () => qureyBody.pageSize,
  () => {
    fetchListPerson(true);
-  }
+  },
 );

 /** hook ทำงานเมื่อ Components ถูกเรียกใช้งาน*/
@ -309,7 +309,7 @@ onMounted(async () => {
            class="q-pa-sm q-gutter-sm"
            dense
            :nodes="nodeTree"
-            node-key="orgRootName"
+            node-key="labelName"
            label-key="labelName"
            :filter="filter?.trim()"
            no-results-label="ไม่พบข้อมูลที่ค้นหา"
Author	SHA1	Message	Date
$DESKTOP-1R2VSQH\Lenovo ThinkPad E490$ DESKTOP-1R2VSQH\Lenovo ThinkPad E490	b7ea26af2a	Merge branch 'develop' into dev All checks were successful Build & Deploy on Dev / build (push) Successful in 2m3s Details	2026-02-03 11:23:22 +07:00
$DESKTOP-1R2VSQH\Lenovo ThinkPad E490$ DESKTOP-1R2VSQH\Lenovo ThinkPad E490	123bcda183	fix(roles-position-salary):filter org	2026-02-03 11:23:06 +07:00