fix bug & remove const/import not use

This commit is contained in:
Warunee Tamkoo 2023-07-12 17:21:27 +07:00
parent f0e3343093
commit 926428192f
7 changed files with 57 additions and 60 deletions

View file

@ -249,7 +249,7 @@ const pagination = ref({
page: 1, page: 1,
rowsPerPage: 10, 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; if (paging.value == true) return " " + start + "-" + end + " ใน " + total;
else return start + "-" + end + " ใน " + total; else return start + "-" + end + " ใน " + total;
}; };

View file

@ -1,5 +1,5 @@
<script setup lang="ts"> <script setup lang="ts">
import { onMounted, ref, watchEffect } from "vue"; import { onMounted, ref } from "vue";
import { defineAsyncComponent } from "@vue/runtime-core"; import { defineAsyncComponent } from "@vue/runtime-core";
import { useRouter ,useRoute} from "vue-router"; import { useRouter ,useRoute} from "vue-router";
import cardTop from "@/modules/05_placement/components/pass/StatCard.vue"; import cardTop from "@/modules/05_placement/components/pass/StatCard.vue";
@ -16,9 +16,9 @@ let roleAdmin = ref<boolean>(false);
const router = useRouter(); const router = useRouter();
const route = useRoute(); const route = useRoute();
const examId = route.params.examId; const examId = route.params.examId;
const year = ref<string>("2566"); const year = ref<string>("");
const round = ref<string>("1"); const round = ref<string>("");
const title = ref<string>("การสอบแข่งขันเพื่อรับบุคคลทั่วไปเข้ารับราชการ"); const title = ref<string>("");
const AddTablePosition = defineAsyncComponent( const AddTablePosition = defineAsyncComponent(
() => import("@/modules/05_placement/components/pass/Table.vue") () => import("@/modules/05_placement/components/pass/Table.vue")
); );
@ -45,7 +45,7 @@ const getStat = async () => {
disclaim: statCard.disclaim, disclaim: statCard.disclaim,
}; };
console.log("🚀 ~ file: Table.vue:96 ~ getStatCard ~ data:", statCard); console.log("🚀 ~ file: Table.vue:96 ~ getStatCard ~ data:", statCard);
}) })
.catch((e) => { .catch((e) => {
messageError($q, e); messageError($q, e);
@ -91,7 +91,7 @@ onMounted(async () => {
</div> </div>
<q-card flat bordered class="col-12 q-mt-sm q-pt-sm"> <q-card flat bordered class="col-12 q-mt-sm q-pt-sm">
<div> <div>
<AddTablePosition :statCard="getStat" class="q-pa-none" /> <AddTablePosition :statCard="getStat" class="q-pa-none" @get-stat="getStat"/>
</div> </div>
</q-card> </q-card>
</template> </template>

View file

@ -29,9 +29,9 @@ const emit = defineEmits([
const updateEdit = (value: Boolean) => { const updateEdit = (value: Boolean) => {
emit("update:editvisible", value); emit("update:editvisible", value);
}; };
const cancel = async () => { // const cancel = async () => {
props.cancel(); // props.cancel();
}; // };
const edit = async () => { const edit = async () => {
updateEdit(!props.editvisible); updateEdit(!props.editvisible);
props.edit(); props.edit();

View file

@ -429,55 +429,54 @@ const pagination = ref({
</div> </div>
<div v-else> <div v-else>
<div class="col-4"> <div class="col-4">
<div class="text-weight-medium">-</div> <div class="text-weight-medium">-</div>
<div class="text-weight-light">-</div> </div>
</div> </div>
</div> </template>
</template> <template v-else-if="col.name === 'reportingDate' && col.value !== '-'">
<template v-else-if="col.name === 'reportingDate' && col.value !== '-'"> <div class="text-weight-medium">
<div class="text-weight-medium"> {{ props.row.reportingDate }}
{{ props.row.reportingDate }} </div>
</div> </template>
</template> <template v-else-if="col.name === 'bmaOfficer'">
<template v-else-if="col.name === 'bmaOfficer'"> <div class="text-weight-medium">
<div class="text-weight-medium"> {{ props.row.bmaOfficer !== null ? props.row.bmaOfficer : "-" }}
{{ props.row.bmaOfficer !== null ? props.row.bmaOfficer : "-" }} </div>
</div> </template>
</template> <template v-else-if="col.name === 'statusName'">
<template v-else-if="col.name === 'statusName'"> <div class="text-weight-medium">
<div class="text-weight-medium"> {{ props.row.statusName }}
{{ props.row.statusName }} </div>
</div> </template>
</template> </q-td>
</q-td> <q-td auto-width>
<q-td auto-width> <q-btn icon="mdi-dots-vertical" size="12px" color="grey-7" flat round dense>
<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-menu transition-show="jump-down" transition-hide="jump-up"> <q-list dense style="min-width: 100px">
<q-list dense style="min-width: 100px"> <q-item v-if="roleAdmin && props.row.statusId === 'UN-CONTAIN'" clickable v-close-popup
<q-item v-if="roleAdmin && props.row.statusId === 'un-contain'" clickable v-close-popup @click="openAppointModal(props.row.personalId)">
@click="openAppointModal(props.row.personalId)"> <q-item-section style="min-width: 0px" avatar class="q-py-sm">
<q-item-section style="min-width: 0px" avatar class="q-py-sm"> <q-icon color="primary" size="xs" name="mdi-bookmark-outline" />
<q-icon color="primary" size="xs" name="mdi-bookmark-outline" /> </q-item-section>
</q-item-section> <q-item-section>เลอกหนวยงานทบบรรจ</q-item-section>
<q-item-section>เลอกหนวยงานทบบรรจ</q-item-section> </q-item>
</q-item> <q-separator />
<q-separator /> <q-item v-if="roleAdmin && props.row.statusId === 'UN-CONTAIN'" clickable v-close-popup
<q-item v-if="roleAdmin && props.row.statusId === 'un-contain'" clickable v-close-popup @click="editDetail(props.row, 'deferment')">
@click="editDetail(props.row, 'deferment')"> <q-item-section style="min-width: 0px" avatar class="q-py-sm">
<q-item-section style="min-width: 0px" avatar class="q-py-sm"> <q-icon color="blue" size="xs" name="mdi-account-alert-outline" />
<q-icon color="blue" size="xs" name="mdi-account-alert-outline" /> </q-item-section>
</q-item-section> <q-item-section>ขอผอนผ</q-item-section>
<q-item-section>ขอผอนผ</q-item-section> </q-item>
</q-item> <q-item v-else-if="props.row.deferment === true && props.row.statusId != 'DISCLAIM'" clickable v-close-popup
<q-item v-else-if="props.row.deferment === true && props.row.statusId != 'DISCLAIM'" clickable v-close-popup @click="editDetail(props.row, 'defermentInfo')">
@click="editDetail(props.row, 'defermentInfo')"> <q-item-section style="min-width: 0px" avatar class="q-py-sm">
<q-item-section style="min-width: 0px" avatar class="q-py-sm"> <q-icon color="blue" size="xs" name="mdi-account-details-outline" />
<q-icon color="blue" size="xs" name="mdi-account-details-outline" /> </q-item-section>
</q-item-section> <q-item-section>อมลการผอนผ</q-item-section>
<q-item-section>อมลการผอนผ</q-item-section> </q-item>
</q-item> <q-separator />
<q-separator /> <q-item v-if="props.row.statusId === 'UN-CONTAIN' ||
<q-item v-if="props.row.statusId === 'un-contain' ||
props.row.statusId === 'PREPARE-CONTAIN' props.row.statusId === 'PREPARE-CONTAIN'
" clickable v-close-popup " clickable v-close-popup
@click="editDetail(props.row, 'disclaim')"> @click="editDetail(props.row, 'disclaim')">

View file

@ -7,7 +7,6 @@ import type { QTableProps } from "quasar";
import { useCounterMixin } from "@/stores/mixin"; import { useCounterMixin } from "@/stores/mixin";
import http from "@/plugins/http"; import http from "@/plugins/http";
import config from "@/app.config"; import config from "@/app.config";
import { useRoute } from "vue-router";
const mixin = useCounterMixin(); // const mixin = useCounterMixin(); //
const { success, showLoader, hideLoader, date2Thai, modalConfirm } = mixin; const { success, showLoader, hideLoader, date2Thai, modalConfirm } = mixin;
const save = ref<boolean>(true); const save = ref<boolean>(true);

View file

@ -43,7 +43,6 @@
<script setup lang="ts"> <script setup lang="ts">
import { ref, useAttrs } from "vue"; import { ref, useAttrs } from "vue";
import { useCounterMixin } from "@/stores/mixin";
import { useQuasar } from "quasar"; import { useQuasar } from "quasar";
const $q = useQuasar(); const $q = useQuasar();
const attrs = ref<any>(useAttrs()); const attrs = ref<any>(useAttrs());