From 1d9faaf57216f9acc8d423cac9250ea0993e7fd0 Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Thu, 12 Dec 2024 11:21:45 +0700
Subject: [PATCH] =?UTF-8?q?fix=20=E0=B8=A3=E0=B8=B1=E0=B8=81=E0=B8=A9?=
 =?UTF-8?q?=E0=B8=B2=E0=B8=81=E0=B8=B2=E0=B8=A3=E0=B9=83=E0=B8=99=E0=B8=95?=
 =?UTF-8?q?=E0=B8=B3=E0=B9=81=E0=B8=AB=E0=B8=99=E0=B9=88=E0=B8=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/modules/17_acting/views/main.vue                         | 2 +-
 src/modules/18_command/components/DialogCreateCommandORG.vue | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/modules/17_acting/views/main.vue b/src/modules/17_acting/views/main.vue
index 7470f7edc..aeaac9d82 100644
--- a/src/modules/17_acting/views/main.vue
+++ b/src/modules/17_acting/views/main.vue
@@ -317,7 +317,7 @@ onMounted(() => {
     <q-space />
     <q-btn
       class="q-px-sm"
-      v-if="storeActing.isOfficer === true"
+      v-if="storeActing.isOfficer || storeActing.isStaff"
       dense
       flat
       round
diff --git a/src/modules/18_command/components/DialogCreateCommandORG.vue b/src/modules/18_command/components/DialogCreateCommandORG.vue
index 621cc9e69..7329fac3d 100644
--- a/src/modules/18_command/components/DialogCreateCommandORG.vue
+++ b/src/modules/18_command/components/DialogCreateCommandORG.vue
@@ -206,7 +206,6 @@ async function fetchCommandType() {
  */
 function filterOption(val: string, update: Function) {
   update(() => {
-    group.value = val ? "" : group.value;
     groupOp.value = groupDataOp.value.filter(
       (v: DataOption) => v.name.indexOf(val) > -1
     );
@@ -487,12 +486,14 @@ watch(modal, async () => {
                 option-label="name"
                 :options="groupOp"
                 option-value="id"
-                class="inputgreen"
+                :class="isStaff ? '' : 'inputgreen'"
                 dense
                 :readonly="isStaff"
                 emit-value
                 map-options
                 use-input
+                hide-selected
+                fill-input
                 outlined
                 @update:model-value="updateValue"
                 @filter="(inputValue:any,doneFn:Function) => filterOption(inputValue, doneFn) "