hrms-bangkok/hrms-mgt
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

fix: สรรหา ปรับ pagin /โครงสร้าง ปิดดาวโหลดได้เเค่ root ปรับข้อความ

Browse source
This commit is contained in:
setthawutttty 2025-09-10 11:08:18 +07:00
parent e4bdf45beb
commit 8263697759
8 changed files with 162 additions and 58 deletions
Download patch file Download diff file Expand all files Collapse all files

74
src/modules/02_organization/components/TableMain.vue
View file

@ -576,7 +576,9 @@ const dataCondition = ref<DataPositionCondition>();
function onClickCodition(data: PosMaster2) {
dataCondition.value = {
conditionReason: data.conditionReason,
conditionReason: data.conditionReason
? data.conditionReason.replace(/ /g, " \n")
: "",
id: data.id,
isCondition: data.isCondition,
orgShortname: data.orgShortname,
@ -600,7 +602,7 @@ async function fetchDataCondition() {
}
function onClickAction(type: string, data: PosMaster2) {
console.log(data);
switch (type) {
case "EDIT":
onClickPosition(type, data.id, data);
@ -698,7 +700,14 @@ watch(
</div>
<!-- v-if="store.typeOrganizational === 'draft'" -->
<q-btn flat round dense color="deep-purple" icon="save_alt">
<q-btn
v-if="orgLevel == 0"
flat
round
dense
color="deep-purple"
icon="save_alt"
>
<q-menu>
<q-list
dense
@ -955,35 +964,36 @@ watch(
}}
</div>
<div v-else-if="col.name == 'positionIsSelected'">
{{
props.row.positionIsSelected
? props.row.positionIsSelected
: "-"
}}
{{
props.row.isCondition && props.row.conditionReason
? `(${props.row.conditionReason})`
: ""
}}
<q-btn
v-if="props.row.positionIsSelected != 'ว่าง'"
size="12px"
dense
flat
icon="info"
color="info"
round
@click="
(modalPerson = true),
(personalId =
store.typeOrganizational === 'draft'
? props.row.next_holderId
: props.row.current_holderId)
"
>
<q-tooltip>ดูข้อมูลในทะเบียนประวัติ</q-tooltip>
</q-btn>
<div class="row text-html items-center">
{{
props.row.positionIsSelected
? props.row.positionIsSelected
: "-"
}}
{{
props.row.isCondition && props.row.conditionReason
? `(${props.row.conditionReason})`
: ""
}}
<q-btn
v-if="props.row.positionIsSelected != 'ว่าง'"
size="12px"
dense
flat
icon="info"
color="info"
round
@click="
(modalPerson = true),
(personalId =
store.typeOrganizational === 'draft'
? props.row.next_holderId
: props.row.current_holderId)
"
>
<q-tooltip>ดูข้อมูลในทะเบียนประวัติ</q-tooltip>
</q-btn>
</div>
</div>
<div v-else>
{{ col.value ? col.value : "-" }}

94
src/modules/03_recruiting/components/Table.vue
View file

@ -1,6 +1,6 @@
<script setup lang="ts">
import { checkPermission } from "@/utils/permissions";
import { ref, useAttrs } from "vue";
import { ref, useAttrs, watch } from "vue";
import type { Pagination } from "@/modules/03_recruiting/interface/index/Main";
const attrs = ref<any>(useAttrs());
@ -8,13 +8,17 @@ const table = ref<any>(null);
const filterRef = ref<any>(null);
const filter = defineModel<string>("filter", { required: true });
const pagination = defineModel<Pagination>('pagination',{required:true})
const pagination = defineModel<Pagination>("pagination", { required: true });
const props = defineProps({
onSearch: Function,
fetchData: Function,
count: Number,
totalList: Number,
pass: Number,
notpass: Number,
missed_exam: Number,
other: Number,
inputfilter: String,
name: String,
@ -44,9 +48,7 @@ const emit = defineEmits([
"update:inputvisible",
"update:editvisible",
]);
const updateInput = (value: string | number | null) => {
emit("update:inputfilter", value);
};
const updateVisible = (value: []) => {
emit("update:inputvisible", value);
};
@ -66,11 +68,23 @@ function checkAdd() {
props.add();
}
/** reset ฟิลเตอร์ ที่ ค้นหา */
function resetFilter() {
emit("update:inputfilter", "");
filterRef.value.focus();
function updatePagination(newPagination: any) {
if (!props.nornmalData) {
pagination.value.page = 1;
pagination.value.rowsPerPage = newPagination.rowsPerPage;
}
}
function getList() {
props.fetchData?.();
}
watch(
() => pagination.value.rowsPerPage,
async () => {
getList();
}
);
</script>
<template>
<div class="q-pb-sm row q-col-gutter-sm">
@ -96,8 +110,8 @@ function resetFilter() {
<q-space />
<q-badge
color="white"
class="text-weight-bold text-subtitle1 text-primary"
:label="`${count}`"
class="text-weight-bold text-subtitle1 text-blue-7"
:label="`${count?.toLocaleString()}`"
rounded
/>
</div>
@ -108,8 +122,8 @@ function resetFilter() {
<q-space />
<q-badge
color="white"
class="text-weight-bold text-subtitle1 text-blue"
:label="`${pass}`"
class="text-weight-bold text-subtitle1 text-primary"
:label="`${pass?.toLocaleString()}`"
rounded
/>
</div>
@ -122,7 +136,41 @@ function resetFilter() {
<q-badge
color="white"
class="text-weight-bold text-subtitle1 text-pink"
:label="`${notpass}`"
:label="`${notpass?.toLocaleString()}`"
rounded
/>
</div>
</q-card>
<q-card
v-if="missed_exam && missed_exam !== 0"
bordered
flat
class="q-px-md no-wrap row"
>
<div class="col-12 text-subtitle2 row items-center">
<span class="text-weight-medium text-dark">ขาดสอบ</span>
<q-space />
<q-badge
color="white"
class="text-weight-bold text-subtitle1 text-orange"
:label="`${missed_exam?.toLocaleString()}`"
rounded
/>
</div>
</q-card>
<q-card
v-if="other && other !== 0"
bordered
flat
class="q-px-md no-wrap row"
>
<div class="col-12 text-subtitle2 row items-center">
<span class="text-weight-medium text-dark">อื่น ๆ</span>
<q-space />
<q-badge
color="white"
class="text-weight-bold text-subtitle1 text-info"
:label="`${other?.toLocaleString()}`"
rounded
/>
</div>
@ -175,8 +223,8 @@ function resetFilter() {
:virtual-scroll-sticky-size-start="48"
dense
:pagination-label="paginationLabel"
v-model:pagination="pagination"
:rows-per-page-options="[0]"
:rows-per-page-options="nornmalData ? [0] : [1, 25, 50, 100]"
@update:pagination="updatePagination"
>
<template v-slot:header="props">
<q-tr :props="props">
@ -189,6 +237,20 @@ function resetFilter() {
<template #body="props">
<slot v-bind="props" name="columns"></slot>
</template>
<template v-if="!nornmalData" v-slot:pagination="scope">
ทั้งหมด {{ props.count && props.count.toLocaleString() }} รายการ
<q-pagination
v-model="pagination.page"
active-color="primary"
color="dark"
:max="totalList"
size="sm"
boundary-links
direction-links
:max-pages="5"
@update:model-value="getList"
></q-pagination>
</template>
</d-table>
</template>

1
src/modules/03_recruiting/interface/index/Main.ts
View file

@ -1,5 +1,6 @@
import { ref } from "vue";
interface Pagination {
page: number;
rowsPerPage: number;
sortBy?: string;
}

17
src/modules/03_recruiting/views/01_compete/Detail.vue
View file

@ -22,15 +22,19 @@ const { messageError, success, showLoader, hideLoader, onSearchDataTable } =
mixin;
const initialPagination = ref<Pagination>({
rowsPerPage: 0,
page:1,
rowsPerPage: 10,
sortBy: "year",
});
const year = ref<string>("");
const round = ref<string>("");
const name = ref<string>("");
const count = ref<number>(0);
const totalList = ref<number>(0);
const pass = ref<number>(0);
const notpass = ref<number>(0);
const missed_exam = ref<number>(0);
const other = ref<number>(0);
const rows = ref<any[]>([]);
const rowsData = ref<any[]>([]);
const importId = ref<string>(route.params.id as string); // Period Import Id
@ -352,6 +356,8 @@ async function fetchData() {
.post(config.API.getExamResultById(importId.value), {
examAttribute: "",
examResult: "",
page:initialPagination.value.page,
pageSize:initialPagination.value.rowsPerPage,
})
.then((res) => {
let header = res.data.result.header;
@ -359,6 +365,11 @@ async function fetchData() {
count.value = header.count;
pass.value = header.pass;
notpass.value = header.notpass;
missed_exam.value = header.missed_exam;
other.value = header.other;
totalList.value = Math.ceil(
header.count / initialPagination.value.rowsPerPage
);
if (period != null) {
name.value = period.name;
round.value = period.order;
@ -483,6 +494,8 @@ onMounted(async () => {
:count="count"
:pass="pass"
:notpass="notpass"
:missed_exam="missed_exam"
:other="other"
:rows="rows"
:columns="columns"
v-model:filter="filter"
@ -490,9 +503,11 @@ onMounted(async () => {
:visible-columns="visibleColumns"
v-model:inputfilter="filter"
v-model:inputvisible="visibleColumns"
v-model:totalList="totalList"
v-model:pagination="initialPagination"
:nornmalData="false"
:conclude="true"
:fetchData="fetchData"
>
<template #columns="props">
<q-tr :props="props" class="cursor-pointer">

7
src/modules/03_recruiting/views/01_compete/Period.vue
View file

@ -64,6 +64,7 @@ const textTittleResult = ref<string>("");
const rows = ref<ResponseRecruitPeriod[]>([]);
const rowsData = ref<ResponseRecruitPeriod[]>([]);
const initialPagination = ref<Pagination>({
page: 0,
rowsPerPage: 0,
sortBy: "year",
});
@ -646,7 +647,7 @@ onMounted(async () => {
<q-tooltip>นำเข้าไฟล์ผู้สมัครสอบ</q-tooltip>
</q-btn>
<div v-else>
{{ col.value }}
{{ col.value.toLocaleString() }}
<q-btn
v-if="checkPermission($route)?.attrIsUpdate"
@ -693,7 +694,7 @@ onMounted(async () => {
<q-tooltip>นำเข้าไฟล์บัญชีรวมคะแนน</q-tooltip>
</q-btn>
<div v-else>
{{ props.row.score.scoreCount }}
{{ props.row.score.scoreCount.toLocaleString() }}
<q-btn
:disable="props.row.examCount == 0"
flat
@ -730,7 +731,7 @@ onMounted(async () => {
<q-tooltip>นำเข้าไฟล์ผลการสอบ (บัญชีรายชื่อ)</q-tooltip>
</q-btn>
<div v-else>
{{ props.row.score.resultCount }}
{{ props.row.score.resultCount.toLocaleString() }}
<q-btn
v-if="checkPermission($route)?.attrIsUpdate"
dense

17
src/modules/03_recruiting/views/02_qualify/DisableDetail.vue
View file

@ -26,6 +26,7 @@ const year = ref<string>("2566");
const round = ref<string>("1");
const name = ref<string>("");
const initialPagination = ref<Pagination>({
page: 1,
rowsPerPage: 0,
sortBy: "examID",
});
@ -33,6 +34,10 @@ const initialPagination = ref<Pagination>({
const count = ref<number>(0);
const pass = ref<number>(0);
const notpass = ref<number>(0);
const missed_exam = ref<number>(0);
const other = ref<number>(0);
const totalList = ref<number>(0);
const importId = ref<string>(route.params.id as string); // Period Import Id
const filter = ref<string>(""); //search data table
@ -293,6 +298,8 @@ async function fetchData() {
.post(config.API.getDisableExamResultById(importId.value), {
examAttribute: "",
examResult: "",
page: initialPagination.value.page,
pageSize: initialPagination.value.rowsPerPage,
})
.then((res) => {
var _data = res.data.result;
@ -300,7 +307,11 @@ async function fetchData() {
count.value = header.count;
pass.value = header.pass;
notpass.value = header.notpass;
missed_exam.value = header.missed_exam;
other.value = header.other;
totalList.value = Math.ceil(
header.count / initialPagination.value.rowsPerPage
);
const data = res.data.result.data;
let result: RecruitDetailResponse[] = [];
if (data.length > 0) {
@ -422,6 +433,9 @@ onMounted(async () => {
:count="count"
:pass="pass"
:notpass="notpass"
:missed_exam="missed_exam"
:other="other"
v-model:totalList="totalList"
:rows="rows"
:columns="columns"
v-model:filter="filter"
@ -432,6 +446,7 @@ onMounted(async () => {
v-model:inputvisible="visibleColumns"
:nornmalData="false"
:conclude="true"
:fetchData="fetchData"
>
<template #columns="props">
<q-tr :props="props" class="cursor-pointer">

4
src/modules/03_recruiting/views/02_qualify/DisableDetailEx.vue
View file

@ -50,7 +50,7 @@ async function fetchData() {
await http
.get(config.API.getDisableExamDetail(importId.value, examId.value))
.then((res) => {
let data = res.data.result.data;
let data = res.data.result;
if (data != null) {
profile_id.value = data.profileID;
examID.value = data.examID;
@ -82,7 +82,7 @@ async function fetchData() {
scoreD.value = data.scoreResult.scoreD;
}
} else {
dialogMessageNotify($q, "แข่งขัน ไม่พบข้อมูล");
dialogMessageNotify($q, "คัดเลือก ไม่พบข้อมูล");
}
})
.catch((e) => {

6
src/modules/03_recruiting/views/02_qualify/DisablePeriod.vue
View file

@ -595,7 +595,7 @@ onMounted(async () => {
<q-tooltip>นำเข้าไฟล์ผู้สมัครสอบ</q-tooltip>
</q-btn>
<div v-else>
{{ col.value }}
{{ col.value.toLocaleString() }}
<q-btn
v-if="checkPermission($route)?.attrIsUpdate"
@ -642,7 +642,7 @@ onMounted(async () => {
<q-tooltip>นำเข้าไฟล์ผลคะแนนสอบ</q-tooltip>
</q-btn>
<div v-else>
{{ col.value }}
{{ props.row.score.scoreCount.toLocaleString() }}
<q-btn
v-if="checkPermission($route)?.attrIsUpdate"
dense
@ -676,7 +676,7 @@ onMounted(async () => {
<q-tooltip>นำเข้าไฟล์ผลการสอบ (บัญชีรายชื่อ)</q-tooltip>
</q-btn>
<div v-else>
{{ props.row.score.resultCount }}
{{ props.row.score.resultCount.toLocaleString() }}
<q-btn
v-if="checkPermission($route)?.attrIsUpdate"
dense