diff --git a/src/modules/01_metadata/components/insignia/InsigniaList.vue b/src/modules/01_metadata/components/insignia/InsigniaList.vue
index 899eb7a0..373777de 100644
--- a/src/modules/01_metadata/components/insignia/InsigniaList.vue
+++ b/src/modules/01_metadata/components/insignia/InsigniaList.vue
@@ -386,7 +386,7 @@ const dialogOrder = ref<boolean>(false);
             >
               <q-tooltip>แก้ไขข้อมูล</q-tooltip>
             </q-btn>
-            <q-btn
+            <!-- <q-btn
               color="red"
               flat
               dense
@@ -400,7 +400,7 @@ const dialogOrder = ref<boolean>(false);
               v-close-popup
             >
               <q-tooltip>ลบข้อมูล</q-tooltip>
-            </q-btn>
+            </q-btn> -->
           </q-td>
         </q-tr>
       </template>
diff --git a/src/modules/01_metadata/components/insignia/InsigniaType.vue b/src/modules/01_metadata/components/insignia/InsigniaType.vue
index e8575b37..d3aaf04f 100644
--- a/src/modules/01_metadata/components/insignia/InsigniaType.vue
+++ b/src/modules/01_metadata/components/insignia/InsigniaType.vue
@@ -233,70 +233,76 @@ async function onSubmit() {
     </div>
   </q-toolbar>
 
-  <d-table
-    ref="table"
-    :columns="columns"
-    :rows="store.row"
-    :filter="filterKeyword"
-    row-key="name"
-    flat
-    bordered
-    :paging="true"
-    dense
-    class="custom-header-table"
-    :visible-columns="visibleColumns"
-  >
-    <template v-slot:header="props">
-      <q-tr :props="props">
-        <q-th v-for="col in props.cols" :key="col.name" :props="props">
-          <span class="text-weight-medium">{{ col.label }}</span>
-        </q-th>
-        <q-th auto-width />
-      </q-tr>
-    </template>
-    <template v-slot:body="props">
-      <q-tr
-        :props="props"
-        class="cursor-pointer"
-        @click.stop="onclickDetail(props.row.id)"
-      >
-        <q-td v-for="col in props.cols" :key="col.id">
-          <div v-if="col.name == 'isActive'">
-            <q-icon
-              v-if="col.value == false"
-              name="mdi-close"
-              color="red"
-              class="text-h5"
-            />
-            <q-icon v-else name="mdi-check" color="positive" class="text-h5" />
-          </div>
-          <div v-else>
-            {{ col.value }}
-          </div>
-        </q-td>
-        <q-td auto-width>
-          <q-btn
-            color="edit"
-            flat
-            dense
-            round
-            class="q-mr-xs"
-            size="12px"
-            icon="edit"
-            clickable
-            @click.stop="
-              () => {
-                dialogStatus = 'edit';
-                dialog = true;
-                editId = props.row.id;
-                name = props.row.name;
-                isActive = props.row.isActive;
-              }
-            "
-          >
-            <q-tooltip>แก้ไขข้อมูล</q-tooltip>
-          </q-btn>
-          <q-btn
+  <div class="col-12">
+    <d-table
+      ref="table"
+      :columns="columns"
+      :rows="store.row"
+      :filter="filterKeyword"
+      row-key="name"
+      flat
+      bordered
+      :paging="true"
+      dense
+      class="custom-header-table"
+      :visible-columns="visibleColumns"
+    >
+      <template v-slot:header="props">
+        <q-tr :props="props">
+          <q-th v-for="col in props.cols" :key="col.name" :props="props">
+            <span class="text-weight-medium">{{ col.label }}</span>
+          </q-th>
+          <q-th auto-width />
+        </q-tr>
+      </template>
+      <template v-slot:body="props">
+        <q-tr
+          :props="props"
+          class="cursor-pointer"
+          @click.stop="onclickDetail(props.row.id)"
+        >
+          <q-td v-for="col in props.cols" :key="col.id">
+            <div v-if="col.name == 'isActive'">
+              <q-icon
+                v-if="col.value == false"
+                name="mdi-close"
+                color="red"
+                class="text-h5"
+              />
+              <q-icon
+                v-else
+                name="mdi-check"
+                color="positive"
+                class="text-h5"
+              />
+            </div>
+            <div v-else>
+              {{ col.value }}
+            </div>
+          </q-td>
+          <q-td auto-width>
+            <q-btn
+              color="edit"
+              flat
+              dense
+              round
+              class="q-mr-xs"
+              size="12px"
+              icon="edit"
+              clickable
+              @click.stop="
+                () => {
+                  dialogStatus = 'edit';
+                  dialog = true;
+                  editId = props.row.id;
+                  name = props.row.name;
+                  isActive = props.row.isActive;
+                }
+              "
+            >
+              <q-tooltip>แก้ไขข้อมูล</q-tooltip>
+            </q-btn>
+            <!-- <q-btn
             color="red"
             flat
             dense
@@ -310,11 +316,12 @@ async function onSubmit() {
             v-close-popup
           >
             <q-tooltip>ลบข้อมูล</q-tooltip>
-          </q-btn>
-        </q-td>
-      </q-tr>
-    </template>
-  </d-table>
+          </q-btn> -->
+          </q-td>
+        </q-tr>
+      </template>
+    </d-table>
+  </div>
 
   <q-dialog v-model="dialog" class="dialog" persistent>
     <q-card style="min-width: 350px">
diff --git a/src/modules/01_metadata/components/personal/01ListPrefix.vue b/src/modules/01_metadata/components/personal/01ListPrefix.vue
index 617df14e..ffb4d120 100644
--- a/src/modules/01_metadata/components/personal/01ListPrefix.vue
+++ b/src/modules/01_metadata/components/personal/01ListPrefix.vue
@@ -232,7 +232,7 @@ onMounted(async () => {
           >
             <q-tooltip>แก้ไขข้อมูล</q-tooltip>
           </q-btn>
-          <q-btn
+          <!-- <q-btn
             color="red"
             flat
             dense
@@ -246,7 +246,7 @@ onMounted(async () => {
             v-close-popup
           >
             <q-tooltip>ลบข้อมูล</q-tooltip>
-          </q-btn>
+          </q-btn> -->
         </q-td>
       </q-tr>
     </template>
diff --git a/src/modules/01_metadata/components/personal/02ListRank.vue b/src/modules/01_metadata/components/personal/02ListRank.vue
index 914f9436..68ee4964 100644
--- a/src/modules/01_metadata/components/personal/02ListRank.vue
+++ b/src/modules/01_metadata/components/personal/02ListRank.vue
@@ -230,7 +230,7 @@ onMounted(async () => {
           >
             <q-tooltip>แก้ไขข้อมูล</q-tooltip>
           </q-btn>
-          <q-btn
+          <!-- <q-btn
             color="red"
             flat
             dense
@@ -244,7 +244,7 @@ onMounted(async () => {
             v-close-popup
           >
             <q-tooltip>ลบข้อมูล</q-tooltip>
-          </q-btn>
+          </q-btn> -->
         </q-td>
       </q-tr>
     </template>
diff --git a/src/modules/01_metadata/components/personal/03ListBloodGroup.vue b/src/modules/01_metadata/components/personal/03ListBloodGroup.vue
index c5ff7e88..d68ea7ef 100644
--- a/src/modules/01_metadata/components/personal/03ListBloodGroup.vue
+++ b/src/modules/01_metadata/components/personal/03ListBloodGroup.vue
@@ -230,7 +230,7 @@ onMounted(async () => {
           >
             <q-tooltip>แก้ไขข้อมูล</q-tooltip>
           </q-btn>
-          <q-btn
+          <!-- <q-btn
             color="red"
             flat
             dense
@@ -244,7 +244,7 @@ onMounted(async () => {
             v-close-popup
           >
             <q-tooltip>ลบข้อมูล</q-tooltip>
-          </q-btn>
+          </q-btn> -->
         </q-td>
       </q-tr>
     </template>
diff --git a/src/modules/01_metadata/components/personal/04ListGender.vue b/src/modules/01_metadata/components/personal/04ListGender.vue
index a9d223a9..d7423f5c 100644
--- a/src/modules/01_metadata/components/personal/04ListGender.vue
+++ b/src/modules/01_metadata/components/personal/04ListGender.vue
@@ -230,7 +230,7 @@ onMounted(async () => {
           >
             <q-tooltip>แก้ไขข้อมูล</q-tooltip>
           </q-btn>
-          <q-btn
+          <!-- <q-btn
             color="red"
             flat
             dense
@@ -244,7 +244,7 @@ onMounted(async () => {
             v-close-popup
           >
             <q-tooltip>ลบข้อมูล</q-tooltip>
-          </q-btn>
+          </q-btn> -->
         </q-td>
       </q-tr>
     </template>
diff --git a/src/modules/01_metadata/components/personal/05ListReligion.vue b/src/modules/01_metadata/components/personal/05ListReligion.vue
index 139422ad..cba4d351 100644
--- a/src/modules/01_metadata/components/personal/05ListReligion.vue
+++ b/src/modules/01_metadata/components/personal/05ListReligion.vue
@@ -230,7 +230,7 @@ onMounted(async () => {
           >
             <q-tooltip>แก้ไขข้อมูล</q-tooltip>
           </q-btn>
-          <q-btn
+          <!-- <q-btn
             color="red"
             flat
             dense
@@ -244,7 +244,7 @@ onMounted(async () => {
             v-close-popup
           >
             <q-tooltip>ลบข้อมูล</q-tooltip>
-          </q-btn>
+          </q-btn> -->
         </q-td>
       </q-tr>
     </template>
diff --git a/src/modules/01_metadata/components/personal/06ListRelationship.vue b/src/modules/01_metadata/components/personal/06ListRelationship.vue
index a3eaada8..ff5b17ee 100644
--- a/src/modules/01_metadata/components/personal/06ListRelationship.vue
+++ b/src/modules/01_metadata/components/personal/06ListRelationship.vue
@@ -258,7 +258,7 @@ onMounted(async () => {
           >
             <q-tooltip>แก้ไขข้อมูล</q-tooltip>
           </q-btn>
-          <q-btn
+          <!-- <q-btn
             color="red"
             flat
             dense
@@ -272,7 +272,7 @@ onMounted(async () => {
             v-close-popup
           >
             <q-tooltip>ลบข้อมูล</q-tooltip>
-          </q-btn>
+          </q-btn> -->
         </q-td>
       </q-tr>
     </template>
diff --git a/src/modules/01_metadata/components/personal/07ListEducationLevel.vue b/src/modules/01_metadata/components/personal/07ListEducationLevel.vue
index 15e6e041..76bb0c13 100644
--- a/src/modules/01_metadata/components/personal/07ListEducationLevel.vue
+++ b/src/modules/01_metadata/components/personal/07ListEducationLevel.vue
@@ -245,7 +245,7 @@ onMounted(async () => {
           >
             <q-tooltip>แก้ไขข้อมูล</q-tooltip>
           </q-btn>
-          <q-btn
+          <!-- <q-btn
             color="red"
             flat
             dense
@@ -259,7 +259,7 @@ onMounted(async () => {
             v-close-popup
           >
             <q-tooltip>ลบข้อมูล</q-tooltip>
-          </q-btn>
+          </q-btn> -->
         </q-td>
       </q-tr>
     </template>
diff --git a/src/modules/01_metadata/components/personal/08ListProvince.vue b/src/modules/01_metadata/components/personal/08ListProvince.vue
index 030922b0..d3cfa9ea 100644
--- a/src/modules/01_metadata/components/personal/08ListProvince.vue
+++ b/src/modules/01_metadata/components/personal/08ListProvince.vue
@@ -238,7 +238,7 @@ onMounted(async () => {
           >
             <q-tooltip>แก้ไขข้อมูล</q-tooltip>
           </q-btn>
-          <q-btn
+          <!-- <q-btn
             color="red"
             flat
             dense
@@ -252,7 +252,7 @@ onMounted(async () => {
             v-close-popup
           >
             <q-tooltip>ลบข้อมูล</q-tooltip>
-          </q-btn>
+          </q-btn> -->
         </q-td>
       </q-tr>
     </template>
diff --git a/src/modules/01_metadata/components/position-employee/02ListType.vue b/src/modules/01_metadata/components/position-employee/02ListType.vue
index 8c608fb2..a849a6ce 100644
--- a/src/modules/01_metadata/components/position-employee/02ListType.vue
+++ b/src/modules/01_metadata/components/position-employee/02ListType.vue
@@ -272,7 +272,7 @@ onMounted(() => {
           >
             <q-tooltip>แก้ไขข้อมูล</q-tooltip>
           </q-btn>
-          <q-btn
+          <!-- <q-btn
             color="red"
             flat
             dense
@@ -283,7 +283,7 @@ onMounted(() => {
             @click.stop="onClickDelete(props.row.id)"
           >
             <q-tooltip>ลบข้อมูล</q-tooltip>
-          </q-btn>
+          </q-btn> -->
         </q-td>
       </q-tr>
     </template>
diff --git a/src/modules/01_metadata/components/position-employee/03ListLevel.vue b/src/modules/01_metadata/components/position-employee/03ListLevel.vue
index 873633bc..c851586f 100644
--- a/src/modules/01_metadata/components/position-employee/03ListLevel.vue
+++ b/src/modules/01_metadata/components/position-employee/03ListLevel.vue
@@ -307,7 +307,7 @@ onMounted(() => {
               >
                 <q-tooltip>แก้ไขข้อมูล</q-tooltip>
               </q-btn>
-              <q-btn
+              <!-- <q-btn
                 color="red"
                 flat
                 dense
@@ -317,7 +317,7 @@ onMounted(() => {
                 @click="onClickDelete(props.row.id)"
               >
                 <q-tooltip>ลบข้อมูล</q-tooltip>
-              </q-btn>
+              </q-btn> -->
             </q-td>
           </q-tr>
         </template>
diff --git a/src/modules/01_metadata/components/position/02ListType.vue b/src/modules/01_metadata/components/position/02ListType.vue
index 93c6f2f0..405c0e77 100644
--- a/src/modules/01_metadata/components/position/02ListType.vue
+++ b/src/modules/01_metadata/components/position/02ListType.vue
@@ -281,7 +281,7 @@ async function onSubmit() {
           >
             <q-tooltip>แก้ไขข้อมูล</q-tooltip>
           </q-btn>
-          <q-btn
+          <!-- <q-btn
             color="red"
             flat
             dense
@@ -295,7 +295,7 @@ async function onSubmit() {
             v-close-popup
           >
             <q-tooltip>ลบข้อมูล</q-tooltip>
-          </q-btn>
+          </q-btn> -->
         </q-td>
       </q-tr>
     </template>
diff --git a/src/modules/01_metadata/components/position/04ListExecutive.vue b/src/modules/01_metadata/components/position/04ListExecutive.vue
index 7d7907e8..c775f693 100644
--- a/src/modules/01_metadata/components/position/04ListExecutive.vue
+++ b/src/modules/01_metadata/components/position/04ListExecutive.vue
@@ -214,7 +214,7 @@ onMounted(() => {
             >
               <q-tooltip>แก้ไขข้อมูล</q-tooltip>
             </q-btn>
-            <q-btn
+            <!-- <q-btn
               color="red"
               flat
               dense
@@ -226,7 +226,7 @@ onMounted(() => {
               v-close-popup
             >
               <q-tooltip>ลบข้อมูล</q-tooltip>
-            </q-btn>
+            </q-btn> -->
           </q-td>
         </q-tr>
       </template>
diff --git a/src/modules/01_metadata/components/position/05ListLevelDetail.vue b/src/modules/01_metadata/components/position/05ListLevelDetail.vue
index 1f7837da..17348b52 100644
--- a/src/modules/01_metadata/components/position/05ListLevelDetail.vue
+++ b/src/modules/01_metadata/components/position/05ListLevelDetail.vue
@@ -355,7 +355,7 @@ onMounted(async () => {
             >
               <q-tooltip>แก้ไขข้อมูล</q-tooltip>
             </q-btn>
-            <q-btn
+            <!-- <q-btn
               color="red"
               flat
               dense
@@ -369,12 +369,11 @@ onMounted(async () => {
               v-close-popup
             >
               <q-tooltip>ลบข้อมูล</q-tooltip>
-            </q-btn>
+            </q-btn> -->
           </q-td>
         </q-tr>
       </template>
     </d-table>
-
   </div>
   <q-dialog v-model="dialog" class="dialog" persistent>
     <q-card style="width: 350px">
@@ -401,7 +400,6 @@ onMounted(async () => {
               hide-bottom-space
               :rules="[(val) => val.length > 0 || 'กรุณากรอกระดับตำแหน่ง']"
               class="inputgreen"
-
             />
           </div>
 
@@ -420,7 +418,6 @@ onMounted(async () => {
               hide-bottom-space
               mask="############"
               class="inputgreen"
-
             />
           </div>
 
@@ -441,7 +438,6 @@ onMounted(async () => {
               bg-color="white"
               hide-bottom-space
               class="inputgreen"
-
             />
           </div>
 
@@ -457,7 +453,6 @@ onMounted(async () => {
               hide-bottom-space
               readonly
               class="inputgreen"
-
             />
           </div>
         </q-card-section>