diff --git a/src/modules/02_users/components/Permissions/DialogAdd.vue b/src/modules/02_users/components/Permissions/DialogAdd.vue
index 7496099d..8cf551ab 100644
--- a/src/modules/02_users/components/Permissions/DialogAdd.vue
+++ b/src/modules/02_users/components/Permissions/DialogAdd.vue
@@ -111,8 +111,8 @@ function onSubmit() {
             reqMaster.value.revisionId,
             reqMaster.value.type
           );
+          closeDialog();
           await success($q, "บันทึกข้อมูลสำเร็จ");
-          await closeDialog();
         })
         .catch((err) => {
           messageError($q, err);
@@ -135,34 +135,34 @@ watch(
 <template>
   <q-dialog v-model="modal" persistent>
     <q-card class="col-12" style="width: 50%">
-      <q-form greedy @submit.prevent @validation-success="onSubmit">
-        <DialogHeader tittle="จัดการสิทธิ์" :close="closeDialog" />
-        <q-separator />
-        <q-card-section>
-          <div class="row q-col-gutter-sm">
-            <div class="col-12">
-              <q-input outlined dense v-model="keyword" label="ค้นหา">
-                <template v-slot:append>
-                  <q-icon name="search" color="grey-5" />
-                </template>
-              </q-input>
-            </div>
-            <div class="col-12">
-              <d-table
-                ref="table"
-                :columns="columns"
-                :rows="rows"
-                row-key="id"
-                flat
-                bordered
-                :paging="true"
-                dense
-                :rows-per-page-options="[10, 25, 50, 100]"
-                :visible-columns="visibleColumns"
-                selection="single"
-                v-model:selected="selected"
-              >
-                <!-- <template v-slot:header-selection="scope">
+      <DialogHeader tittle="จัดการสิทธิ์" :close="closeDialog" />
+      <q-separator />
+      <q-card-section>
+        <div class="row q-col-gutter-sm">
+          <div class="col-12">
+            <q-input outlined dense v-model="keyword" label="ค้นหา">
+              <template v-slot:append>
+                <q-icon name="search" color="grey-5" />
+              </template>
+            </q-input>
+          </div>
+          <div class="col-12">
+            <d-table
+              ref="table"
+              :columns="columns"
+              :rows="rows"
+              :filter="keyword"
+              row-key="id"
+              flat
+              bordered
+              :paging="true"
+              dense
+              :rows-per-page-options="[10, 25, 50, 100]"
+              :visible-columns="visibleColumns"
+              selection="single"
+              v-model:selected="selected"
+            >
+              <!-- <template v-slot:header-selection="scope">
                   <q-checkbox
                     keep-color
                     color="primary"
@@ -171,39 +171,38 @@ watch(
                   />
                 </template> -->
 
-                <template v-slot:body="props">
-                  <q-tr :props="props" class="cursor-pointer">
-                    <q-td>
-                      <q-checkbox
-                        keep-color
-                        color="primary"
-                        dense
-                        v-model="props.selected"
-                      />
-                    </q-td>
-                    <q-td
-                      v-for="col in props.cols"
-                      :key="col.name"
-                      :props="props"
-                    >
-                      <div>
-                        {{ col.value ? col.value : "-" }}
-                      </div>
-                    </q-td>
-                  </q-tr>
-                </template>
-              </d-table>
-            </div>
+              <template v-slot:body="props">
+                <q-tr :props="props" class="cursor-pointer">
+                  <q-td>
+                    <q-checkbox
+                      keep-color
+                      color="primary"
+                      dense
+                      v-model="props.selected"
+                    />
+                  </q-td>
+                  <q-td
+                    v-for="col in props.cols"
+                    :key="col.name"
+                    :props="props"
+                  >
+                    <div>
+                      {{ col.value ? col.value : "-" }}
+                    </div>
+                  </q-td>
+                </q-tr>
+              </template>
+            </d-table>
           </div>
-        </q-card-section>
+        </div>
+      </q-card-section>
 
-        <q-separator />
-        <q-card-actions align="right">
-          <q-btn label="บันทึก" color="secondary" type="submit"
-            ><q-tooltip>บันทึกข้อมูล</q-tooltip></q-btn
-          >
-        </q-card-actions>
-      </q-form>
+      <q-separator />
+      <q-card-actions align="right">
+        <q-btn label="บันทึก" color="secondary" type="submit" @click="onSubmit"
+          ><q-tooltip>บันทึกข้อมูล</q-tooltip></q-btn
+        >
+      </q-card-actions>
     </q-card>
   </q-dialog>
 </template>