diff --git a/src/modules/02_organizationalNew/components/DialogFormAgency.vue b/src/modules/02_organizationalNew/components/DialogFormAgency.vue
index 3cfb00cfb..7e4935ded 100644
--- a/src/modules/02_organizationalNew/components/DialogFormAgency.vue
+++ b/src/modules/02_organizationalNew/components/DialogFormAgency.vue
@@ -226,6 +226,10 @@ watch(
             props?.dataNode?.orgLevel !== 0
               ? props?.dataNode.orgTreeCode
               : undefined;
+          formData.orgShortName =
+            props?.dataNode?.orgLevel !== 0
+              ? props?.dataNode.orgTreeShortName
+              : undefined;
         }
 
         if (level.value === 0) {
@@ -340,6 +344,12 @@ function selectOrgLevele(val: string, status: boolean = true) {
               <div class="col-2">
                 <q-input
                   v-model="formData.orgShortName"
+                  :readonly="
+                    (actionType === 'ADD' &&
+                      props?.dataNode?.orgLevel !== 0 &&
+                      level !== 0) ||
+                    (actionType === 'EDIT' && props?.dataNode?.orgLevel > 1)
+                  "
                   ref="orgShortNameRef"
                   dense
                   outlined