diff --git a/src/modules/04_registryNew/components/detail/Achievement/03_Insignia.vue b/src/modules/04_registryNew/components/detail/Achievement/03_Insignia.vue
index acd834814..0a9387cd2 100644
--- a/src/modules/04_registryNew/components/detail/Achievement/03_Insignia.vue
+++ b/src/modules/04_registryNew/components/detail/Achievement/03_Insignia.vue
@@ -561,16 +561,15 @@ function onClickOpenDialog(editStatus: boolean = false, row?: ResponseObject) {
 
 async function clickClose() {
   if (editRow.value == true) {
-    $q.dialog({
-      title: `ข้อมูลมีการแก้ไข`,
-      message: `ยืนยันที่จะปิดโดยไม่บันทึกใช่หรือไม่?`,
-      cancel: "ยกเลิก",
-      ok: "ยืนยัน",
-      persistent: true,
-    }).onOk(async () => {
-      modal.value = false;
-      editRow.value = false;
-    });
+    dialogConfirm(
+      $q,
+      async () => {
+        modal.value = false;
+        editRow.value = false;
+      },
+      "ข้อมูลมีการแก้ไข",
+      "ยืนยันที่จะปิดโดยไม่บันทึกใช่หรือไม่?"
+    );
   } else {
     modal.value = false;
   }
@@ -750,10 +749,10 @@ onMounted(async () => {
             class="q-mr-xs"
             size="14px"
             color="primary"
-            icon="edit"
+            icon="mdi-pencil-outline"
             @click="onClickOpenDialog(true, props.row)"
           >
-            <q-tooltip>ลบข้อมูล</q-tooltip>
+            <q-tooltip>แก้ไขข้อมูล</q-tooltip>
           </q-btn>
           <q-btn
             flat
diff --git a/src/modules/04_registryNew/components/detail/Achievement/04_DeclarationHonor.vue b/src/modules/04_registryNew/components/detail/Achievement/04_DeclarationHonor.vue
index 5278cec74..371c696d1 100644
--- a/src/modules/04_registryNew/components/detail/Achievement/04_DeclarationHonor.vue
+++ b/src/modules/04_registryNew/components/detail/Achievement/04_DeclarationHonor.vue
@@ -515,7 +515,7 @@ watch(
               round
               color="primary"
               icon="mdi-pencil-outline"
-              @click="onClickOpenDialog(true, props)"
+              @click="onClickOpenDialog(true, props.row)"
             >
               <q-tooltip>แก่ไขข้อมุล</q-tooltip>
             </q-btn>