diff --git a/src/modules/07_insignia/components/3_result/Dialogbody.vue b/src/modules/07_insignia/components/3_result/Dialogbody.vue
index 4351df2d2..201f817be 100644
--- a/src/modules/07_insignia/components/3_result/Dialogbody.vue
+++ b/src/modules/07_insignia/components/3_result/Dialogbody.vue
@@ -58,11 +58,11 @@ const SaveData = async (type:string,id:string) => {
 const dataSave = (type:string,id:string) => {
   const formData = new FormData();
     if(props.fileCheck === null){
-        formData.append("Datereceiveinsignia", Datereceive.value);
+        formData.append("Datereceiveinsignia", Datereceive.value?.toString() ?? "");
         formData.append("Docreceiveinsignia", files.value);
         formData.append("Orgreceiveinsignia", nullii.value);
     } else {
-        formData.append("DateReturnInsignia", Datereturn.value);
+        formData.append("DateReturnInsignia", Datereturn.value?.toString() ?? "");
         formData.append("DocReturnInsignia", filesReturn.value);
         formData.append("OrgReturnInsignia", nullii.value);
     }
diff --git a/src/modules/07_insignia/views/ResultPage.vue b/src/modules/07_insignia/views/ResultPage.vue
index c8a477cc5..be1724193 100644
--- a/src/modules/07_insignia/views/ResultPage.vue
+++ b/src/modules/07_insignia/views/ResultPage.vue
@@ -36,6 +36,9 @@ const fileResult = ref<any>(null);
 const fileinvoice = ref<any>(null);
 const loadView = ref<boolean>(false);
 const insigniaTypeOption = ref<any>([]);
+const insigniaTypeFilter = ref<any>({
+  insigniaTypeOption:[],
+});
 const ModalDialog = ref<boolean>(false);
 const dateReceiveInsignia = ref<Date>()
 const fileCheck = ref<any>()
@@ -433,6 +436,14 @@ const OpenModal = (data:any) => {
   fileCheck.value = data.docReceiveInsignia
   personId.value = data.id
 };
+const filterSelector = (val: any, update: Function, name: any) => {
+  update(() => {
+    const needle = val.toLowerCase()
+    insigniaTypeFilter.value = insigniaTypeOption.value.filter(
+      (v: any) => v.name.toLowerCase().indexOf(needle) > -1
+    );
+  });
+};
 </script>
 
 <template>
@@ -565,13 +576,18 @@ const OpenModal = (data:any) => {
                 :label="`${'เครื่องราชฯ'}`"
                 emit-value
                 map-options
+                use-input
+                clearable
                 option-label="name"
-                :options="insigniaTypeOption"
+                :options="insigniaTypeFilter"
                 option-value="id"
                 :readonly="false"
                 :borderless="false"
                 style="min-width: 150px"
                 @update:model-value="selectorInsignia"
+                @filter="(inputValue:any,
+                      doneFn:Function) => filterSelector(inputValue, doneFn,'insigniaTypeFilter'
+                      ) "
               />
             </div>
             <div>