From f08e636d82372a9f7719ad367a4062fefd1238fd Mon Sep 17 00:00:00 2001
From: "STW_TTTY\\stwtt" <trx.setthawut@gmail.com>
Date: Tue, 11 Jun 2024 16:02:21 +0700
Subject: [PATCH] =?UTF-8?q?=E0=B8=9B=E0=B8=A3=E0=B8=B1=E0=B8=9A=E0=B8=A3?=
 =?UTF-8?q?=E0=B8=B9=E0=B8=9B=E0=B9=81=E0=B8=9A=E0=B8=9A=E0=B8=9F=E0=B8=AD?=
 =?UTF-8?q?=E0=B8=A3=E0=B9=8C=E0=B8=A1=20=E0=B8=9B=E0=B8=B8=E0=B9=88?=
 =?UTF-8?q?=E0=B8=A1=20=E0=B9=83=E0=B8=99=E0=B8=A3=E0=B8=B0=E0=B8=9A?=
 =?UTF-8?q?=E0=B8=9A=E0=B8=9A=E0=B8=A3=E0=B8=B4=E0=B8=81=E0=B8=B2=E0=B8=A3?=
 =?UTF-8?q?=E0=B9=80=E0=B8=88=E0=B9=89=E0=B8=B2=E0=B8=82=E0=B8=AD=E0=B8=87?=
 =?UTF-8?q?=E0=B8=82=E0=B9=89=E0=B8=AD=E0=B8=A1=E0=B8=B9=E0=B8=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/modules/02_transfer/views/AddTransfer.vue |  46 +++--
 src/modules/03_retire/views/addRetire.vue     |  33 ++--
 .../05_leave/components/DialogDetail.vue      |   3 +
 .../components/FormLeave/01_SickForm.vue      |  10 +-
 src/modules/05_leave/views/AddPage.vue        |   6 +-
 .../components/EvaluateStepMain.vue           |   6 +-
 .../06_evaluate/components/step/step2.vue     |   2 +-
 .../components/viewstep/popupHistory.vue      |   2 +-
 src/modules/07_appealComplain/views/Form.vue  |  10 +-
 src/modules/07_appealComplain/views/Main.vue  | 184 +++++++++---------
 src/modules/08_KPI/views/main.vue             |  12 +-
 src/modules/08_KPI/views/mainEvaluator.vue    |   9 +-
 .../11_probation/component/01_Assign.vue      |   2 +
 .../component/07_EvaluateReport.vue           |   1 +
 .../component/08_SurveyComment.vue            |   2 +
 .../addPage/02_addevaluacommander.vue         |   1 +
 16 files changed, 171 insertions(+), 158 deletions(-)

diff --git a/src/modules/02_transfer/views/AddTransfer.vue b/src/modules/02_transfer/views/AddTransfer.vue
index a359a55..0c98baa 100644
--- a/src/modules/02_transfer/views/AddTransfer.vue
+++ b/src/modules/02_transfer/views/AddTransfer.vue
@@ -111,6 +111,10 @@ const fileUploadDoc = async (file: any) => {
   nameFile.value = file[0].name;
   files.value = file;
 };
+
+function fileOpen(url: string) {
+  window.open(url, "_blank");
+}
 </script>
 
 <template>
@@ -147,6 +151,7 @@ const fileUploadDoc = async (file: any) => {
                   dense
                   outlined
                   v-model="tranferOrg"
+                  hide-bottom-space
                   label="หน่วยงานที่ขอโอนไป"
                   :readonly="routeName != 'addTransfer'"
                   :rules="[(val:string) => !!val || `${'กรุณากรอกหน่วยงานที่ขอโอนไป'}`]"
@@ -159,6 +164,7 @@ const fileUploadDoc = async (file: any) => {
                   outlined
                   v-model="noteReason"
                   label="เหตุผล"
+                  hide-bottom-space
                   type="textarea"
                   :readonly="routeName != 'addTransfer'"
                   :rules="[(val:string) => !!val || `${'กรุณากรอกเหตุผล'}`]"
@@ -193,26 +199,31 @@ const fileUploadDoc = async (file: any) => {
                   /> -->
                 </div>
                 <div class="col-12 row" v-if="routeName != 'addTransfer'">
-                  <div
-                    class="bg-grey-1 q-pa-sm col-12 row items-center text-primary"
-                  >
-                    <div class="q-pl-sm text-weight-bold text-dark">
-                      เอกสารเพิ่มเติม
-                    </div>
-                  </div>
                   <q-card bordered flat class="full-width">
+                    <div
+                      class="bg-grey-1 q-pa-sm col-12 row items-center text-primary"
+                    >
+                      <div class="q-pl-sm text-weight-bold text-dark">
+                        เอกสารเพิ่มเติม
+                      </div>
+                    </div>
+                    <q-separator />
                     <q-list separator>
                       <q-item
                         v-for="file in files"
                         :key="file.key"
-                        class="q-my-xs"
                       >
                         <q-item-section>
-                          <q-item-label class="full-width ellipsis">
-                            {{ file.fileName }}
-                          </q-item-label>
-
-                          <q-item-label caption> </q-item-label>
+                          {{ file.fileName }}
+                        </q-item-section>
+                        <q-item-section avatar>
+                          <q-btn
+                            color="teal-5"
+                            round
+                            flat
+                            icon="mdi-download"
+                            @click="fileOpen(file.pathName)"
+                          ></q-btn>
                         </q-item-section>
                       </q-item>
                     </q-list>
@@ -222,17 +233,20 @@ const fileUploadDoc = async (file: any) => {
             </div>
           </div>
           <q-separator v-if="routeName == 'addTransfer'" />
-          <div class="row col-12 q-pa-md" v-if="routeName == 'addTransfer'">
+          <q-card-actions
+            align="right"
+            class="row col-12"
+            v-if="routeName == 'addTransfer'"
+          >
             <q-space />
             <q-btn
               unelevated
-              dense
               class="q-px-md items-center"
               color="primary"
               label="ยื่นเรื่องขอโอน"
               type="onsubmit"
             />
-          </div>
+          </q-card-actions>
         </q-card>
       </q-form>
     </div>
diff --git a/src/modules/03_retire/views/addRetire.vue b/src/modules/03_retire/views/addRetire.vue
index 71ab64a..007a448 100644
--- a/src/modules/03_retire/views/addRetire.vue
+++ b/src/modules/03_retire/views/addRetire.vue
@@ -184,7 +184,7 @@ function downloadFile(data: string) {
         <q-card bordered>
           <div class="col-12 row q-col-gutter-sm q-pa-md">
             <div class="col-xs-12 col-sm-12">
-              <div class="col-12 row q-pa-sm q-col-gutter-sm">
+              <div class="col-12 row q-col-gutter-sm">
                 <q-input
                   :class="
                     routeName !== 'AddRetire'
@@ -331,12 +331,12 @@ function downloadFile(data: string) {
                       <q-icon name="attach_file" /> </template
                   ></q-file>
                 </div>
-                <div class="col-12 row">
+                <div class="col-12 row" v-if="routeName != 'AddRetire'">
                   <q-card
                     bordered
                     flat
                     class="row col-12 text-dark q-mt-sm"
-                    v-if="routeName != 'AddRetire'"
+                    
                   >
                     <div
                       class="bg-grey-1 q-pa-sm col-12 row items-center text-primary"
@@ -375,11 +375,11 @@ function downloadFile(data: string) {
                   </q-card>
                 </div>
 
-                <div class="col-12 row">
+                <div class="col-12 row" v-if="routeName != 'AddRetire'">
                   <q-card
                     bordered
                     class="row col-12 text-dark q-mt-sm"
-                    v-if="routeName != 'AddRetire'"
+                    
                   >
                     <div
                       class="bg-grey-1 q-pa-sm col-12 row items-center text-primary"
@@ -443,11 +443,11 @@ function downloadFile(data: string) {
                   </q-card>
                 </div>
 
-                <div class="col-12 row">
+                <div class="col-12 row" v-if="routeName != 'AddRetire'">
                   <q-card
                     bordered
                     class="row col-12 text-dark q-mt-sm"
-                    v-if="routeName != 'AddRetire'"
+                    
                   >
                     <div
                       class="bg-grey-1 q-pa-sm col-12 row items-center text-primary"
@@ -510,11 +510,11 @@ function downloadFile(data: string) {
                     </div>
                   </q-card>
                 </div>
-                <div class="col-12 row">
+                <div class="col-12 row" v-if="routeName != 'AddRetire'">
                   <q-card
                     bordered
                     class="row col-12 text-dark q-mt-sm"
-                    v-if="routeName != 'AddRetire'"
+                    
                   >
                     <div
                       class="bg-grey-1 q-pa-sm col-12 row items-center text-primary"
@@ -580,8 +580,9 @@ function downloadFile(data: string) {
               </div>
             </div>
 
-            <div class="row col-12 q-pa-md" v-if="routeName != 'AddRetire'">
-              <q-space />
+          </div>
+          <q-separator v-if="routeName !== 'AddRetire'" />
+          <q-card-actions align="right" v-if="routeName !== 'AddRetire'" class="q-px-md">
               <q-btn
                 v-if="
                   dataDetail.status !== 'DELETE' &&
@@ -589,27 +590,25 @@ function downloadFile(data: string) {
                   dataDetail.status !== 'CANCEL'
                 "
                 unelevated
-                dense
+                
                 class="q-px-md items-center"
                 color="orange"
                 label="ยกเลิกการลาออก"
                 @click="cancelResing"
                 :disable="tranferOrg == '' && noteReason == ''"
               />
-            </div>
-          </div>
+            </q-card-actions>
           <q-separator v-if="routeName == 'AddRetire'" />
-          <div class="row col-12 q-pa-md" v-if="routeName == 'AddRetire'">
+            <q-card-actions align="right" v-if="routeName == 'AddRetire'" class="q-px-md">
             <q-space />
             <q-btn
               unelevated
-              dense
               class="q-px-md items-center"
               color="primary"
               label="ยื่นเรื่องขอลาออก"
               type="submit"
             />
-          </div>
+          </q-card-actions>
         </q-card>
       </q-form>
     </div>
diff --git a/src/modules/05_leave/components/DialogDetail.vue b/src/modules/05_leave/components/DialogDetail.vue
index f8de050..d74bd9b 100644
--- a/src/modules/05_leave/components/DialogDetail.vue
+++ b/src/modules/05_leave/components/DialogDetail.vue
@@ -513,6 +513,7 @@ watch(
             label="เขียนที่"
             :rules="[(val) => !!val || 'กรุณากรอกเขียนที่']"
             lazy-rules
+            hide-bottom-space
             outlined
             dense
           />
@@ -522,6 +523,7 @@ watch(
             type="textarea"
             label="กรอกเหตุผล"
             :rules="[(val) => !!val || 'กรูณากรอกเหตุผล']"
+            hide-bottom-space
             lazy-rules
             outlined
             dense
@@ -532,6 +534,7 @@ watch(
             v-model="formDelete.doc"
             label="เลือกไฟล์เอกสารหลักฐาน"
             :rules="[(val) => !!val || 'กรูณา เลือกไฟล์เอกสารหลักฐาน']"
+            hide-bottom-space
             lazy-rules
             use-chips
             dense
diff --git a/src/modules/05_leave/components/FormLeave/01_SickForm.vue b/src/modules/05_leave/components/FormLeave/01_SickForm.vue
index 2e1567e..31ebfdb 100644
--- a/src/modules/05_leave/components/FormLeave/01_SickForm.vue
+++ b/src/modules/05_leave/components/FormLeave/01_SickForm.vue
@@ -567,14 +567,13 @@ onMounted(() => {
 
 		<q-separator class="q-mt-sm" />
 
-		<div class="row col-12 q-pt-md">
-			<q-space />
+        <q-card-actions align="right" class="bg-white text-teal q-pa-none q-pt-sm">
 			<q-btn
 				v-if="!props.data || props.data.status == 'DRAFT'"
 				id="onSubmit"
 				type="submit"
 				unelevated
-				dense
+				
 				class="q-px-md items-center btnBlue"
 				label="บันทึก"
 				><q-tooltip>บันทึกแบบร่าง</q-tooltip></q-btn
@@ -584,13 +583,14 @@ onMounted(() => {
 				id="onSubmit"
 				type="button"
 				unelevated
-				dense
+				
 				class="q-px-md items-center q-ml-sm"
 				color="primary"
 				label="ยื่นใบลา"
 				@click="onConfirm()"
 				><q-tooltip>ยื่นใบลา</q-tooltip></q-btn
 			>
-		</div>
+		</q-card-actions>
+
 	</form>
 </template>
diff --git a/src/modules/05_leave/views/AddPage.vue b/src/modules/05_leave/views/AddPage.vue
index 0344fc9..41bee0c 100644
--- a/src/modules/05_leave/views/AddPage.vue
+++ b/src/modules/05_leave/views/AddPage.vue
@@ -87,7 +87,7 @@ onMounted(async () => {
 </script>
 
 <template>
-  <div class="col-12 row justify-center">
+  <div class="row justify-center">
     <div class="col-xs-12 col-sm-12 col-md-11">
       <div class="toptitle text-white col-12 row items-center">
         <q-btn
@@ -103,9 +103,9 @@ onMounted(async () => {
         <div>สร้างใบลา</div>
       </div>
 
-      <q-form ref="myform" class="col-12">
+      <q-form ref="myform" >
         <q-card bordered>
-          <div class="col-12 row q-col-gutter-md q-pa-md">
+          <div class="row q-col-gutter-md q-pa-md">
             <div class="col-xs-12 col-sm-12">
               <div style="display: flex; align-items: center">
                 <q-icon
diff --git a/src/modules/06_evaluate/components/EvaluateStepMain.vue b/src/modules/06_evaluate/components/EvaluateStepMain.vue
index 039aca5..1a948ff 100644
--- a/src/modules/06_evaluate/components/EvaluateStepMain.vue
+++ b/src/modules/06_evaluate/components/EvaluateStepMain.vue
@@ -596,7 +596,7 @@ onMounted(async () => {
       <div class="col-12">
         <q-card bordered class="col-12 row caedNone">
           <div class="col-xs-12 col-sm-3 row">
-            <div class="col-12 row ">
+            <div class="col-12 row">
               <div class="col-12 q-py-md q-px-lg">
                 <div class="col-12 row items-center no-wrap">
                   <div class="toptitle2">
@@ -729,7 +729,7 @@ onMounted(async () => {
                 </div>
               </div>
             </div>
-            <div class="q-pt-sm q-gutter-sm" align="right">
+            <q-card-actions class="q-pt-sm q-pa-none q-gutter-sm" align="right">
               <q-btn
                 v-if="
                   store.step >= store.currentStep &&
@@ -784,7 +784,7 @@ onMounted(async () => {
                 color="public"
                 @click="onCilckNextStep()"
               />
-            </div>
+            </q-card-actions>
           </div>
         </q-card>
       </div>
diff --git a/src/modules/06_evaluate/components/step/step2.vue b/src/modules/06_evaluate/components/step/step2.vue
index 533b218..45d6aca 100644
--- a/src/modules/06_evaluate/components/step/step2.vue
+++ b/src/modules/06_evaluate/components/step/step2.vue
@@ -598,7 +598,7 @@ watch(
       <div class="col-6" v-if="store.currentStep === 2">
         <q-card bordered class="cardSp1">
           <div
-            class="col-12 row items-center text-weight-medium bg-grey-1 q-pl-md q-pr-sm"
+            class="text-weight-medium bg-grey-1 q-py-sm q-pl-md q-pr-sm col-12 row items-center"
           >
             <div>แบบพิจารณาคุณสมบัติบุคคล</div>
             <q-space />
diff --git a/src/modules/06_evaluate/components/viewstep/popupHistory.vue b/src/modules/06_evaluate/components/viewstep/popupHistory.vue
index f4c10a3..b5057e3 100644
--- a/src/modules/06_evaluate/components/viewstep/popupHistory.vue
+++ b/src/modules/06_evaluate/components/viewstep/popupHistory.vue
@@ -123,7 +123,7 @@ watch(
     <q-card style="width: 700px; max-width: 80vw">
       <HeaderDialog :tittle="'ประวัติการประเมิน'" :close="props.close" />
       <q-separator />
-      <q-card-section class="q-pt-none">
+      <q-card-section >
         <div class="col-xs-12 col-sm-12 col-md-12 row q-col-gutter-md">
           <div class="col-12">
             <q-table
diff --git a/src/modules/07_appealComplain/views/Form.vue b/src/modules/07_appealComplain/views/Form.vue
index 8971e3b..27f5855 100644
--- a/src/modules/07_appealComplain/views/Form.vue
+++ b/src/modules/07_appealComplain/views/Form.vue
@@ -423,10 +423,8 @@ function onSubmit(data: any) {
               </q-card>
             </div>
           </div>
-          <div v-if="!isReadOnly">
-            <q-separator />
-            <div class="row col-12 q-pa-sm">
-              <q-space />
+          <q-separator v-if="!isReadOnly"/>
+          <q-card-actions align="right" class="bg-white text-teal" v-if="!isReadOnly">
               <q-btn
                 id="onSubmit"
                 type="submit"
@@ -434,8 +432,8 @@ function onSubmit(data: any) {
                 color="secondary"
                 ><q-tooltip>บันทึก</q-tooltip></q-btn
               >
-            </div>
-          </div>
+  
+          </q-card-actions>
         </q-card>
       </form>
     </div>
diff --git a/src/modules/07_appealComplain/views/Main.vue b/src/modules/07_appealComplain/views/Main.vue
index bf4bb11..c09e4c5 100644
--- a/src/modules/07_appealComplain/views/Main.vue
+++ b/src/modules/07_appealComplain/views/Main.vue
@@ -264,21 +264,18 @@ onMounted(async () => {
       </div>
       <div class="col-12">
         <q-card bordered class="q-pa-md">
-          <div class="row q-mb-sm">
-            <div>
-              <q-btn
-                id="addComplaints"
-                for="addComplaints"
-                size="12px"
-                flat
-                round
-                color="primary"
-                icon="mdi-plus"
-                @click="redirectToPageadd()"
-                ><q-tooltip>เพิ่มการอุทธรณ์/ร้องทุกข์</q-tooltip></q-btn
-              >
-            </div>
-          </div>
+          <q-btn
+            id="addComplaints"
+            for="addComplaints"
+            size="12px"
+            flat
+            round
+            color="primary"
+            icon="mdi-plus"
+            @click="redirectToPageadd()"
+            ><q-tooltip>เพิ่มการอุทธรณ์/ร้องทุกข์</q-tooltip></q-btn
+          >
+
           <div class="row col-12 q-col-gutter-sm q-mb-sm">
             <div class="col-xs-12 col-md-2">
               <datepicker
@@ -378,88 +375,91 @@ onMounted(async () => {
               options-cover
               class="col-xs-12 col-sm-3 col-md-2"
             />
-          </div>
-          <d-table
-            flat
-            bordered
-            dense
-            class="custom-table2"
-            style="max-height: 80vh"
-            :rows="dataStore.rows"
-            :columns="dataStore.columns"
-            :visible-columns="dataStore.visibleColumns"
-            v-model:pagination="pagination"
-            :rows-per-page-options="[10, 25, 50, 100]"
-          >
-            <template v-slot:pagination="scope">
-              ทั้งหมด {{ total }} รายการ
-              <q-pagination
-                v-model="currentPage"
-                active-color="primary"
-                color="dark"
-                :max="Number(maxPage)"
-                size="sm"
-                boundary-links
-                direction-links
-              ></q-pagination>
-            </template>
-            <template v-slot:header="props">
-              <q-tr :props="props">
-                <q-th
-                  v-for="col in props.cols"
-                  :key="col.name"
-                  :props="props"
-                  style="color: #000000; font-weight: 500"
-                >
-                  <span class="text-weight-medium">{{ col.label }}</span>
-                </q-th>
-              </q-tr>
-            </template>
-            <template v-slot:body="props">
-              <q-tr :props="props" class="cursor-pointer">
-                <q-td
-                  v-for="col in props.cols"
-                  :key="col.name"
-                  :props="props"
-                  @click="editPage(props.row.id)"
-                >
-                  <div v-if="col.name == 'no'">
-                    {{
-                      (currentPage - 1) * Number(pagination.rowsPerPage) +
-                      props.rowIndex +
-                      1
-                    }}
-                  </div>
-                  <div>
-                    {{ col.value }}
-                  </div>
-                </q-td>
-              </q-tr>
-            </template>
 
-            <template #item="props">
-              <div class="q-pa-xs col-xs-12 col-sm-6 col-md-4 col-lg-3">
-                <q-card bordered flat>
-                  <q-list @click="editPage(props.row.id)">
-                    <q-item
-                      v-for="col in props.cols.filter((col:any) => col.name !== 'desc')"
+            <div class="col-12">
+              <d-table
+                flat
+                bordered
+                dense
+                class="custom-table2"
+                style="max-height: 80vh"
+                :rows="dataStore.rows"
+                :columns="dataStore.columns"
+                :visible-columns="dataStore.visibleColumns"
+                v-model:pagination="pagination"
+                :rows-per-page-options="[10, 25, 50, 100]"
+              >
+                <template v-slot:pagination="scope">
+                  ทั้งหมด {{ total }} รายการ
+                  <q-pagination
+                    v-model="currentPage"
+                    active-color="primary"
+                    color="dark"
+                    :max="Number(maxPage)"
+                    size="sm"
+                    boundary-links
+                    direction-links
+                  ></q-pagination>
+                </template>
+                <template v-slot:header="props">
+                  <q-tr :props="props">
+                    <q-th
+                      v-for="col in props.cols"
                       :key="col.name"
+                      :props="props"
+                      style="color: #000000; font-weight: 500"
                     >
-                      <q-item-section>
-                        <q-item-label caption>{{ col.label }}</q-item-label>
+                      <span class="text-weight-medium">{{ col.label }}</span>
+                    </q-th>
+                  </q-tr>
+                </template>
+                <template v-slot:body="props">
+                  <q-tr :props="props" class="cursor-pointer">
+                    <q-td
+                      v-for="col in props.cols"
+                      :key="col.name"
+                      :props="props"
+                      @click="editPage(props.row.id)"
+                    >
+                      <div v-if="col.name == 'no'">
+                        {{
+                          (currentPage - 1) * Number(pagination.rowsPerPage) +
+                          props.rowIndex +
+                          1
+                        }}
+                      </div>
+                      <div>
+                        {{ col.value }}
+                      </div>
+                    </q-td>
+                  </q-tr>
+                </template>
 
-                        <q-item-label v-if="col.name === 'no'">
-                          {{ props.rowIndex + 1 }}
-                        </q-item-label>
+                <template #item="props">
+                  <div class="q-pa-xs col-xs-12 col-sm-6 col-md-4 col-lg-3">
+                    <q-card bordered flat>
+                      <q-list @click="editPage(props.row.id)">
+                        <q-item
+                          v-for="col in props.cols.filter((col:any) => col.name !== 'desc')"
+                          :key="col.name"
+                        >
+                          <q-item-section>
+                            <q-item-label caption>{{ col.label }}</q-item-label>
 
-                        <q-item-label v-else>{{ col.value }}</q-item-label>
-                      </q-item-section>
-                    </q-item>
-                  </q-list>
-                </q-card>
-              </div>
-            </template>
-          </d-table>
+                            <q-item-label v-if="col.name === 'no'">
+                              {{ props.rowIndex + 1 }}
+                            </q-item-label>
+
+                            <q-item-label v-else>{{ col.value }}</q-item-label>
+                          </q-item-section>
+                        </q-item>
+                      </q-list>
+                    </q-card>
+                  </div>
+                </template>
+              </d-table>
+            </div>
+          </div>
         </q-card>
       </div>
     </div>
diff --git a/src/modules/08_KPI/views/main.vue b/src/modules/08_KPI/views/main.vue
index 0968880..4ce96a3 100644
--- a/src/modules/08_KPI/views/main.vue
+++ b/src/modules/08_KPI/views/main.vue
@@ -383,7 +383,7 @@ onMounted(() => {
 <template>
   <div class="col-12 row justify-center">
     <div class="col-xs-12 col-sm-12 col-md-11">
-      <q-toolbar style="padding: 0px">
+      <div class="toptitle text-white col-12 row items-center">
         <q-btn
           icon="mdi-arrow-left"
           unelevated
@@ -394,11 +394,8 @@ onMounted(() => {
           class="q-mr-sm"
           @click="router.push(`/`)"
         />
-        <q-toolbar-title class="toptitle text-white items-center">
-          รายการขอรับประเมินผลการปฏิบัติราชการระดับบุคคล</q-toolbar-title
-        >
-      </q-toolbar>
-
+        รายการขอรับประเมินผลการปฏิบัติราชการระดับบุคคล
+      </div>
       <!-- <div class="toptitle text-white col-12 row items-center">
         <q-btn
           icon="mdi-arrow-left"
@@ -414,7 +411,7 @@ onMounted(() => {
       </div> -->
       <div class="col-12">
         <q-card bordered class="q-pa-md">
-          <div class="row col-12 q-col-gutter-sm q-mb-sm">
+          <div class="row q-col-gutter-sm q-mb-sm">
             <div class="col-xs-12 col-md-3">
               <datepicker
                 menu-class-name="modalfix"
@@ -492,7 +489,6 @@ onMounted(() => {
                 :options="columns"
                 option-value="name"
                 options-cover
-                style="min-width: 150px"
               />
             </div>
           </div>
diff --git a/src/modules/08_KPI/views/mainEvaluator.vue b/src/modules/08_KPI/views/mainEvaluator.vue
index f024cf5..7bc9ebc 100644
--- a/src/modules/08_KPI/views/mainEvaluator.vue
+++ b/src/modules/08_KPI/views/mainEvaluator.vue
@@ -198,7 +198,7 @@ onMounted(async () => {
 <template>
   <div class="col-12 row justify-center">
     <div class="col-xs-12 col-sm-12 col-md-11">
-      <q-toolbar style="padding: 0px;">
+      <div class="toptitle text-white col-12 row items-center">
         <q-btn
           icon="mdi-arrow-left"
           unelevated
@@ -209,11 +209,8 @@ onMounted(async () => {
           class="q-mr-sm"
           @click="router.push(`/`)"
         />
-        <q-toolbar-title class="toptitle text-white items-center">
-          รายการการประเมินผลการปฏิบัติราชการระดับบุคคล</q-toolbar-title
-        >
-      </q-toolbar>
-
+        รายการการประเมินผลการปฏิบัติราชการระดับบุคคล
+      </div>
       <!-- <div class="toptitle text-white col-12 row items-center">
         <q-btn
           icon="mdi-arrow-left"
diff --git a/src/modules/11_probation/component/01_Assign.vue b/src/modules/11_probation/component/01_Assign.vue
index 6790df5..ad141e3 100644
--- a/src/modules/11_probation/component/01_Assign.vue
+++ b/src/modules/11_probation/component/01_Assign.vue
@@ -2760,6 +2760,7 @@ onMounted(async () => {
                 class="col-xs-12 col-sm-8"
                 :readonly="editStatus != true"
                 dense
+                hide-bottom-space
                 borderless
                 :outlined="editStatus == true"
                 v-model="chairman"
@@ -2787,6 +2788,7 @@ onMounted(async () => {
                 class="col-xs-12 col-sm-8"
                 :readonly="!editStatus"
                 dense
+                hide-bottom-space
                 borderless
                 :outlined="editStatus"
                 v-model="chairman"
diff --git a/src/modules/11_probation/component/07_EvaluateReport.vue b/src/modules/11_probation/component/07_EvaluateReport.vue
index c31a92d..66e436a 100644
--- a/src/modules/11_probation/component/07_EvaluateReport.vue
+++ b/src/modules/11_probation/component/07_EvaluateReport.vue
@@ -569,6 +569,7 @@ onMounted(() => {
                 dense
                 :disable="!status"
                 class="full-width datepicker"
+                hide-bottom-space
                 :model-value="
                   evaluate_date != null ? date2Thai(evaluate_date) : null
                 "
diff --git a/src/modules/11_probation/component/08_SurveyComment.vue b/src/modules/11_probation/component/08_SurveyComment.vue
index 2ebeff7..955089b 100644
--- a/src/modules/11_probation/component/08_SurveyComment.vue
+++ b/src/modules/11_probation/component/08_SurveyComment.vue
@@ -123,6 +123,7 @@ onMounted(() => {
             dense
             borderless
             outlined
+            hide-bottom-space
             v-model="answer1"
             type="textarea"
             :rules="[(val: string) => !!val || `${'กรุณากรอกความคิดเห็น'}`]"
@@ -142,6 +143,7 @@ onMounted(() => {
             borderless
             outlined
             v-model="answer2"
+            hide-bottom-space
             type="textarea"
             :rules="[(val: string) => !!val || `${'กรุณากรอกความคิดเห็น'}`]"
           />
diff --git a/src/modules/11_probation/component/addPage/02_addevaluacommander.vue b/src/modules/11_probation/component/addPage/02_addevaluacommander.vue
index 9c7149b..24ddd83 100644
--- a/src/modules/11_probation/component/addPage/02_addevaluacommander.vue
+++ b/src/modules/11_probation/component/addPage/02_addevaluacommander.vue
@@ -1711,6 +1711,7 @@ onMounted(async () => {
                   </template>
                   <template #trigger>
                     <q-input
+                    hide-bottom-space
                       outlined
                       dense
                       class="full-width datepicker col-3"