Merge branch 'develop' into dev

refactor(change-round): add permission check using attrIsUpdate for change round button
Co-authored-by: Copilot <copilot@github.com>
2026-04-30 16:07:22 +07:00 · 2026-04-30 16:07:02 +07:00
2 changed files with 3 additions and 2 deletions
--- a/src/modules/09_leave/interface/request/changeRound.ts
+++ b/src/modules/09_leave/interface/request/changeRound.ts
@ -4,8 +4,8 @@ interface DataPost {
  lastName: string;
  page: number;
  pageSize: number;
-  selectedNodeId: string | null;
-  selectedNode: string;
+  selectedNodeId?: string | null;
+  selectedNode?: string;
 }

 interface DataOption {
--- a/src/modules/09_leave/views/03_ChangeRoundMain.vue
+++ b/src/modules/09_leave/views/03_ChangeRoundMain.vue
@ -410,6 +410,7 @@ onMounted(() => {
                @click="selectAllRows()"
              /> -->
              <q-btn
+                v-if="checkPermission($route)?.attrIsUpdate"
                :disable="selected.length === 0 || isLoadingAll"
                :color="selected.length === 0 ? 'grey' : 'info'"
                dense
Author	SHA1	Message	Date
$DESKTOP-1R2VSQH\Lenovo ThinkPad E490$ DESKTOP-1R2VSQH\Lenovo ThinkPad E490	a71cdec921	Merge branch 'develop' into dev All checks were successful Build & Deploy on Dev / build (push) Successful in 3m5s Details	2026-04-30 16:07:22 +07:00
$DESKTOP-1R2VSQH\Lenovo ThinkPad E490$ DESKTOP-1R2VSQH\Lenovo ThinkPad E490	598492b61e	refactor(change-round): add permission check using attrIsUpdate for change round button Co-authored-by: Copilot <copilot@github.com>	2026-04-30 16:07:02 +07:00