diff --git a/src/modules/04_registry/components/Insignia.vue b/src/modules/04_registry/components/Insignia.vue
index addb42c3f..82db3a859 100644
--- a/src/modules/04_registry/components/Insignia.vue
+++ b/src/modules/04_registry/components/Insignia.vue
@@ -206,11 +206,11 @@
                 :readonly="!edit"
                 :borderless="!edit"
                 v-model="no"
-                :rules="[(val:string) => !!val || `${'กรุณากรอกลำดับที่'}`]"
                 :label="`${'ลำดับที่'}`"
                 @update:modelValue="clickEditRow"
                 hide-bottom-space
               />
+              <!-- :rules="[(val:string) => !!val || `${'กรุณากรอกลำดับที่'}`]" -->
             </div>
             <div class="col-xs-6 col-sm-6 col-md-6">
               <q-input
@@ -221,11 +221,11 @@
                 :readonly="!edit"
                 :borderless="!edit"
                 v-model="issue"
-                :rules="[(val:string) => !!val || `${'กรุณากรอกราชกิจจาฯ ฉบับที่'}`]"
                 :label="`${'ราชกิจจาฯ ฉบับที่'}`"
                 @update:modelValue="clickEditRow"
                 hide-bottom-space
               />
+              <!-- :rules="[(val:string) => !!val || `${'กรุณากรอกราชกิจจาฯ ฉบับที่'}`]" -->
             </div>
             <div class="col-xs-6 col-sm-6 col-md-6">
               <q-input
@@ -236,11 +236,11 @@
                 :readonly="!edit"
                 :borderless="!edit"
                 v-model="volumeNo"
-                :rules="[(val:string) => !!val || `${'กรุณากรอกเล่มที่'}`]"
                 :label="`${'เล่มที่'}`"
                 @update:modelValue="clickEditRow"
                 hide-bottom-space
               />
+              <!-- :rules="[(val:string) => !!val || `${'กรุณากรอกเล่มที่'}`]" -->
             </div>
             <div class="col-xs-6 col-sm-6 col-md-6">
               <q-input
@@ -251,11 +251,11 @@
                 :readonly="!edit"
                 :borderless="!edit"
                 v-model="volume"
-                :rules="[(val:string) => !!val || `${'กรุณากรอกเล่ม'}`]"
                 :label="`${'เล่ม'}`"
                 @update:modelValue="clickEditRow"
                 hide-bottom-space
               />
+              <!-- :rules="[(val:string) => !!val || `${'กรุณากรอกเล่ม'}`]" -->
             </div>
             <div class="col-xs-6 col-sm-6 col-md-6">
               <q-input
@@ -266,11 +266,11 @@
                 :readonly="!edit"
                 :borderless="!edit"
                 v-model="section"
-                :rules="[(val:string) => !!val || `${'กรุณากรอกตอน'}`]"
                 :label="`${'ตอน'}`"
                 @update:modelValue="clickEditRow"
                 hide-bottom-space
               />
+              <!-- :rules="[(val:string) => !!val || `${'กรุณากรอกตอน'}`]" -->
             </div>
             <div class="col-xs-6 col-sm-6 col-md-6">
               <q-input
@@ -281,11 +281,11 @@
                 :readonly="!edit"
                 :borderless="!edit"
                 v-model="page"
-                :rules="[(val:string) => !!val || `${'กรุณากรอกหน้า'}`]"
                 :label="`${'หน้า'}`"
                 @update:modelValue="clickEditRow"
                 hide-bottom-space
               />
+              <!-- :rules="[(val:string) => !!val || `${'กรุณากรอกหน้า'}`]" -->
             </div>
             <div class="col-xs-6 col-sm-6 col-md-6">
               <datepicker
@@ -309,14 +309,15 @@
                     dense
                     lazy-rules
                     :borderless="!edit"
-                    :model-value="date2Thai(dateAnnounce)"
-                    :rules="[
-                      (val:string) =>
-                        !!val || `${'กรุณาเลือกวันที่ประกาศในราชกิจจาฯ'}`,
-                    ]"
+                    :model-value="dateAnnounce ? date2Thai(dateAnnounce) : null"
                     hide-bottom-space
                     :label="`${'วันที่ประกาศในราชกิจจาฯ'}`"
                   >
+                    <!-- :rules="[
+                      (val:string) =>
+                        !!val || `${'กรุณาเลือกวันที่ประกาศในราชกิจจาฯ'}`,
+                    ]" -->
+
                     <template v-slot:prepend>
                       <q-icon
                         name="event"
@@ -511,7 +512,7 @@ const volume = ref<string>();
 const section = ref<string>();
 const page = ref<string>();
 const receiveDate = ref<Date>(new Date());
-const dateAnnounce = ref<Date>(new Date());
+const dateAnnounce = ref<Date | null>(null);
 const refCommandNo = ref<string>();
 const refCommandDate = ref<Date | null>(new Date());
 const myForm = ref<any>(); //form data input
@@ -567,7 +568,7 @@ const columns = ref<QTableProps["columns"]>([
   {
     name: "receiveDate",
     align: "left",
-    label: "ลงวันที่",
+    label: "วันที่ได้รับ",
     sortable: true,
     field: "receiveDate",
     headerStyle: "font-size: 14px",
@@ -924,7 +925,7 @@ const fetchInsignia = async () => {
       data.map((r: any) => {
         option.push({
           id: r.id.toString(),
-          name: r.name.toString(),
+          name: r.name.toString() + ` (${r.shortName})`,
           typeName:
             r.insigniaType == null ? null : r.insigniaType.name.toString(),
         });
@@ -954,18 +955,17 @@ const fetchData = async () => {
             insignia: e.insignia == null ? null : e.insignia.name,
             insigniaId: e.insignia == null ? null : e.insignia.id,
             insigniaType: e.insigniaType,
-            year: e.year,
-            no: e.no,
-            issue: e.issue,
-            volumeNo: e.volumeNo,
-            volume: e.volume,
-            section: e.section,
-            page: e.page,
+            year: e.year ? e.year : "-",
+            no: e.no ? e.no : "-",
+            issue: e.issue ? e.issue : "-",
+            volumeNo: e.volumeNo ? e.volumeNo : "-",
+            volume: e.volume ? e.volume : "-",
+            section: e.section ? e.section : "-",
+            page: e.page ? e.page : "-",
             receiveDate: new Date(e.receiveDate),
-            dateAnnounce: new Date(e.dateAnnounce),
-            refCommandNo: e.refCommandNo,
-            refCommandDate:
-              e.refCommandDate == null ? null : new Date(e.refCommandDate),
+            dateAnnounce: e.dateAnnounce ? new Date(e.dateAnnounce) : "-",
+            refCommandNo: e.refCommandNo ? e.refCommandNo : "-",
+            refCommandDate: e.refCommandDate ? new Date(e.refCommandDate) : "-",
             createdFullName: e.createdFullName,
             createdAt: new Date(e.createdAt),
           });
@@ -1088,7 +1088,7 @@ const saveData = async () => {
         section: section.value,
         page: page.value,
         receiveDate: dateToISO(receiveDate.value),
-        dateAnnounce: dateToISO(dateAnnounce.value),
+        dateAnnounce: dateAnnounce.value ? dateToISO(dateAnnounce.value) : null,
         refCommandNo: refCommandNo.value,
         refCommandDate:
           refCommandDate.value == null ? null : dateToISO(refCommandDate.value),
@@ -1124,7 +1124,7 @@ const editData = async () => {
       section: section.value,
       page: page.value,
       receiveDate: dateToISO(receiveDate.value),
-      dateAnnounce: dateToISO(dateAnnounce.value),
+      dateAnnounce: dateAnnounce.value ? dateToISO(dateAnnounce.value) : null,
       refCommandNo: refCommandNo.value,
       refCommandDate:
         refCommandDate.value == null ? null : dateToISO(refCommandDate.value),
@@ -1239,7 +1239,7 @@ const addData = () => {
   section.value = "";
   page.value = "";
   receiveDate.value = new Date();
-  dateAnnounce.value = new Date();
+  dateAnnounce.value = null;
   refCommandNo.value = "";
   refCommandDate.value = null;
 };