From ba649113a505e8d1edfd0f19471ce3d9ec3fc52c Mon Sep 17 00:00:00 2001
From: Tanyalak <tanyalak@frappet.com>
Date: Thu, 18 Jan 2024 11:49:53 +0700
Subject: [PATCH] =?UTF-8?q?=E0=B8=9B=E0=B8=A3=E0=B8=B1=E0=B8=9A=20css=20?=
 =?UTF-8?q?=E0=B8=9B=E0=B8=A3=E0=B8=B0=E0=B9=80=E0=B8=A1=E0=B8=B4=E0=B8=99?=
 =?UTF-8?q?=20=E0=B9=80=E0=B8=9E=E0=B8=B4=E0=B9=88=E0=B8=A1=E0=B9=80?=
 =?UTF-8?q?=E0=B8=95=E0=B8=B4=E0=B8=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/Detail/step/step2.vue          |  8 +--
 .../components/Detail/step/step3.vue          |  1 -
 .../components/Detail/step/step5.vue          |  2 +-
 .../components/Detail/step/step6.vue          |  8 +--
 .../components/Detail/step/step7.vue          |  4 +-
 .../components/Detail/step/step9.vue          | 32 ++++++------
 .../components/Detail/viewstep/viewStep7.vue  | 49 ++++++++++---------
 7 files changed, 56 insertions(+), 48 deletions(-)

diff --git a/src/modules/12_evaluatePersonal/components/Detail/step/step2.vue b/src/modules/12_evaluatePersonal/components/Detail/step/step2.vue
index a3c76cb77..8521c20ee 100644
--- a/src/modules/12_evaluatePersonal/components/Detail/step/step2.vue
+++ b/src/modules/12_evaluatePersonal/components/Detail/step/step2.vue
@@ -111,10 +111,10 @@ onMounted(async () => {
             <div class="col-12 q-pa-sm">
               <div class="row q-col-gutter-sm col-12">
                 <div class="col-xs-12 col-sm-12 row">
-                  <div class="text-weight-medium q-pt-xs q-pl-sm">
+                  <div class="text-weight-medium q-py-xs q-pl-sm">
                     ผู้บังคับบัญชาชั้นต้น
                   </div>
-                  <div class="row col-12 q-col-gutter-sm q-pa-sm">
+                  <div class="row col-12 q-col-gutter-sm">
                     <q-input
                       readonly
                       ref="elementaryFullNameRef"
@@ -145,10 +145,10 @@ onMounted(async () => {
 
               <div class="row q-col-gutter-sm col-12">
                 <div class="col-xs-12 col-sm-12 row">
-                  <div class="text-weight-medium q-pl-sm q-pt-sm">
+                  <div class="text-weight-medium q-pl-sm q-pt-md q-mb-xs">
                     ผู้บังคับบัญชาเหนือขึ้นไป 1 ระดับ
                   </div>
-                  <div class="row col-12 q-col-gutter-md q-pa-sm">
+                  <div class="row col-12 q-col-gutter-sm">
                     <q-input
                       readonly
                       ref="abovelevelFullnameRef"
diff --git a/src/modules/12_evaluatePersonal/components/Detail/step/step3.vue b/src/modules/12_evaluatePersonal/components/Detail/step/step3.vue
index 57ce748e1..1cede5f75 100644
--- a/src/modules/12_evaluatePersonal/components/Detail/step/step3.vue
+++ b/src/modules/12_evaluatePersonal/components/Detail/step/step3.vue
@@ -123,7 +123,6 @@ onMounted(async () => {
 <template>
   <q-list separator dense>
     <q-item
-      
       clickable
       v-ripple
       :active="selectedItem === 1 ? true : false"
diff --git a/src/modules/12_evaluatePersonal/components/Detail/step/step5.vue b/src/modules/12_evaluatePersonal/components/Detail/step/step5.vue
index 640e7a464..253d6e7c0 100644
--- a/src/modules/12_evaluatePersonal/components/Detail/step/step5.vue
+++ b/src/modules/12_evaluatePersonal/components/Detail/step/step5.vue
@@ -272,7 +272,7 @@ onMounted(async () => {
           separator
         >
           <q-item clickable v-ripple>
-            <q-item-section>{{ file.fileName }}</q-item-section>
+            <q-item-section class="text-grey-9">{{ file.fileName }}</q-item-section>
             <q-item-section avatar>
               <div class="row">
                 <div>
diff --git a/src/modules/12_evaluatePersonal/components/Detail/step/step6.vue b/src/modules/12_evaluatePersonal/components/Detail/step/step6.vue
index 30194b95c..dd54bae02 100644
--- a/src/modules/12_evaluatePersonal/components/Detail/step/step6.vue
+++ b/src/modules/12_evaluatePersonal/components/Detail/step/step6.vue
@@ -155,10 +155,10 @@ onMounted(async () => {
           <div class="col-12 q-pa-sm">
             <div class="row q-col-gutter-sm col-12">
               <div class="col-xs-12 col-sm-12 row">
-                <div class="text-weight-medium q-pl-sm q-pt-sm">
+                <div class="text-weight-medium q-pl-sm q-py-sm">
                   ผู้บังคับบัญชาชั้นต้น
                 </div>
-                <div class="row col-12 q-col-gutter-md">
+                <div class="row col-12 q-col-gutter-sm">
                   <q-input
                     readonly
                     ref="elementaryFullNameRef"
@@ -189,10 +189,10 @@ onMounted(async () => {
 
             <div class="row q-col-gutter-sm col-12">
               <div class="col-xs-12 col-sm-12 row">
-                <div class="text-weight-medium q-pl-sm q-pt-sm">
+                <div class="text-weight-medium q-pl-sm q-pt-md q-mb-xs">
                   ผู้บังคับบัญชาเหนือขึ้นไป 1 ระดับ
                 </div>
-                <div class="row col-12 q-col-gutter-md">
+                <div class="row col-12 q-col-gutter-sm">
                   <q-input
                     readonly
                     ref="abovelevelFullnameRef"
diff --git a/src/modules/12_evaluatePersonal/components/Detail/step/step7.vue b/src/modules/12_evaluatePersonal/components/Detail/step/step7.vue
index bc4a9adcd..42dd63adf 100644
--- a/src/modules/12_evaluatePersonal/components/Detail/step/step7.vue
+++ b/src/modules/12_evaluatePersonal/components/Detail/step/step7.vue
@@ -113,7 +113,7 @@ onMounted(async () => {
 </script>
 
 <template>
-  <q-list separator>
+  <q-list separator dense>
     <q-item
       clickable
       v-ripple
@@ -121,7 +121,7 @@ onMounted(async () => {
       active-class="text-primary"
       @click="handleItemClick(1)"
     >
-      <q-item-section>เอกสารเล่ม 2</q-item-section>
+      <q-item-section class="q-py-sm">เอกสารเล่ม 2</q-item-section>
     </q-item>
   </q-list>
 </template>
diff --git a/src/modules/12_evaluatePersonal/components/Detail/step/step9.vue b/src/modules/12_evaluatePersonal/components/Detail/step/step9.vue
index 431a956f7..35dd70989 100644
--- a/src/modules/12_evaluatePersonal/components/Detail/step/step9.vue
+++ b/src/modules/12_evaluatePersonal/components/Detail/step/step9.vue
@@ -25,20 +25,24 @@ function copyLink() {
 </script>
 
 <template>
-  <div class="row">
-    <div class="col-12 text-center">
-      <p class="text-weight-bold q-mb-none">Public URL</p>
-
-      <q-btn
-        class="q-mt-md"
-        outline
-        icon="mdi-clipboard-outline"
-        label="คัดลอกลิงก์"
-        color="primary"
-        @click="copyLink"
-      >
-        <q-tooltip> คัดลอกลิงก์ </q-tooltip></q-btn
-      >
+  <div class="row q-pa-md">
+    <div class="col-12 row items-center justify-center">
+      <div class="row"><strong>Public URL : </strong>
+        <a :href="`${link}/${id}`" class="q-pl-sm"> {{link}}/{{ id }}
+        </a>
+      </div>
+      <q-space/>
+      <div class="q-pt-sm">
+        <q-btn
+          outline
+          icon="mdi-content-copy"
+          label="คัดลอกลิงก์"
+          color="primary"
+          @click="copyLink"
+        >
+          <q-tooltip> คัดลอกลิงก์ </q-tooltip></q-btn
+        >
+      </div>
     </div>
   </div>
 </template>
diff --git a/src/modules/12_evaluatePersonal/components/Detail/viewstep/viewStep7.vue b/src/modules/12_evaluatePersonal/components/Detail/viewstep/viewStep7.vue
index da523ba30..3e36124a0 100644
--- a/src/modules/12_evaluatePersonal/components/Detail/viewstep/viewStep7.vue
+++ b/src/modules/12_evaluatePersonal/components/Detail/viewstep/viewStep7.vue
@@ -15,29 +15,34 @@ const modalPerview = ref<boolean>(false);
 </script>
 
 <template>
-  <div class="col-12 row">
-    <q-space />
-    <q-btn
-      flat
-      round
-      color="primary"
-      icon="download"
-      target="_blank"
-      :href="store.urlDownloadFile"
-    >
-      <q-tooltip>ดาวน์โหลด</q-tooltip>
-    </q-btn>
-    <q-btn
-      flat
-      round
-      color="primary"
-      icon="mdi-fullscreen"
-      @click="modalPerview = true"
-      ><q-tooltip>ดูเต็มจอ</q-tooltip></q-btn
-    >
-  </div>
+  <q-card bordered class="col-12 row shadow-0">
+    <div class="col-12 row items-center q-pa-sm q-gutter-sm">
+      <div class="q-pl-sm text-weight-medium" >เอกสารที่อัปโหลด</div>
+        <q-space />
+          <q-btn
+            flat
+            dense
+            color="primary"
+            icon="download"
+            target="_blank"
+            :href="store.urlDownloadFile"
+          >
+            <q-tooltip>ดาวน์โหลด</q-tooltip>
+          </q-btn>
+          <q-btn
+            flat
+            dense
+            color="primary"
+            icon="mdi-fullscreen"
+            @click="modalPerview = true"
+            ><q-tooltip>ดูเต็มจอ</q-tooltip></q-btn
+          >
+        </div>
+        <div class="col-12"><q-separator /></div>
+        <div class="col-12"><ViewPDF class="col-12" /></div>
+   </q-card>
 
-  <ViewPDF />
+ 
 
   <q-dialog v-model="modalPerview" full-width fullHeight>
     <q-card>