Merge branch 'nice_dev' into develop

# Conflicts:
#	src/api/02_organizational/api.organization.ts
#	src/modules/02_organizationalNew/components/tableTree.vue
#	src/modules/02_organizationalNew/store/organizational.ts
This commit is contained in:
DESKTOP-1R2VSQH\Lenovo ThinkPad E490 2024-02-01 13:51:49 +07:00
commit ff3c5e3ef0
7 changed files with 357 additions and 70 deletions

View file

@ -106,7 +106,7 @@ const updateSelected = (id: string, level: number) => {
nodeId.value = "";
} else {
nodeId.value = id ? id : "";
id && props.fetchDataTable?.(id, level);
id && props.fetchDataTable?.(id, level, true);
}
};