diff --git a/src/modules/14_KPI/views/report.vue b/src/modules/14_KPI/views/report.vue
index 7c13e0bfd..9fabdfa2b 100644
--- a/src/modules/14_KPI/views/report.vue
+++ b/src/modules/14_KPI/views/report.vue
@@ -261,7 +261,6 @@ function filterSelector(val: string, update: Function, type: string) {
   switch (type) {
     case "typereport":
       update(() => {
-        typeReport.value = val ? "" : typeReport.value;
         listReport.value = listReportMain.value.filter(
           (v: DataOption) => v.name.toLowerCase().indexOf(val) > -1
         );
@@ -269,7 +268,6 @@ function filterSelector(val: string, update: Function, type: string) {
       break;
     case "organization":
       update(() => {
-        organization.value = val ? "" : organization.value;
         organizationOps.value = organizationOpsMain.value.filter(
           (v: DataOption) => v.name.toLowerCase().indexOf(val) > -1
         );
@@ -497,8 +495,8 @@ onMounted(() => {
         <div class="row q-gutter-sm">
           <q-select
             :readonly="!checkPermission($route)?.attrIsGet"
-            style="min-width: 100px"
             dense
+            style="min-width: 550px"
             hide-bottom-space
             outlined
             option-label="name"
@@ -509,8 +507,11 @@ onMounted(() => {
             :options="listReport"
             label="รายงาน"
             use-input
+            hide-selected
+            fill-input
             @update:model-value="changOption"
             @filter="(inputValue: string,
+            
             doneFn: Function) => filterSelector(inputValue, doneFn ,'typereport')"
           >
             <template v-slot:no-option>
@@ -637,6 +638,8 @@ onMounted(() => {
             :disable="roundOp.length === 0"
             style="min-width: 100px"
             dense
+            hide-selected
+            fill-input
             hide-bottom-space
             outlined
             option-label="name"