From 926428192fbd26e7d27c581cc16b41b0d1889f6e Mon Sep 17 00:00:00 2001
From: waruneeta <warunee.auy@gmail.com>
Date: Wed, 12 Jul 2023 17:21:27 +0700
Subject: [PATCH] fix bug & remove const/import not use

---
 src/modules/05_placement/components/Main.vue  |  2 +-
 .../05_placement/components/pass/Detail.vue   | 12 +--
 .../components/pass/DialogAppoint.vue         |  0
 .../components/pass/DialogFooter.vue          |  6 +-
 .../05_placement/components/pass/Table.vue    | 95 +++++++++----------
 .../components/pass/TableDetail.vue           |  1 -
 .../components/pass/TableView.vue             |  1 -
 7 files changed, 57 insertions(+), 60 deletions(-)
 delete mode 100644 src/modules/05_placement/components/pass/DialogAppoint.vue

diff --git a/src/modules/05_placement/components/Main.vue b/src/modules/05_placement/components/Main.vue
index 4ab957331..f72ff76a7 100644
--- a/src/modules/05_placement/components/Main.vue
+++ b/src/modules/05_placement/components/Main.vue
@@ -249,7 +249,7 @@ const pagination = ref({
   page: 1,
   rowsPerPage: 10,
 });
-const paginationLabel = (start: string, end: string, total: string) => {
+const paginationLabel = (start: number, end: number, total: number) => {
   if (paging.value == true) return " " + start + "-" + end + " ใน " + total;
   else return start + "-" + end + " ใน " + total;
 };
diff --git a/src/modules/05_placement/components/pass/Detail.vue b/src/modules/05_placement/components/pass/Detail.vue
index 037211aa8..a24c5e852 100644
--- a/src/modules/05_placement/components/pass/Detail.vue
+++ b/src/modules/05_placement/components/pass/Detail.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { onMounted, ref, watchEffect } from "vue";
+import { onMounted, ref } from "vue";
 import { defineAsyncComponent } from "@vue/runtime-core";
 import { useRouter ,useRoute} from "vue-router";
 import cardTop from "@/modules/05_placement/components/pass/StatCard.vue";
@@ -16,9 +16,9 @@ let roleAdmin = ref<boolean>(false);
 const router = useRouter();
 const route = useRoute();
 const examId = route.params.examId;
-const year = ref<string>("2566");
-const round = ref<string>("1");
-const title = ref<string>("การสอบแข่งขันเพื่อรับบุคคลทั่วไปเข้ารับราชการ");
+const year = ref<string>("");
+const round = ref<string>("");
+const title = ref<string>("");
 const AddTablePosition = defineAsyncComponent(
   () => import("@/modules/05_placement/components/pass/Table.vue")
 );
@@ -45,7 +45,7 @@ const getStat = async () => {
       disclaim: statCard.disclaim,
     };
     
-    console.log("🚀 ~ file: Table.vue:96 ~ getStatCard ~ data:", statCard);
+      console.log("🚀 ~ file: Table.vue:96 ~ getStatCard ~ data:", statCard);
   })
   .catch((e) => {
     messageError($q, e);
@@ -91,7 +91,7 @@ onMounted(async () => {
   </div>
   <q-card flat bordered class="col-12 q-mt-sm q-pt-sm">
     <div>
-      <AddTablePosition :statCard="getStat" class="q-pa-none" />
+        <AddTablePosition :statCard="getStat" class="q-pa-none" @get-stat="getStat"/>
     </div>
   </q-card>
 </template>
diff --git a/src/modules/05_placement/components/pass/DialogAppoint.vue b/src/modules/05_placement/components/pass/DialogAppoint.vue
deleted file mode 100644
index e69de29bb..000000000
diff --git a/src/modules/05_placement/components/pass/DialogFooter.vue b/src/modules/05_placement/components/pass/DialogFooter.vue
index dab4dfa0c..d2358bb75 100644
--- a/src/modules/05_placement/components/pass/DialogFooter.vue
+++ b/src/modules/05_placement/components/pass/DialogFooter.vue
@@ -29,9 +29,9 @@ const emit = defineEmits([
 const updateEdit = (value: Boolean) => {
   emit("update:editvisible", value);
 };
-const cancel = async () => {
-  props.cancel();
-};
+// const cancel = async () => {
+//   props.cancel();
+// };
 const edit = async () => {
   updateEdit(!props.editvisible);
   props.edit();
diff --git a/src/modules/05_placement/components/pass/Table.vue b/src/modules/05_placement/components/pass/Table.vue
index 6fae7e35b..0ec5d10ab 100644
--- a/src/modules/05_placement/components/pass/Table.vue
+++ b/src/modules/05_placement/components/pass/Table.vue
@@ -429,55 +429,54 @@ const pagination = ref({
                                                 </div>
                                                 <div v-else>
                                                   <div class="col-4">
-                                                    <div class="text-weight-medium">-</div>
-                                                    <div class="text-weight-light">-</div>
+                                                      <div class="text-weight-medium">-</div>
+                                                    </div>
                                                   </div>
-                                                </div>
-                                              </template>
-                                              <template v-else-if="col.name === 'reportingDate' && col.value !== '-'">
-                                                <div class="text-weight-medium">
-                                                  {{ props.row.reportingDate }}
-                                                </div>
-                                              </template>
-                                              <template v-else-if="col.name === 'bmaOfficer'">
-                                                <div class="text-weight-medium">
-                                                  {{ props.row.bmaOfficer !== null ? props.row.bmaOfficer : "-" }}
-                                                </div>
-                                              </template>
-                                              <template v-else-if="col.name === 'statusName'">
-                                                <div class="text-weight-medium">
-                                                  {{ props.row.statusName }}
-                                                </div>
-                                              </template>
-                                            </q-td>
-                                            <q-td auto-width>
-                                              <q-btn icon="mdi-dots-vertical" size="12px" color="grey-7" flat round dense>
-                                                <q-menu transition-show="jump-down" transition-hide="jump-up">
-                                                  <q-list dense style="min-width: 100px">
-                                                    <q-item v-if="roleAdmin && props.row.statusId === 'un-contain'" clickable v-close-popup
-                                                      @click="openAppointModal(props.row.personalId)">
-                                                      <q-item-section style="min-width: 0px" avatar class="q-py-sm">
-                                                        <q-icon color="primary" size="xs" name="mdi-bookmark-outline" />
-                                                      </q-item-section>
-                                                      <q-item-section>เลือกหน่วยงานที่รับบรรจุ</q-item-section>
-                                                    </q-item>
-                                                    <q-separator />
-                                                    <q-item v-if="roleAdmin && props.row.statusId === 'un-contain'" clickable v-close-popup
-                                                      @click="editDetail(props.row, 'deferment')">
-                                                      <q-item-section style="min-width: 0px" avatar class="q-py-sm">
-                                                        <q-icon color="blue" size="xs" name="mdi-account-alert-outline" />
-                                                      </q-item-section>
-                                                      <q-item-section>ขอผ่อนผัน</q-item-section>
-                                                    </q-item>
-                                                    <q-item v-else-if="props.row.deferment === true && props.row.statusId != 'DISCLAIM'" clickable v-close-popup
-                                                      @click="editDetail(props.row, 'defermentInfo')">
-                                                      <q-item-section style="min-width: 0px" avatar class="q-py-sm">
-                                                        <q-icon color="blue" size="xs" name="mdi-account-details-outline" />
-                                                      </q-item-section>
-                                                      <q-item-section>ข้อมูลการผ่อนผัน</q-item-section>
-                                                    </q-item>
-                                                    <q-separator />
-                                                    <q-item v-if="props.row.statusId === 'un-contain' ||
+                                                </template>
+                                                <template v-else-if="col.name === 'reportingDate' && col.value !== '-'">
+                                                  <div class="text-weight-medium">
+                                                    {{ props.row.reportingDate }}
+                                                  </div>
+                                                </template>
+                                                <template v-else-if="col.name === 'bmaOfficer'">
+                                                  <div class="text-weight-medium">
+                                                    {{ props.row.bmaOfficer !== null ? props.row.bmaOfficer : "-" }}
+                                                  </div>
+                                                </template>
+                                                <template v-else-if="col.name === 'statusName'">
+                                                  <div class="text-weight-medium">
+                                                    {{ props.row.statusName }}
+                                                  </div>
+                                                </template>
+                                              </q-td>
+                                              <q-td auto-width>
+                                                <q-btn icon="mdi-dots-vertical" size="12px" color="grey-7" flat round dense>
+                                                  <q-menu transition-show="jump-down" transition-hide="jump-up">
+                                                    <q-list dense style="min-width: 100px">
+                                                          <q-item v-if="roleAdmin && props.row.statusId === 'UN-CONTAIN'" clickable v-close-popup
+                                                            @click="openAppointModal(props.row.personalId)">
+                                                            <q-item-section style="min-width: 0px" avatar class="q-py-sm">
+                                                              <q-icon color="primary" size="xs" name="mdi-bookmark-outline" />
+                                                            </q-item-section>
+                                                            <q-item-section>เลือกหน่วยงานที่รับบรรจุ</q-item-section>
+                                                          </q-item>
+                                                          <q-separator />
+                                                          <q-item v-if="roleAdmin && props.row.statusId === 'UN-CONTAIN'" clickable v-close-popup
+                                                            @click="editDetail(props.row, 'deferment')">
+                                                            <q-item-section style="min-width: 0px" avatar class="q-py-sm">
+                                                              <q-icon color="blue" size="xs" name="mdi-account-alert-outline" />
+                                                            </q-item-section>
+                                                            <q-item-section>ขอผ่อนผัน</q-item-section>
+                                                          </q-item>
+                                                          <q-item v-else-if="props.row.deferment === true && props.row.statusId != 'DISCLAIM'" clickable v-close-popup
+                                                            @click="editDetail(props.row, 'defermentInfo')">
+                                                            <q-item-section style="min-width: 0px" avatar class="q-py-sm">
+                                                              <q-icon color="blue" size="xs" name="mdi-account-details-outline" />
+                                                            </q-item-section>
+                                                            <q-item-section>ข้อมูลการผ่อนผัน</q-item-section>
+                                                          </q-item>
+                                                          <q-separator />
+                                                          <q-item v-if="props.row.statusId === 'UN-CONTAIN' ||
                                                       props.row.statusId === 'PREPARE-CONTAIN'
                                                       " clickable v-close-popup
                                                       @click="editDetail(props.row, 'disclaim')">
diff --git a/src/modules/05_placement/components/pass/TableDetail.vue b/src/modules/05_placement/components/pass/TableDetail.vue
index 52bc0b023..13cc86ebb 100644
--- a/src/modules/05_placement/components/pass/TableDetail.vue
+++ b/src/modules/05_placement/components/pass/TableDetail.vue
@@ -7,7 +7,6 @@ import type { QTableProps } from "quasar";
 import { useCounterMixin } from "@/stores/mixin";
 import http from "@/plugins/http";
 import config from "@/app.config";
-import { useRoute } from "vue-router";
 const mixin = useCounterMixin(); //เรียกฟังก์ชันกลาง
 const { success, showLoader, hideLoader, date2Thai, modalConfirm } = mixin;
 const save = ref<boolean>(true);
diff --git a/src/modules/05_placement/components/pass/TableView.vue b/src/modules/05_placement/components/pass/TableView.vue
index a303c9d23..5318a4bbc 100644
--- a/src/modules/05_placement/components/pass/TableView.vue
+++ b/src/modules/05_placement/components/pass/TableView.vue
@@ -43,7 +43,6 @@
 
 <script setup lang="ts">
 import { ref, useAttrs } from "vue";
-import { useCounterMixin } from "@/stores/mixin";
 import { useQuasar } from "quasar";
 const $q = useQuasar();
 const attrs = ref<any>(useAttrs());