diff --git a/src/modules/04_registryNew/components/detail/Achievement/01_ProfessionalLicense.vue b/src/modules/04_registryNew/components/detail/Achievement/01_ProfessionalLicense.vue
index 385369625..d3ee0f275 100644
--- a/src/modules/04_registryNew/components/detail/Achievement/01_ProfessionalLicense.vue
+++ b/src/modules/04_registryNew/components/detail/Achievement/01_ProfessionalLicense.vue
@@ -28,6 +28,8 @@ const route = useRoute();
 const id = ref<string>(route.params.id.toString());
 const dialogStatus = ref<string>("create");
 const editId = ref<string>("");
+const keyword = ref<string>("");
+const historyKeyword = ref<string>("");
 
 const columns = ref<QTableProps["columns"]>([
   {
@@ -95,31 +97,15 @@ const profesLicenseData = reactive<RequestItemsObject>({
   certificateNo: "",
   issueDate: new Date(),
   expireDate: new Date(),
+  profileId: id.value,
 });
 
 const rows = ref<ResponseObject[]>([]);
 const historyRows = ref<ResponseObject[]>([]);
 
-const formFilter = reactive({
-  page: 1,
-  pageSize: 10,
-  keyword: "",
-});
-
-const historyFormFilter = reactive({
-  page: 1,
-  pageSize: 10,
-  keyword: "",
-});
-
 const pagination = ref({
-  page: formFilter.page,
-  rowsPerPage: formFilter.pageSize,
-});
-
-const historyPagination = ref({
-  page: historyFormFilter.page,
-  rowsPerPage: historyFormFilter.pageSize,
+  page: 1,
+  rowsPerPage: 2,
 });
 
 const visibleColumns = ref<string[]>([
@@ -138,10 +124,6 @@ const historyVisibleColumns = ref<string[]>([
   "expireDate",
 ]);
 
-function validateForm() {
-  onSubmit();
-}
-
 async function onSubmit() {
   dialogConfirm(
     $q,
@@ -198,13 +180,7 @@ function editForm(row: any) {
 async function addData() {
   await http
     .post(config.API.profileNewCertificate, {
-      profileId: id.value,
-      expireDate: profesLicenseData.expireDate,
-      issueDate: profesLicenseData.issueDate,
-      certificateNo: profesLicenseData.certificateNo,
-      certificateType: profesLicenseData.certificateType,
-      issuer: profesLicenseData.issuer,
-      isActive: true,
+      ...profesLicenseData,
     })
     .then(() => {
       fetchData(id.value);
@@ -221,12 +197,8 @@ async function addData() {
 async function editData(idData: string) {
   await http
     .patch(config.API.profileNewCertificateByCertificateId(idData), {
-      expireDate: profesLicenseData.expireDate,
-      issueDate: profesLicenseData.issueDate,
-      certificateNo: profesLicenseData.certificateNo,
-      certificateType: profesLicenseData.certificateType,
-      issuer: profesLicenseData.issuer,
-      isActive: true,
+      ...profesLicenseData,
+      profileId: undefined,
     })
     .then(() => {
       fetchData(id.value);
@@ -240,18 +212,20 @@ async function editData(idData: string) {
     });
 }
 
-async function deleteData(idData: string) {
-  await http
-    .delete(config.API.profileNewCertificateByCertificateId(idData))
-    .then(() => {
-      fetchData(id.value);
-    })
-    .catch((err) => {
-      messageError($q, err);
-    })
-    .finally(() => {
-      hideLoader();
-    });
+function deleteData(idData: string) {
+  dialogRemove($q, () =>
+    http
+      .delete(config.API.profileNewCertificateByCertificateId(idData))
+      .then(() => {
+        fetchData(id.value);
+      })
+      .catch((err) => {
+        messageError($q, err);
+      })
+      .finally(() => {
+        hideLoader();
+      })
+  );
 }
 
 async function fetchHistoryData(id: string) {
@@ -293,13 +267,7 @@ onMounted(async () => {
     >
 
     <q-space />
-    <q-input
-      dense
-      outlined
-      v-model="formFilter.keyword"
-      label="ค้นหา"
-      class="q-mr-sm"
-    >
+    <q-input dense outlined v-model="keyword" label="ค้นหา" class="q-mr-sm">
       <template v-slot:append>
         <q-icon name="search" />
       </template>
@@ -362,7 +330,7 @@ onMounted(async () => {
     bordered
     :paging="true"
     dense
-    :filter="formFilter.keyword"
+    :filter="keyword"
     v-model:pagination="pagination"
     :rows-per-page-options="[20, 50, 100]"
     class="custom-header-table"
@@ -422,9 +390,7 @@ onMounted(async () => {
             size="14px"
             icon="mdi-delete"
             clickable
-            @click.stop="
-              dialogRemove($q, async () => await deleteData(props.row.id))
-            "
+            @click.stop="deleteData(props.row.id)"
             v-close-popup
           >
             <q-tooltip>ลบข้อมูล</q-tooltip>
@@ -484,7 +450,7 @@ onMounted(async () => {
 
   <q-dialog v-model="dialog" class="dialog" persistent>
     <q-card style="min-width: 40%" class="bg-white">
-      <q-form @submit.prevent greedy @validation-success="validateForm">
+      <q-form @submit.prevent greedy @validation-success="onSubmit()">
         <q-card-section class="flex justify-between" style="padding: 0">
           <dialog-header
             :tittle="dialogStatus == 'edit' ? 'แก้ไขข้อมูล' : 'เพิ่มข้อมูล'"
@@ -492,7 +458,7 @@ onMounted(async () => {
           />
         </q-card-section>
         <q-separator color="grey-4" />
-        <q-card-section class="row q-gutter-sm q-pb-sm">
+        <div class="row q-gutter-sm q-px-md q-pb-sm q-mt-sm">
           <div class="col">
             <q-input
               outlined
@@ -517,8 +483,8 @@ onMounted(async () => {
               hide-bottom-space
             />
           </div>
-        </q-card-section>
-        <q-card-section class="row q-gutter-sm q-py-none">
+        </div>
+        <div class="row q-gutter-sm q-px-md q-pb-sm">
           <div class="col">
             <q-input
               outlined
@@ -573,8 +539,8 @@ onMounted(async () => {
               </template>
             </datepicker>
           </div>
-        </q-card-section>
-        <q-card-section class="row q-pt-sm q-gutter-sm">
+        </div>
+        <div class="row q-gutter-sm q-px-md q-pb-sm">
           <div class="col">
             <datepicker
               menu-class-name="modalfix"
@@ -614,7 +580,7 @@ onMounted(async () => {
             </datepicker>
           </div>
           <div class="col"></div>
-        </q-card-section>
+        </div>
         <q-card-actions align="right">
           <q-btn
             id="onSubmit"
@@ -634,81 +600,79 @@ onMounted(async () => {
 
   <q-dialog v-model="historyDialog" class="dialog" persistent>
     <q-card style="min-width: 70%" class="bg-white">
-      <q-form @submit.prevent greedy @validation-success="validateForm">
-        <q-card-section class="flex justify-between" style="padding: 0">
-          <dialog-header
-            tittle="ประวัติแก้ไขใบอนุญาตประกอบวิชาชีพ"
-            :close="closeHistoryDialog"
-          />
-        </q-card-section>
-        <q-separator color="grey-4" />
-        <q-card-section>
-          <q-toolbar style="padding: 0px" class="text-primary q-mb-sm">
-            <q-space />
-            <q-input
-              dense
-              outlined
-              bg-color="white"
-              v-model="historyFormFilter.keyword"
-              label="ค้นหา"
-              class="q-mr-sm"
-            >
-              <template v-slot:append>
-                <q-icon name="search" />
-              </template>
-            </q-input>
-
-            <q-select
-              v-model="historyVisibleColumns"
-              multiple
-              outlined
-              dense
-              bg-color="white"
-              options-dense
-              :display-value="$q.lang.table.columns"
-              emit-value
-              map-options
-              :options="columns"
-              option-value="name"
-              options-cover
-              style="min-width: 150px"
-            />
-          </q-toolbar>
-          <d-table
-            ref="table"
-            :columns="columns"
-            :rows="historyRows"
-            row-key="name"
-            flat
-            :filter="historyFormFilter.keyword"
-            v-model:pagination="historyPagination"
-            bordered
-            :paging="true"
+      <q-card-section class="flex justify-between" style="padding: 0">
+        <dialog-header
+          tittle="ประวัติแก้ไขใบอนุญาตประกอบวิชาชีพ"
+          :close="closeHistoryDialog"
+        />
+      </q-card-section>
+      <q-separator color="grey-4" />
+      <q-card-section>
+        <q-toolbar style="padding: 0px" class="text-primary q-mb-sm">
+          <q-space />
+          <q-input
             dense
-            :rows-per-page-options="[20, 50, 100]"
-            class="custom-header-table"
-            :visible-columns="historyVisibleColumns"
+            outlined
+            bg-color="white"
+            v-model="historyKeyword"
+            label="ค้นหา"
+            class="q-mr-sm"
           >
-            <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 v-slot:append>
+              <q-icon name="search" />
             </template>
-            <template v-slot:body="props">
-              <q-tr :props="props" class="cursor-pointer">
-                <q-td v-for="col in props.cols" :key="col.id">
-                  <div>
-                    {{ col.value ? col.value : "-" }}
-                  </div>
-                </q-td>
-              </q-tr>
-            </template>
-          </d-table>
-        </q-card-section>
-      </q-form>
+          </q-input>
+
+          <q-select
+            v-model="historyVisibleColumns"
+            multiple
+            outlined
+            dense
+            bg-color="white"
+            options-dense
+            :display-value="$q.lang.table.columns"
+            emit-value
+            map-options
+            :options="columns"
+            option-value="name"
+            options-cover
+            style="min-width: 150px"
+          />
+        </q-toolbar>
+        <d-table
+          ref="table"
+          :columns="columns"
+          :rows="historyRows"
+          row-key="name"
+          flat
+          :filter="historyKeyword"
+          v-model:pagination="pagination"
+          bordered
+          :paging="true"
+          dense
+          :rows-per-page-options="[20, 50, 100]"
+          class="custom-header-table"
+          :visible-columns="historyVisibleColumns"
+        >
+          <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">
+              <q-td v-for="col in props.cols" :key="col.id">
+                <div>
+                  {{ col.value ? col.value : "-" }}
+                </div>
+              </q-td>
+            </q-tr>
+          </template>
+        </d-table>
+      </q-card-section>
     </q-card>
   </q-dialog>
 </template>
diff --git a/src/modules/04_registryNew/interface/request/ProfesLicense.ts b/src/modules/04_registryNew/interface/request/ProfesLicense.ts
index 0753c11b4..5a005de57 100644
--- a/src/modules/04_registryNew/interface/request/ProfesLicense.ts
+++ b/src/modules/04_registryNew/interface/request/ProfesLicense.ts
@@ -4,6 +4,7 @@ interface RequestItemsObject {
     certificateNo: string;
     issueDate: Date;
     expireDate: Date;
+    profileId: string;
 }
 
 export type { RequestItemsObject };