From 78bd5c0f7be8d05dca01ecc4b196e458f9aeda9a Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Tue, 4 Jun 2024 10:52:08 +0700
Subject: [PATCH 1/4] fix bug

---
 src/modules/05_leave/views/Main.vue                     | 1 -
 src/modules/06_evaluate/components/EvaluateStepMain.vue | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/modules/05_leave/views/Main.vue b/src/modules/05_leave/views/Main.vue
index 3cb4338..135ea17 100644
--- a/src/modules/05_leave/views/Main.vue
+++ b/src/modules/05_leave/views/Main.vue
@@ -24,7 +24,6 @@ const $q = useQuasar();
 const filterLeaveType = ref(["ลาป่วย", "ลากิจส่วนตัว", "ลาพักผ่อน"]);
 
 const itemPie = ref<LeaveItem[]>([]);
-const knob = ref(80);
 const columns = ref<QTableProps["columns"]>([
   {
     name: "no",
diff --git a/src/modules/06_evaluate/components/EvaluateStepMain.vue b/src/modules/06_evaluate/components/EvaluateStepMain.vue
index 4c9bd55..27b068c 100644
--- a/src/modules/06_evaluate/components/EvaluateStepMain.vue
+++ b/src/modules/06_evaluate/components/EvaluateStepMain.vue
@@ -289,7 +289,7 @@ async function saveStep1() {
     fullName: `${formDetail.value.firstName} ${formDetail.value.lastName}`,
     position: formDetail.value.position,
     oc: formDetail.value.oc,
-    salary: formDetail.value.salary.toString(),
+    salary: formDetail.value.salary ? formDetail.value.salary.toString() : null,
     positionLevel: formDetail.value.positionLevel,
     posNo: formDetail.value.posNo,
     birthDate: formDetail.value.birthDate,

From ff10fb0ee128d0d962f840dbf8da893bf1fbf48d Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Wed, 5 Jun 2024 11:36:57 +0700
Subject: [PATCH 2/4] =?UTF-8?q?=E0=B8=9B=E0=B8=A3=E0=B8=B1=E0=B8=9A=20resp?=
 =?UTF-8?q?onesive?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/EvaluateStepMain.vue           |  2 +-
 .../components/viewstep/tableStep1.vue        |  6 +--
 src/modules/07_appealComplain/views/Form.vue  |  3 +-
 src/modules/07_appealComplain/views/Main.vue  | 27 +++++++++-
 src/modules/08_KPI/views/form.vue             | 52 +++++++++----------
 5 files changed, 56 insertions(+), 34 deletions(-)

diff --git a/src/modules/06_evaluate/components/EvaluateStepMain.vue b/src/modules/06_evaluate/components/EvaluateStepMain.vue
index 27b068c..039aca5 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 no-wrap">
+            <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">
diff --git a/src/modules/06_evaluate/components/viewstep/tableStep1.vue b/src/modules/06_evaluate/components/viewstep/tableStep1.vue
index 8bbd1e5..aab00a3 100644
--- a/src/modules/06_evaluate/components/viewstep/tableStep1.vue
+++ b/src/modules/06_evaluate/components/viewstep/tableStep1.vue
@@ -13,7 +13,7 @@ const props = defineProps({
 
 <template>
   <div class="q-pa-sm row col-12">
-    <q-table
+    <d-table
       ref="table"
       flat
       bordered
@@ -23,9 +23,9 @@ const props = defineProps({
       :rows-per-page-options="[10, 25, 50, 100]"
       virtual-scroll
       class="row col-12"
-      :style="$q.screen.lt.sm ? 'width: 70vw' : 'width: 50vw;'"
+      :style="$q.screen.lt.sm ? 'width: 80vw' : 'width: 50vw;'"
     >
-    </q-table>
+    </d-table>
   </div>
 </template>
 
diff --git a/src/modules/07_appealComplain/views/Form.vue b/src/modules/07_appealComplain/views/Form.vue
index d98e413..97035e2 100644
--- a/src/modules/07_appealComplain/views/Form.vue
+++ b/src/modules/07_appealComplain/views/Form.vue
@@ -1,4 +1,3 @@
-div
 <script setup lang="ts">
 import { ref, reactive, defineProps, watch } from "vue";
 import { useAppealComplainStore } from "@/modules/07_appealComplain/store";
@@ -206,7 +205,7 @@ function onSubmit(data: any) {
                   </div>
                 </q-banner>
               </div>
-              <div class="row q-gutter-x-sm">
+              <div class="row q-col-gutter-sm ">
                 <div class="col-xs-12 col-md-3">
                   <q-select
                     :class="inputEdit(isReadOnly)"
diff --git a/src/modules/07_appealComplain/views/Main.vue b/src/modules/07_appealComplain/views/Main.vue
index 6471e94..bf4bb11 100644
--- a/src/modules/07_appealComplain/views/Main.vue
+++ b/src/modules/07_appealComplain/views/Main.vue
@@ -379,7 +379,7 @@ onMounted(async () => {
               class="col-xs-12 col-sm-3 col-md-2"
             />
           </div>
-          <q-table
+          <d-table
             flat
             bordered
             dense
@@ -436,7 +436,30 @@ onMounted(async () => {
                 </q-td>
               </q-tr>
             </template>
-          </q-table>
+
+            <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-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>
         </q-card>
       </div>
     </div>
diff --git a/src/modules/08_KPI/views/form.vue b/src/modules/08_KPI/views/form.vue
index c0abfe3..c380572 100644
--- a/src/modules/08_KPI/views/form.vue
+++ b/src/modules/08_KPI/views/form.vue
@@ -394,7 +394,7 @@ onMounted(async () => {
                       >*น้ำหนัก(ร้อยละ) ผลสัมฤทธิ์ของงานไม่ถูกต้อง</span
                     >
                     <br v-if="!$q.screen.gt.xs" />
-                    
+
                     <q-btn
                       v-if="
                         store.rolePerson == 'USER' &&
@@ -502,51 +502,51 @@ onMounted(async () => {
                   $q.screen.gt.xs ? 'padding-left: 12%' : 'padding-left:5%'
                 "
               >
-                <div class="row no-wrap">
-                  <div class="col-2">
-                    <div class="column">
-                      <span class="text-grey-6">ตำแหน่งในสายงาน</span>
-                      <span class="text-weight-medium text-dark">{{
+                <div class="row">
+                  <div class="col-xs-12 col-md-2">
+                    <div :class="$q.screen.gt.sm ? 'column' : 'row'">
+                      <span class="text-grey-6 col">ตำแหน่งในสายงาน</span>
+                      <span class="text-weight-medium text-dark col">{{
                         store.dataEvaluation.position
                       }}</span>
                     </div>
                   </div>
-                  <div class="col-2">
-                    <div class="column">
-                      <span class="text-grey-6">ประเภทตำแหน่ง</span>
-                      <span class="text-weight-medium text-dark">{{
+                  <div class="col-xs-12 col-md-2">
+                    <div :class="$q.screen.gt.sm ? 'column' : 'row'">
+                      <span class="text-grey-6 col">ประเภทตำแหน่ง</span>
+                      <span class="text-weight-medium text-dark col">{{
                         store.dataEvaluation.posTypeName
                       }}</span>
                     </div>
                   </div>
-                  <div class="col-2">
-                    <div class="column">
-                      <span class="text-grey-6">ระดับตำแหน่ง</span>
-                      <span class="text-weight-medium text-dark">{{
+                  <div class="col-xs-12 col-md-2">
+                    <div :class="$q.screen.gt.sm ? 'column' : 'row'">
+                      <span class="text-grey-6 col">ระดับตำแหน่ง</span>
+                      <span class="text-weight-medium text-dark col">{{
                         store.dataEvaluation.posLevelName
                       }}</span>
                     </div>
                   </div>
-                  <div class="col-2">
-                    <div class="column">
-                      <span class="text-grey-6">สถานะการประเมิน</span>
-                      <span class="text-weight-medium text-dark">{{
+                  <div class="col-xs-12 col-md-2">
+                    <div :class="$q.screen.gt.sm ? 'column' : 'row'">
+                      <span class="text-grey-6 col">สถานะการประเมิน</span>
+                      <span class="text-weight-medium text-dark col">{{
                         formProfile.status
                       }}</span>
                     </div>
                   </div>
-                  <div class="col-2">
-                    <div class="column">
-                      <span class="text-grey-6">ผลการประเมิน</span>
-                      <span class="text-weight-medium text-dark">{{
+                  <div class="col-xs-12 col-md-2">
+                    <div :class="$q.screen.gt.sm ? 'column' : 'row'">
+                      <span class="text-grey-6 col">ผลการประเมิน</span>
+                      <span class="text-weight-medium text-dark col">{{
                         formProfile.result
                       }}</span>
                     </div>
                   </div>
-                  <div class="col-2">
-                    <div class="column">
-                      <span class="text-grey-6">คะแนนประเมิน</span>
-                      <span class="text-weight-medium text-primary">
+                  <div class="col-xs-12 col-md-2">
+                    <div :class="$q.screen.gt.sm ? 'column' : 'row'">
+                      <span class="text-grey-6 col">คะแนนประเมิน</span>
+                      <span class="text-weight-medium text-primary col">
                         {{
                           store.dataEvaluation.posExecutiveName == null
                             ? (

From ac37fec0500995e8922d48a2ddf29234810d2dbf Mon Sep 17 00:00:00 2001
From: waruneeauy <warunee.auy@gmail.com>
Date: Wed, 5 Jun 2024 15:19:19 +0700
Subject: [PATCH 3/4] updated

---
 src/modules/03_retire/views/addRetire.vue | 69 +++++++++++++++++++++++
 1 file changed, 69 insertions(+)

diff --git a/src/modules/03_retire/views/addRetire.vue b/src/modules/03_retire/views/addRetire.vue
index 930a995..77377c0 100644
--- a/src/modules/03_retire/views/addRetire.vue
+++ b/src/modules/03_retire/views/addRetire.vue
@@ -374,6 +374,75 @@ function downloadFile(data: string) {
                     </q-list>
                   </q-card>
                 </div>
+
+                <div class="col-12 row">
+                  <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"
+                    >
+                      <div class="q-pl-sm text-weight-bold text-dark">
+                        ผลการพิจารณาของสำนักการเจ้าหน้าที่ (สกจ.)
+                      </div>
+                    </div>
+                    <q-separator />
+                    <div class="row col-12 q-pa-md">
+                      <div class="col-12 row bg-white q-col-gutter-md">
+                        <div class="col-xs-6 row items-start">
+                          <div class="col-12 text-top">สถานะ</div>
+                          <div class="col-12 text-detail">
+                            {{
+                              dataDetail.officerReject !== null
+                                ? statusOrder(dataDetail.officerReject)
+                                : "-"
+                            }}
+                          </div>
+                        </div>
+                        <div class="col-xs-6 row items-start">
+                          <div class="col-12 text-top">
+                            วันสุดท้ายที่ยับยั้ง
+                          </div>
+                          <div class="col-12 text-detail">
+                            {{
+                              dataDetail.officerRejectDate !== null
+                                ? date2Thai(dataDetail.officerRejectDate)
+                                : "-"
+                            }}
+                          </div>
+                        </div>
+                        <div class="col-xs-12 row items-start">
+                          <div class="col-12 text-top">
+                            ความคิดเห็นและเหตุผล
+                          </div>
+                          <div
+                            class="col-12 text-detail"
+                            v-if="dataDetail.officerReject === false"
+                          >
+                            {{
+                              dataDetail.officerApproveReason !== null
+                                ? dataDetail.officerApproveReason
+                                : "-"
+                            }}
+                          </div>
+                          <div
+                            class="col-12 text-detail"
+                            v-if="dataDetail.officerReject === true"
+                          >
+                            {{
+                              dataDetail.officerRejectReason !== null
+                                ? dataDetail.officerRejectReason
+                                : "-"
+                            }}
+                          </div>
+                        </div>
+                      </div>
+                    </div>
+                  </q-card>
+                </div>
+
                 <div class="col-12 row">
                   <q-card
                     bordered

From e857482a62866eec247ccded020aae570cb09b7b Mon Sep 17 00:00:00 2001
From: waruneeauy <warunee.auy@gmail.com>
Date: Wed, 5 Jun 2024 16:57:23 +0700
Subject: [PATCH 4/4] =?UTF-8?q?=E0=B9=81=E0=B8=81=E0=B9=89=E0=B8=82?=
 =?UTF-8?q?=E0=B9=89=E0=B8=AD=E0=B8=84=E0=B8=A7=E0=B8=B2=E0=B8=A1=E0=B8=A3?=
 =?UTF-8?q?=E0=B8=B0=E0=B8=9A=E0=B8=9A=E0=B8=A5=E0=B8=B2=E0=B8=AD=E0=B8=AD?=
 =?UTF-8?q?=E0=B8=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/modules/03_retire/views/addRetire.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/modules/03_retire/views/addRetire.vue b/src/modules/03_retire/views/addRetire.vue
index 77377c0..71ab64a 100644
--- a/src/modules/03_retire/views/addRetire.vue
+++ b/src/modules/03_retire/views/addRetire.vue
@@ -385,7 +385,7 @@ function downloadFile(data: string) {
                       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 />