diff --git a/src/modules/18_command/components/DialogCreateCommand.vue b/src/modules/18_command/components/DialogCreateCommand.vue
index bf4d0c4a0..166f8ced1 100644
--- a/src/modules/18_command/components/DialogCreateCommand.vue
+++ b/src/modules/18_command/components/DialogCreateCommand.vue
@@ -44,7 +44,7 @@ const commandNo = ref<string>("");
 const commandYear = ref<number>(new Date().getFullYear());
 
 const rows = ref<DataListCommand[]>([]); // รายการคำสั่ง
-const selected = ref<any>([]); // id คำสั่งที่เลือก
+const selected = ref<any[]>([]); // id คำสั่งที่เลือก
 const filter = ref<string>(""); // คำค้นหา
 
 const total = ref<number>(0);
@@ -238,6 +238,8 @@ function clearValue() {
   commandYear.value = new Date().getFullYear();
 
   selectCreate.value = "NEW";
+  selected.value = []
+  filter.value = ''
 }
 
 const selectCreate = ref<string | null>("NEW");
@@ -542,7 +544,7 @@ watch(modal, () => {
         <q-btn
           label="บันทึก"
           @click="onSubmit"
-          :disable="selected || commandType == ''"
+          :disable="selected.length == 0 && commandType == ''"
           color="public"
           ><q-tooltip>บันทึก</q-tooltip></q-btn
         >