From 4a2f43bbf41484c7f0aff74202d230438f5564ef Mon Sep 17 00:00:00 2001
From: waruneeta <warunee.auy@gmail.com>
Date: Mon, 19 Feb 2024 14:47:31 +0700
Subject: [PATCH] =?UTF-8?q?=E0=B9=81=E0=B8=81=E0=B9=89=20layout=20?=
 =?UTF-8?q?=E0=B9=82=E0=B8=84=E0=B8=A3=E0=B8=87=E0=B8=AA=E0=B8=A3=E0=B9=89?=
 =?UTF-8?q?=E0=B8=B2=E0=B8=87=E0=B9=81=E0=B8=A5=E0=B8=B0=E0=B8=9B=E0=B8=A3?=
 =?UTF-8?q?=E0=B8=B1=E0=B8=9A=E0=B8=81=E0=B8=B2=E0=B8=A3=E0=B9=81=E0=B8=AA?=
 =?UTF-8?q?=E0=B8=94=E0=B8=87=E0=B8=9C=E0=B8=A5=E0=B8=9C=E0=B8=B1=E0=B8=87?=
 =?UTF-8?q?=E0=B9=80=E0=B8=87=E0=B8=B4=E0=B8=99=E0=B9=80=E0=B8=94=E0=B8=B7?=
 =?UTF-8?q?=E0=B8=AD=E0=B8=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/DialogSuccession.vue                    | 10 ++++++----
 src/modules/13_salary/views/salaryRate.vue             |  5 +++--
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/modules/02_organizationalNew/components/DialogSuccession.vue b/src/modules/02_organizationalNew/components/DialogSuccession.vue
index 4e0882eb5..f86c43472 100644
--- a/src/modules/02_organizationalNew/components/DialogSuccession.vue
+++ b/src/modules/02_organizationalNew/components/DialogSuccession.vue
@@ -215,8 +215,8 @@ function clearForm() {
 </script>
 
 <template>
-  <q-dialog v-model="modal" full-width persistent>
-    <q-card>
+  <q-dialog v-model="modal" full-width full-height persistent>
+    <q-card class="column full-height">
       <Header
         :tittle="'เลือกตำแหน่งที่ต้องการสืบทอดจากโครงสร้างปัจจุบัน'"
         :close="
@@ -227,12 +227,12 @@ function clearForm() {
       />
       <q-separator />
 
-      <q-card-section class="q-pt-none q-pa-md">
+      <q-card-section class="q-pt-none q-pa-md bg-grey-2">
         <div class="row q-col-gutter-md">
           <q-card
             bordered
             class="col-12 col-sm-4 scroll q-pa-sm"
-            style="max-height: 70vh"
+            style="height: 750px"
           >
             <q-toolbar style="padding: 0">
               <q-toolbar-title class="text-subtitle2 text-bold"
@@ -392,6 +392,8 @@ function clearForm() {
         </div>
       </q-card-section>
 
+      <q-separator />
+
       <q-card-actions align="right" class="bg-white text-teal">
         <q-btn label="สืบทอดตำแหน่ง" color="public" @click="onClickConfirm" />
       </q-card-actions>
diff --git a/src/modules/13_salary/views/salaryRate.vue b/src/modules/13_salary/views/salaryRate.vue
index b1a929125..7c18bf5b3 100644
--- a/src/modules/13_salary/views/salaryRate.vue
+++ b/src/modules/13_salary/views/salaryRate.vue
@@ -286,8 +286,9 @@ watch([() => formQuery.page, () => formQuery.pageSize], async () => {
                 </div>
                 <div v-else-if="col.name === 'isNext'">
                   <q-icon
-                    :name="col.value ? 'done' : 'close'"
-                    :color="col.value ? 'primary' : 'grey'"
+                    v-if="col.value"
+                    name="done"
+                    color="primary"
                     size="24px"
                   />
                 </div>