From c0efcf59ce6067f3b14e963009c45db3b7f737a0 Mon Sep 17 00:00:00 2001
From: Kittapath <kittapath@frappet.com>
Date: Wed, 4 Oct 2023 17:34:39 +0700
Subject: [PATCH] =?UTF-8?q?=E0=B8=9B=E0=B8=B4=E0=B8=94=20upload=20?=
 =?UTF-8?q?=E0=B9=80=E0=B8=AD=E0=B8=81=E0=B8=AA=E0=B8=B2=E0=B8=A3=E0=B8=AA?=
 =?UTF-8?q?=E0=B8=AD=E0=B8=9A=E0=B8=84=E0=B8=B1=E0=B8=94=E0=B9=80=E0=B8=A5?=
 =?UTF-8?q?=E0=B8=B7=E0=B8=AD=E0=B8=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../03_recruiting/components/Document.vue     |  6 +---
 .../03_recruiting/components/Profile.vue      |  6 ++--
 .../components/TableCandidate.vue             | 30 +++++++++---------
 .../views/02_qualify/PeriodAdd.vue            |  6 ++--
 .../views/02_qualify/manageDetail.vue         | 31 +++++++++++++------
 5 files changed, 43 insertions(+), 36 deletions(-)

diff --git a/src/modules/03_recruiting/components/Document.vue b/src/modules/03_recruiting/components/Document.vue
index 636118fe7..16cb85c3e 100644
--- a/src/modules/03_recruiting/components/Document.vue
+++ b/src/modules/03_recruiting/components/Document.vue
@@ -2,11 +2,7 @@
 <template>
   <HeaderTop
     v-model:edit="edit"
-    :header="
-      $q.screen.gt.xs
-        ? 'Upload รูปถ่าย (รูปถ่ายหน้าตรง ชุดสุภาพ ไม่สวมหมวก/แว่นตาดำ และไม่มีลวดลายใด ๆ บนรูปถ่าย)'
-        : 'Upload'
-    "
+    :header="$q.screen.gt.xs ? 'อัปโหลดเอกสาร (ถ้ามี)' : 'อัปโหลดเอกสาร'"
     icon="mdi-file-document"
     :addData="true"
     :editOnly="false"
diff --git a/src/modules/03_recruiting/components/Profile.vue b/src/modules/03_recruiting/components/Profile.vue
index aaf2339d7..d3203bf74 100644
--- a/src/modules/03_recruiting/components/Profile.vue
+++ b/src/modules/03_recruiting/components/Profile.vue
@@ -47,10 +47,10 @@
     <Career :status="status" />
   </div>
 
-  <q-separator class="q-my-lg bg-gray" size="5px" />
-  <div class="q-px-sm">
+  <!-- <q-separator class="q-my-lg bg-gray" size="5px" /> -->
+  <!-- <div class="q-px-sm">
     <Document :status="status" />
-  </div>
+  </div> -->
 </template>
 <script setup lang="ts">
 import { ref, onMounted, watch } from "vue";
diff --git a/src/modules/03_recruiting/components/TableCandidate.vue b/src/modules/03_recruiting/components/TableCandidate.vue
index a4a08caef..62b989ae5 100644
--- a/src/modules/03_recruiting/components/TableCandidate.vue
+++ b/src/modules/03_recruiting/components/TableCandidate.vue
@@ -7,7 +7,7 @@
         outlined
         :model-value="inputvisibleFilter"
         :options="optionsFilter"
-        class="col-xs-12 col-sm-4 col-md-3"
+        class="col-2"
         option-value="id"
         option-label="name"
         map-options
@@ -15,6 +15,19 @@
         @update:model-value="updateVisibleFilter"
         v-if="optionsFilter != undefined && optionsFilter.length > 0"
       />
+      <q-btn
+        size="md"
+        icon="mdi-email-check-outline"
+        round
+        flat
+        color="green-6"
+        @click="candidateCheckProfileDialog"
+        :disabled="
+          attrs.rows.filter((r) => r.status == 'checkRegister').length == 0
+        "
+      >
+        <q-tooltip>ตรวจสอบข้อมูล</q-tooltip>
+      </q-btn>
       <q-file
         v-model="files"
         dense
@@ -23,7 +36,7 @@
         use-chips
         multiple
         v-if="statusPayment"
-        class="q-pl-sm"
+        class="q-pl-lg"
       >
         <template v-slot:prepend>
           <q-icon name="attach_file" color="blue" />
@@ -69,19 +82,6 @@
       >
         <q-tooltip>บรรจุผู้ผ่านการคัดเลือก</q-tooltip>
       </q-btn>
-      <q-btn
-        size="md"
-        icon="mdi-email-check-outline"
-        round
-        flat
-        color="green-6"
-        @click="candidateCheckProfileDialog"
-        :disabled="
-          attrs.rows.filter((r) => r.status == 'checkRegister').length == 0
-        "
-      >
-        <q-tooltip>ตรวจสอบข้อมูล</q-tooltip>
-      </q-btn>
       <q-space />
       <div class="items-center" style="display: flex">
         <!-- ค้นหาข้อความใน table -->
diff --git a/src/modules/03_recruiting/views/02_qualify/PeriodAdd.vue b/src/modules/03_recruiting/views/02_qualify/PeriodAdd.vue
index 5fd1d5bd9..31d2c9216 100644
--- a/src/modules/03_recruiting/views/02_qualify/PeriodAdd.vue
+++ b/src/modules/03_recruiting/views/02_qualify/PeriodAdd.vue
@@ -464,13 +464,13 @@
                     <q-td key="highDegree" :props="props">
                       <q-radio
                         v-model="props.row.highDegree"
-                        label="ต่ำกว่าปริญญาบัตร"
+                        label="ประเภททั่วไป"
                         color="teal"
                         val="0"
                       />
                       <q-radio
                         v-model="props.row.highDegree"
-                        label="ปริญญาบัตรขึ้นไป"
+                        label="ประเภทวิชาการ"
                         color="teal"
                         val="1"
                       />
@@ -1316,7 +1316,7 @@ const columnsPosition = ref<QTableProps["columns"]>([
   {
     name: "highDegree",
     align: "left",
-    label: "วุฒิการศึกษา",
+    label: "ประเภทตำแหน่ง",
     sortable: true,
     field: "highDegree",
     headerStyle: "font-size: 14px",
diff --git a/src/modules/03_recruiting/views/02_qualify/manageDetail.vue b/src/modules/03_recruiting/views/02_qualify/manageDetail.vue
index 41a79d28c..46d62430c 100644
--- a/src/modules/03_recruiting/views/02_qualify/manageDetail.vue
+++ b/src/modules/03_recruiting/views/02_qualify/manageDetail.vue
@@ -335,6 +335,7 @@ const visibleColumns = ref<String[]>([
   //   "check",
   "no",
   "number",
+  "position",
   "registerDate",
   "examIdenNumber",
   "seatNumber",
@@ -410,6 +411,15 @@ const columns = ref<QTableProps["columns"]>([
         sensitivity: "base",
       }),
   },
+  {
+    name: "position",
+    align: "left",
+    label: "ตำแหน่ง",
+    sortable: true,
+    field: "position",
+    headerStyle: "font-size: 14px; min-width: 200px",
+    style: "font-size: 14px; ",
+  },
   {
     name: "citizenId",
     align: "left",
@@ -428,15 +438,6 @@ const columns = ref<QTableProps["columns"]>([
     headerStyle: "font-size: 14px; min-width: 200px",
     style: "font-size: 14px; ",
   },
-  {
-    name: "number",
-    align: "left",
-    label: "ลำดับที่สอบได้",
-    sortable: true,
-    field: "number",
-    headerStyle: "font-size: 14px;",
-    style: "font-size: 14px; ",
-  },
   {
     name: "examIdenNumber",
     align: "left",
@@ -449,12 +450,21 @@ const columns = ref<QTableProps["columns"]>([
   {
     name: "seatNumber",
     align: "left",
-    label: "เลขที่นั่งสอบ",
+    label: "สนามสอบ",
     sortable: true,
     field: "seatNumber",
     headerStyle: "font-size: 14px;",
     style: "font-size: 14px; ",
   },
+  {
+    name: "number",
+    align: "left",
+    label: "ลำดับที่สอบได้",
+    sortable: true,
+    field: "number",
+    headerStyle: "font-size: 14px;",
+    style: "font-size: 14px; ",
+  },
   {
     name: "resultB",
     align: "left",
@@ -574,6 +584,7 @@ const fetchData = async () => {
           pass: r.pass,
           email: r.email,
           status: r.status,
+          position: r.positionExam == null ? "-" : r.positionExam.positionName,
           check: false,
         });
       });