From 8558cf9b45effc2fe175c833bab7aea9b9b377ff Mon Sep 17 00:00:00 2001
From: setthawutttty <stw.ttty@gmail.com>
Date: Wed, 7 Feb 2024 11:11:36 +0700
Subject: [PATCH] =?UTF-8?q?=E0=B9=81=E0=B8=81=E0=B9=89=E0=B8=84=E0=B8=99?=
 =?UTF-8?q?=E0=B8=84=E0=B8=A3=E0=B8=AD=E0=B8=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/DialogSelectPerson.vue         | 33 ++++++++++---------
 .../components/tableTree.vue                  |  2 +-
 2 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/src/modules/02_organizationalNew/components/DialogSelectPerson.vue b/src/modules/02_organizationalNew/components/DialogSelectPerson.vue
index e70868570..7b5b4cd22 100644
--- a/src/modules/02_organizationalNew/components/DialogSelectPerson.vue
+++ b/src/modules/02_organizationalNew/components/DialogSelectPerson.vue
@@ -335,7 +335,7 @@ function onSubmit() {
     //     await close();
     //     await hideLoader();
     //   });
-  });
+  },'ยืนยันการเลือกคนครอง','ต้องการยืนยันการเลือกคนครองตำแหน่งนี้ใช่หรือไม่?');
 }
 
 /** เมื่อ enter ให้ทำการ ค้นหาข้อมูล */
@@ -425,6 +425,20 @@ function filterFn() {
                 </div>
               </div>
               <div class="row q-col-gutter-sm q-mt-sm">
+                <div class="col-3">
+                  <q-input
+                    ref="positionExecutiveFieldRef"
+                    v-model="formData.personal"
+                    :class="inputEdit(isReadonly)"
+                    dense
+                    outlined
+                    for="#search"
+                    label="ค้นหาจากชื่อ-นามสกุล หรือเลขประจำตัวประชาชน"
+                    lazy-rules
+                    hide-bottom-space
+                    @keydown.enter.prevent="filterFn"
+                  />
+                </div>
                 <div class="col-2">
                   <q-select
                     ref="positionTypeRef"
@@ -471,20 +485,7 @@ function filterFn() {
                     "
                   />
                 </div>
-                <div class="col-2">
-                  <q-input
-                    ref="positionExecutiveFieldRef"
-                    v-model="formData.personal"
-                    :class="inputEdit(isReadonly)"
-                    dense
-                    outlined
-                    for="#search"
-                    label="คำค้นหา"
-                    lazy-rules
-                    hide-bottom-space
-                    @keydown.enter.prevent="filterFn"
-                  />
-                </div>
+
                 <q-space />
                 <q-select
                   for="#select"
@@ -549,7 +550,7 @@ function filterFn() {
           </q-card-section>
           <q-separator />
           <q-card-actions align="right" class="bg-white text-teal">
-            <q-btn type="submit" :label="`บันทึก`" color="public" />
+            <q-btn type="submit" :label="`ยืนยัน`" color="public" />
           </q-card-actions>
         </form>
       </q-card>
diff --git a/src/modules/02_organizationalNew/components/tableTree.vue b/src/modules/02_organizationalNew/components/tableTree.vue
index 9c68023d6..d197bec5f 100644
--- a/src/modules/02_organizationalNew/components/tableTree.vue
+++ b/src/modules/02_organizationalNew/components/tableTree.vue
@@ -475,7 +475,7 @@ function openSelectPerson(data: DataPosition[]) {
                   >
                     <q-item-section>
                       <div class="row items-center">
-                        <q-icon color="primary" size="17px" name="edit" />
+                        <q-icon color="info" size="17px" name="mdi-account-circle" />
                         <div class="q-pl-md">เลือกคนครอง</div>
                       </div>
                     </q-item-section>