diff --git a/src/modules/02_organizationalNew/components/DialogFormAgency.vue b/src/modules/02_organizationalNew/components/DialogFormAgency.vue
index 69b955c82..3597e3940 100644
--- a/src/modules/02_organizationalNew/components/DialogFormAgency.vue
+++ b/src/modules/02_organizationalNew/components/DialogFormAgency.vue
@@ -281,6 +281,7 @@ const tittleName = computed(() => {
               </div>
               <div class="col-2">
                 <q-input
+                  mask="##"
                   v-model="formData.orgCode"
                   ref="orgCodeRef"
                   dense
@@ -288,8 +289,6 @@ const tittleName = computed(() => {
                   for="#ocNo"
                   :label="level == 0 ? 'รหัสหน่วยงาน' : 'รหัสส่วนราชการ'"
                   hide-bottom-space
-                  maxlength="2"
-                  type="number"
                   class="inputNumber"
                   :rules="[
                     (val) =>
diff --git a/src/modules/02_organizationalNew/views/main.vue b/src/modules/02_organizationalNew/views/main.vue
index 976cff4c0..b46eae627 100644
--- a/src/modules/02_organizationalNew/views/main.vue
+++ b/src/modules/02_organizationalNew/views/main.vue
@@ -311,12 +311,25 @@ onMounted(async () => {
         </q-card-section>
         <q-separator />
         <q-card-section style="padding: 0px">
-          <ListView
+          <!-- <ListView
             v-if="store.statusView === 'list'"
             v-model:historyId="historyId"
             v-model:count="count"
           />
-          <StructureView v-if="store.statusView === 'tree'" />
+          <StructureView v-if="store.statusView === 'tree'" /> -->
+          <q-tab-panels v-model="store.statusView" animated>
+            <q-tab-panel name="list" style="padding: 0px">
+              <ListView
+                v-if="store.statusView === 'list'"
+                v-model:historyId="historyId"
+                v-model:count="count"
+              />
+            </q-tab-panel>
+
+            <q-tab-panel name="tree" style="padding: 0px">
+              <StructureView v-if="store.statusView === 'tree'" />
+            </q-tab-panel>
+          </q-tab-panels>
         </q-card-section>
       </q-card>
     </div>