From 6327df07741c6c3d56da1b4824de150cad216fea Mon Sep 17 00:00:00 2001
From: waruneeta <warunee.auy@gmail.com>
Date: Thu, 15 Feb 2024 15:23:39 +0700
Subject: [PATCH] =?UTF-8?q?=E0=B8=9B=E0=B8=A3=E0=B8=B1=E0=B8=9A=E0=B8=81?=
 =?UTF-8?q?=E0=B8=B2=E0=B8=A3=E0=B9=81=E0=B8=AA=E0=B8=94=E0=B8=87=E0=B8=9C?=
 =?UTF-8?q?=E0=B8=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/position/01ListPosition.vue            |  2 +-
 src/modules/02_organizational/views/MainTree.vue      |  4 ++--
 .../components/DialogFormPosition.vue                 | 11 +++++++++--
 .../02_organizationalNew/components/DialogMovePos.vue |  1 -
 .../components/DialogSelectPerson.vue                 | 10 ++++++++--
 .../02_organizationalNew/components/TreeMain.vue      |  4 ++--
 .../02_organizationalNew/components/TreeTable.vue     |  2 +-
 src/modules/09_leave/components/1_Work/TableList.vue  |  2 +-
 .../components/Detail/step/step9.vue                  |  2 +-
 9 files changed, 25 insertions(+), 13 deletions(-)

diff --git a/src/modules/01_metadataNew/components/position/01ListPosition.vue b/src/modules/01_metadataNew/components/position/01ListPosition.vue
index afbb769bf..0176b6c48 100644
--- a/src/modules/01_metadataNew/components/position/01ListPosition.vue
+++ b/src/modules/01_metadataNew/components/position/01ListPosition.vue
@@ -360,7 +360,7 @@ onMounted(() => {
           </q-td>
           <q-td auto-width>
             <q-btn
-              color="edit"
+              color="blue-6"
               flat
               dense
               round
diff --git a/src/modules/02_organizational/views/MainTree.vue b/src/modules/02_organizational/views/MainTree.vue
index 1f5c7ab16..dcdce2592 100644
--- a/src/modules/02_organizational/views/MainTree.vue
+++ b/src/modules/02_organizational/views/MainTree.vue
@@ -431,7 +431,7 @@
                       v-if="prop.node.organizationId != orgRootIdDraft"
                       flat
                       round
-                      color="green"
+                      color="edit"
                       @click.stop="
                         (popupEditSelectedOrganization = true),
                           (modalHeaderName = prop.node.organizationName),
@@ -440,7 +440,7 @@
                             prop.node.keyId.search('-') > 0 ? true : false)
                       "
                       size="10px"
-                      icon="mdi-pencil-outline"
+                      icon="mdi-pencil"
                     >
                       <q-tooltip>แก้ไขหน่วยงาน</q-tooltip>
                     </q-btn>
diff --git a/src/modules/02_organizationalNew/components/DialogFormPosition.vue b/src/modules/02_organizationalNew/components/DialogFormPosition.vue
index 094eaac52..0dd8af435 100644
--- a/src/modules/02_organizationalNew/components/DialogFormPosition.vue
+++ b/src/modules/02_organizationalNew/components/DialogFormPosition.vue
@@ -583,7 +583,7 @@ async function emitSearch(keyword: string, typeSelect: string) {
 
 <template>
   <q-dialog v-model="props.modal" persistent>
-    <q-card style="min-width: 96vw">
+    <q-card style="min-width: 80vw">
       <DialogHeader
         :tittle="
           props.actionType === 'ADD' ? 'เพิ่มอัตรากำลัง' : 'แก้ไขอัตรากำลัง'
@@ -592,7 +592,7 @@ async function emitSearch(keyword: string, typeSelect: string) {
       />
       <q-separator />
       <form @submit.prevent="validateForm">
-        <q-card-section class="q-pa-sm">
+        <q-card-section class="q-pa-sm fixed-height">
           <div class="row q-col-gutter-sm">
             <div class="col-12">
               <q-card bordered class="col-12" style="border: 1px solid #d6dee1">
@@ -920,3 +920,10 @@ async function emitSearch(keyword: string, typeSelect: string) {
     :data="dataCopy"
   />
 </template>
+
+<style scoped>
+.fixed-height {
+  overflow-y: auto;
+  height: 80vh;
+}
+</style>
diff --git a/src/modules/02_organizationalNew/components/DialogMovePos.vue b/src/modules/02_organizationalNew/components/DialogMovePos.vue
index 4feda6af2..1bdf62adc 100644
--- a/src/modules/02_organizationalNew/components/DialogMovePos.vue
+++ b/src/modules/02_organizationalNew/components/DialogMovePos.vue
@@ -291,7 +291,6 @@ watch(
 
       <q-card-actions align="right">
         <q-btn
-          dense
           unelevated
           label="ย้ายตำแหน่ง"
           color="public"
diff --git a/src/modules/02_organizationalNew/components/DialogSelectPerson.vue b/src/modules/02_organizationalNew/components/DialogSelectPerson.vue
index aec7d50e6..b433b9a26 100644
--- a/src/modules/02_organizationalNew/components/DialogSelectPerson.vue
+++ b/src/modules/02_organizationalNew/components/DialogSelectPerson.vue
@@ -423,7 +423,7 @@ watch([() => page.value, () => pageSize.value], () => {
         <DialogHeader :tittle="`เลือกคนครอง`" :close="close" />
         <q-separator />
 
-        <q-card-section>
+        <q-card-section class="fixed-height">
           <div class="q-px-md">
             <div class="row q-col-gutter-sm q-mb-xs">
               <div class="text-bold text-body1">
@@ -713,4 +713,10 @@ watch([() => page.value, () => pageSize.value], () => {
     </q-card>
   </q-dialog>
 </template>
-<style scoped></style>
+
+<style scoped>
+.fixed-height {
+  overflow-y: auto;
+  height: 80vh;
+}
+</style>
diff --git a/src/modules/02_organizationalNew/components/TreeMain.vue b/src/modules/02_organizationalNew/components/TreeMain.vue
index 060f51504..6c77f9f81 100644
--- a/src/modules/02_organizationalNew/components/TreeMain.vue
+++ b/src/modules/02_organizationalNew/components/TreeMain.vue
@@ -57,11 +57,11 @@ const listAdd = ref<ListMenu[]>([
     label: "แก้ไข",
     icon: "edit",
     type: "EDIT",
-    color: "info",
+    color: "edit",
   },
   {
     label: "ลบ",
-    icon: "mdi-trash-can-outline",
+    icon: "delete",
     type: "DEL",
     color: "red",
   },
diff --git a/src/modules/02_organizationalNew/components/TreeTable.vue b/src/modules/02_organizationalNew/components/TreeTable.vue
index b7453f5f3..956e6eb2c 100644
--- a/src/modules/02_organizationalNew/components/TreeTable.vue
+++ b/src/modules/02_organizationalNew/components/TreeTable.vue
@@ -70,7 +70,7 @@ const listMenu = ref<ListMenu[]>([
     label: "แก้ไข",
     icon: "edit",
     type: "EDIT",
-    color: "primary",
+    color: "edit",
   },
   {
     label: "ลบ",
diff --git a/src/modules/09_leave/components/1_Work/TableList.vue b/src/modules/09_leave/components/1_Work/TableList.vue
index e286ee364..cb742467b 100644
--- a/src/modules/09_leave/components/1_Work/TableList.vue
+++ b/src/modules/09_leave/components/1_Work/TableList.vue
@@ -178,7 +178,7 @@ onMounted(() => {
             flat
             dense
             round
-            color="primary"
+            color="edit"
             icon="edit"
             @click.prevent="onClickEdit(props.row)"
           >
diff --git a/src/modules/12_evaluatePersonal/components/Detail/step/step9.vue b/src/modules/12_evaluatePersonal/components/Detail/step/step9.vue
index 6953e8635..5b47c435e 100644
--- a/src/modules/12_evaluatePersonal/components/Detail/step/step9.vue
+++ b/src/modules/12_evaluatePersonal/components/Detail/step/step9.vue
@@ -37,7 +37,7 @@ function copyLink() {
           outline
           icon="mdi-content-copy"
           label="คัดลอกลิงก์"
-          color="primary"
+          color="blue-6"
           @click="copyLink"
         >
           <q-tooltip> คัดลอกลิงก์ </q-tooltip></q-btn