From 0e63ea42bb136a8e0593b585633b6defd9973d83 Mon Sep 17 00:00:00 2001
From: setthawutttty <stw.ttty@gmail.com>
Date: Mon, 18 Mar 2024 15:29:51 +0700
Subject: [PATCH] =?UTF-8?q?=E0=B9=81=E0=B8=81=E0=B9=89=20=E0=B9=80?=
 =?UTF-8?q?=E0=B8=9E=E0=B8=B4=E0=B9=88=E0=B8=A1=E0=B8=82=E0=B9=89=E0=B8=AD?=
 =?UTF-8?q?=E0=B8=A1=E0=B8=B9=E0=B8=A5=E0=B8=95=E0=B8=B3=E0=B9=81=E0=B8=AB?=
 =?UTF-8?q?=E0=B8=99=E0=B9=88=E0=B8=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/DialogAddPosition.vue          | 41 +++++++++++--------
 1 file changed, 25 insertions(+), 16 deletions(-)

diff --git a/src/modules/02_organizationalNew/components/DialogAddPosition.vue b/src/modules/02_organizationalNew/components/DialogAddPosition.vue
index 7547f7d90..76eb6e7a9 100644
--- a/src/modules/02_organizationalNew/components/DialogAddPosition.vue
+++ b/src/modules/02_organizationalNew/components/DialogAddPosition.vue
@@ -62,7 +62,16 @@ const executiveOpsMain = ref<DataOption[]>([]);
 const executiveOps = ref<DataOption[]>([]);
 const typeOps = ref<DataOption[]>([]);
 const levelOps = ref<DataOption[]>([]);
-
+const shapeOp = ref<DataOption[]>([
+  {
+    id:'false',
+    name:'เลือกจากรายการ'
+  }
+,  {
+    id:'true',
+    name:'เพิ่มใหม่'
+  }
+])
 const formPositionSelect = reactive<FormPositionSelect>({
   positionId: "",
   positionName: "",
@@ -421,24 +430,24 @@ watch(
                 "
               />
             </div>
-            <div class="col-12 self-center">
-              <q-radio
+            <div class="col-2">
+              <q-select
+                ref="positionExecutiveRef"
+                :class="inputEdit(isReadonly)"
+                label="ตัวเลือกตำแหน่ง"
                 v-model="shape"
-                checked-icon="task_alt"
-                unchecked-icon="panorama_fish_eye"
-                val="false"
-                label="เลือกจากรายการ"
-              />
-              <q-radio
-                v-model="shape"
-                checked-icon="task_alt"
-                w
-                unchecked-icon="panorama_fish_eye"
-                val="true"
-                label="เพิ่มใหม่"
+                :options="shapeOp"
+                emit-value
+                dense
+                map-options
+                outlined
+                option-label="name"
+                option-value="id"
+                lazy-rules
+                hide-bottom-space
               />
             </div>
-            <div class="col-6">
+            <div class="col-4">
               <q-select
                 v-if="shape == 'false'"
                 ref="positionExecutiveRef"