Merge branch 'develop' into nice_dev

# Conflicts:
#	src/modules/09_leave/components/1_Work/TableList.vue
#	src/modules/09_leave/components/2_Leave/TableList.vue
This commit is contained in:
DESKTOP-1R2VSQH\Lenovo ThinkPad E490 2023-10-20 16:59:11 +07:00
commit da81949b5e
14 changed files with 3865 additions and 887 deletions

View file

@ -1,5 +1,5 @@
# docker build . -t docker.frappet.com/demo/fe:latest
FROM node:latest as build-stage
FROM node:lts as build-stage
WORKDIR /app
COPY package*.json ./
RUN npm install

3081
package-lock.json generated

File diff suppressed because it is too large Load diff

View file

@ -52,9 +52,10 @@
"eslint-plugin-cypress": "^2.12.1",
"eslint-plugin-vue": "^9.3.0",
"jsdom": "^20.0.3",
"node-sass": "^9.0.0",
"npm-run-all": "^4.1.5",
"prettier": "^2.7.1",
"sass": "^1.32.12",
"sass": "^1.69.4",
"start-server-and-test": "^1.15.2",
"typescript": "~4.7.4",
"vite": "^4.0.0",

View file

@ -64,6 +64,8 @@ export default {
`${candidate}reject-register/${candidateId}`,
candidateCheckPayment: (candidateId: string) =>
`${candidate}check-payment/${candidateId}`,
candidateCheckRegisterReject: (candidateId: string) =>
`${candidate}reject/check-register/${candidateId}`,
candidate,
candidateOfPeriodExam: (status: string, examId: string) =>
`${periodExam}${status}/${examId}`,

View file

@ -51,7 +51,7 @@
</q-tr>
</template>
<template #bottom="props">
<div style="width: 64% !important" />
<div style="width: 67% !important" />
<div
:props="props"

File diff suppressed because it is too large Load diff

View file

@ -12,6 +12,11 @@
@click="router.go(-1)"
/>
ตรวจสอบคณสมบสมครสอบรอบคดเลอก
{{
rejectDetail == null || rejectDetail == ""
? ""
: "(เหตุผล: " + rejectDetail + ")"
}}
<q-space />
<q-btn
color="blue"
@ -36,6 +41,17 @@
>
<q-tooltip>ตรวจสอบขอม</q-tooltip>
</q-btn>
<q-btn
color="red"
flat
round
icon="refresh"
class="bg-red-1"
@click="modalReverse"
v-if="status == 'payment' || status == 'checkSeat'"
>
<q-tooltip>อนกลบใหเจาหนาทตรวจสอบ</q-tooltip>
</q-btn>
</div>
<q-card class="q-pa-md">
<div>
@ -124,6 +140,55 @@
</q-form>
</q-card>
</q-dialog>
<q-dialog :model-value="modalReverseOfficer" persistent>
<q-card style="min-width: 700px">
<q-form ref="myForm">
<div class="row items-center q-pa-sm">
<div class="row">
<div class="text-bold">อนกลบใหเจาหนาทตรวจสอบ</div>
</div>
<q-space />
<q-btn
icon="close"
unelevated
round
dense
style="color: #ff8080; background-color: #ffdede"
size="12px"
@click="closeReverse"
/>
</div>
<q-separator />
<!-- header บน table นหา แสดงคอลมน (status nornmalData true) -->
<div class="col-12 row q-pa-md">
<q-input
class="col-12 q-px-sm q-pt-sm"
outlined
stack-label
v-model="reason"
label="หมายเหตุ"
lazy-rules
autofocus
hide-bottom-space
type="textarea"
></q-input>
</div>
<q-separator />
<q-card-actions align="right" class="bg-white text-teal">
<q-btn
flat
round
color="public"
@click="checkSaveReverse"
icon="mdi-content-save-outline"
>
<q-tooltip>นทกตรวจสอบ</q-tooltip>
</q-btn>
</q-card-actions>
</q-form>
</q-card>
</q-dialog>
</template>
<script setup lang="ts">
@ -157,6 +222,7 @@ const route = useRoute();
const examId = ref<string>(route.params.examId.toString());
const candidateId = ref<string>(route.params.candidateId.toString());
const modal = ref<boolean>(false);
const modalReverseOfficer = ref<boolean>(false);
const approve = ref<string>("1");
const reason = ref<string>("");
const formInformation = ref<any>({});
@ -165,6 +231,7 @@ const formEducation = ref<any>({});
const formOccupation = ref<any>({});
const formContact = ref<any>({});
const status = ref<string>("");
const rejectDetail = ref<string>("");
onMounted(async () => {
await fetchStatus();
@ -177,6 +244,8 @@ const fetchStatus = async () => {
.then((res) => {
const data = res.data.result;
status.value = data.status;
rejectDetail.value = data.rejectDetail;
console.log(rejectDetail.value);
})
.catch((e) => {
messageError($q, e);
@ -221,6 +290,10 @@ const reject = async (reason: string) => {
});
};
const checkSaveReverse = () => {
rejectReverse(reason.value);
};
const checkSave = () => {
if (approve.value == "1") {
confirm(true, "");
@ -235,6 +308,30 @@ const modalCheck = () => {
modal.value = true;
};
const rejectReverse = async (reason: string) => {
showLoader();
await http
.put(config.API.candidateCheckRegisterReject(candidateId.value), {
reason: reason,
})
.then((res) => {})
.catch((e) => {
messageError($q, e);
})
.finally(async () => {
hideLoader();
success($q, "สำเร็จ");
router.push(`/qualify/manage/${examId.value}`);
});
};
const modalReverse = () => {
modalReverseOfficer.value = true;
};
const closeReverse = () => {
modalReverseOfficer.value = false;
};
const close = () => {
modal.value = false;
};

View file

@ -62,53 +62,55 @@ function redirectToPageadd() {
<template>
<div class="toptitle text-dark col-12 row items-center">เรองรองเรยน</div>
<div class="col-12 q-mt-sm">
<q-card flat bordered>
<div class="q-pa-md">
<q-toolbar style="padding: 0" class="q-gutter-sm q-mb-md">
<q-btn
id="addComplaints"
flat
dense
round
color="primary"
icon="mdi-plus"
@click="redirectToPageadd()"
><q-tooltip>เพมเรองรองเรยน </q-tooltip></q-btn
>
<q-card flat bordered class="col-12 q-mt-sm q-pa-md">
<div class="row col-12 q-col-gutter-sm q-mb-sm">
<div>
<q-btn
id="addComplaints"
size="12px"
flat
round
color="primary"
icon="mdi-plus"
@click="redirectToPageadd()"
><q-tooltip>เพมเรองรองเรยน </q-tooltip></q-btn
>
</div>
<q-space />
<div class="col-2">
<q-input
id="filterTable"
for="filterTable"
dense
outlined
v-model="filterTable"
label="ค้นหา"
/>
</div>
<div class="col-2">
<q-select
id="visibleColumns"
for="visibleColumns"
v-model="complainstStore.visibleColumns"
multiple
outlined
dense
options-dense
:display-value="$q.lang.table.columns"
emit-value
map-options
:options="complainstStore.columns"
option-value="name"
options-cover
/>
</div>
</q-toolbar>
<q-input
class="col-xs-12 col-sm-3 col-md-2"
id="filterTable"
for="filterTable"
dense
outlined
v-model="filterTable"
label="ค้นหา"
>
<template v-slot:append>
<q-icon name="search" />
</template>
</q-input>
<q-select
id="visibleColumns"
for="visibleColumns"
v-model="complainstStore.visibleColumns"
multiple
outlined
dense
options-dense
:display-value="$q.lang.table.columns"
emit-value
map-options
:options="complainstStore.columns"
option-value="name"
options-cover
class="col-xs-12 col-sm-3 col-md-2"
/>
</div>
<div class="col-12">
<TableComplaint :filterTable="filterTable" />
</div>
</q-card>
</div>
</q-card>
</template>
<style scoped></style>

View file

@ -87,115 +87,117 @@ onMounted(() => {
รายการสบสวนขอเทจจร
</div>
<q-card flat bordered class="col-12 q-mt-sm q-pa-md">
<div class="row q-col-gutter-sm">
<div class="row col-12 q-col-gutter-sm">
<div>
<q-btn
@click="clickAdd()"
size="12px"
flat
round
color="add"
icon="mdi-plus"
>
<q-tooltip>เพมรายการสบสวนขอเทจจร</q-tooltip>
</q-btn>
</div>
<q-space />
<q-input
class="col-xs-12 col-sm-3 col-md-2"
standout
dense
v-model="filterKeyword"
ref="filterRef"
outlined
debounce="300"
placeholder="ค้นหา"
>
<template v-slot:append>
<q-icon v-if="filterKeyword == ''" name="search" />
<q-icon
v-if="filterKeyword !== ''"
name="clear"
class="cursor-pointer"
@click="resetFilter"
/>
</template>
</q-input>
<q-select
v-model="dataInvestigate.visibleColumns"
multiple
outlined
dense
options-dense
:display-value="$q.lang.table.columns"
emit-value
map-options
:options="dataInvestigate.columns"
option-value="name"
options-cover
style="min-width: 150px"
class="col-xs-12 col-sm-3 col-md-2"
/>
</div>
<div class="col-12">
<d-table
ref="table"
:columns="dataInvestigate.columns"
:rows="dataInvestigate.rows"
:filter="filterKeyword"
row-key="interrogated"
<div class="row col-12 q-col-gutter-sm q-mb-sm">
<div>
<q-btn
@click="clickAdd()"
size="12px"
flat
bordered
:paging="true"
dense
class="custom-header-table"
v-bind="attrs"
:visible-columns="dataInvestigate.visibleColumns"
:pagination-label="paginationLabel"
v-model:pagination="pagination"
round
color="add"
icon="mdi-plus"
>
<template v-slot:header="props">
<q-tr :props="props">
<q-th
v-for="col in props.cols"
:key="col.name"
:props="props"
style="padding: 10px; color: #35373c; font-weight: 500"
>
<span class="text-weight-medium">{{ col.label }}</span>
</q-th>
<q-th auto-width />
<q-th auto-width />
</q-tr>
</template>
<template v-slot:body="props">
<q-tr :props="props" class="cursor-pointer">
<q-td v-for="col in props.cols" :key="col.name" :props="props">
<q-td v-if="col.name == 'no'">
{{ props.rowIndex + 1 }}
</q-td>
<div>
{{ col.value }}
</div>
<q-tooltip>เพมรายการสบสวนขอเทจจร</q-tooltip>
</q-btn>
</div>
<q-space />
<q-input
class="col-xs-12 col-sm-3 col-md-2"
standout
dense
v-model="filterKeyword"
ref="filterRef"
outlined
debounce="300"
placeholder="ค้นหา"
>
<template v-slot:append>
<q-icon v-if="filterKeyword == ''" name="search" />
<q-icon
v-if="filterKeyword !== ''"
name="clear"
class="cursor-pointer"
@click="resetFilter"
/>
</template>
</q-input>
<q-select
v-model="dataInvestigate.visibleColumns"
multiple
outlined
dense
options-dense
:display-value="$q.lang.table.columns"
emit-value
map-options
:options="dataInvestigate.columns"
option-value="name"
options-cover
style="min-width: 150px"
class="col-xs-12 col-sm-3 col-md-2"
/>
</div>
<div class="col-12">
<d-table
ref="table"
:columns="dataInvestigate.columns"
:rows="dataInvestigate.rows"
:filter="filterKeyword"
row-key="interrogated"
flat
bordered
:paging="true"
dense
class="custom-header-table"
v-bind="attrs"
:visible-columns="dataInvestigate.visibleColumns"
:pagination-label="paginationLabel"
v-model:pagination="pagination"
>
<template v-slot:header="props">
<q-tr :props="props">
<q-th
v-for="col in props.cols"
:key="col.name"
:props="props"
style="color: #000000; font-weight: 500"
>
<span class="text-weight-medium">{{ col.label }}</span>
</q-th>
<q-th auto-width />
<q-th auto-width />
</q-tr>
</template>
<template v-slot:body="props">
<q-tr :props="props" class="cursor-pointer">
<q-td v-for="col in props.cols" :key="col.name" :props="props">
<q-td v-if="col.name == 'no'">
{{ props.rowIndex + 1 }}
</q-td>
<q-td auto-width style="font-size: 14px; width: 10rem">
{{ props.row.active }}
</q-td>
<q-td auto-width>
<div>
{{ col.value }}
</div>
</q-td>
<q-td auto-width style="font-size: 14px; width: 10%;">
{{ props.row.active }}
</q-td>
<q-td auto-width>
<div>
<q-btn
v-if="props.row.status === 'ยุติเรื่อง'"
class="q-px-xl q-py-xs text-white no-shadow"
style="background-color: #00aa86; border-radius: 6px"
dense
outline
color="deep-orange-7"
class="q-px-sm"
>ยกเลกยเรอง</q-btn
>
</q-td>
</q-tr>
</template>
</d-table>
</div>
</div>
</q-td>
</q-tr>
</template>
</d-table>
</div>
</q-card>
</template>

View file

@ -103,7 +103,9 @@ const clickAdd = () => {
<q-btn
v-if="props.row.active === 'ยืนยันผล'"
color="primary"
class="q-px-md q-py-xs"
class="q-px-md"
dense
unelevated
>นยนผล</q-btn
>
<span v-else>{{ props.row.active }}</span>

View file

@ -14,7 +14,6 @@
</q-btn>
</div>
<q-space />
<div class="items-center q-gutter-sm" style="display: flex">
<!-- นหาขอความใน table -->
<q-input
standout
@ -26,6 +25,7 @@
debounce="300"
placeholder="ค้นหา"
style="max-width: 200px"
class="col-xs-12 col-sm-3 col-md-2"
>
<template v-slot:append>
<q-icon v-if="inputfilter == ''" name="search" />
@ -50,12 +50,10 @@
option-value="name"
map-options
emit-value
style="min-width: 150px"
class="gt-xs"
class="col-xs-12 col-sm-3 col-md-2 gt-xs"
>
<template> </template>
</q-select>
</div>
</div>
<d-table
ref="table"

View file

@ -60,51 +60,53 @@ function redirectToPageadd() {
<div class="toptitle text-dark col-12 row items-center">
รายการออกคำสงลงโทษทางว
</div>
<div class="col-12 q-mt-sm">
<q-card flat bordered>
<div class="q-pa-md">
<q-toolbar style="padding: 0" class="q-gutter-sm q-mb-md">
<q-btn
id="addDisciplineOrder"
flat
dense
round
color="primary"
icon="mdi-plus"
@click="redirectToPageadd()"
><q-tooltip>เพมรายการออกคำสงลงโทษทางว </q-tooltip></q-btn
>
<q-card flat bordered class="col-12 q-mt-sm q-pa-md">
<div class="row col-12 q-col-gutter-sm q-mb-sm">
<div>
<q-btn
id="addDisciplineOrder"
flat
size="12px"
round
color="primary"
icon="mdi-plus"
@click="redirectToPageadd()"
><q-tooltip>เพมรายการออกคำสงลงโทษทางว </q-tooltip></q-btn
>
</div>
<q-space />
<div class="col-2">
<q-input
for="filterTable"
dense
outlined
v-model="filterTable"
label="ค้นหา"
/>
</div>
<div class="col-2">
<q-select
for="visibleColumns"
v-model="OrderStore.visibleColumns"
multiple
outlined
dense
options-dense
:display-value="$q.lang.table.columns"
emit-value
map-options
:options="OrderStore.columns"
option-value="name"
options-cover
/>
</div>
</q-toolbar>
<q-input
class="col-xs-12 col-sm-3 col-md-2"
for="filterTable"
dense
outlined
v-model="filterTable"
label="ค้นหา"
>
<template v-slot:append>
<q-icon name="search" />
</template>
</q-input>
<q-select
for="visibleColumns"
class="col-xs-12 col-sm-3 col-md-2"
v-model="OrderStore.visibleColumns"
multiple
outlined
dense
options-dense
:display-value="$q.lang.table.columns"
emit-value
map-options
:options="OrderStore.columns"
option-value="name"
options-cover
/>
</div>
<div class="col-12">
<tableOrder :filterTable="filterTable" />
</div>
</q-card>
</div>
</template>
<style scoped></style>

View file

@ -111,114 +111,112 @@ onMounted(() => {});
รายการชองทางการรองเรยน
</div>
<q-card flat bordered class="col-12 q-mt-sm q-pa-md">
<div class="row q-col-gutter-sm">
<div class="row col-12 q-col-gutter-sm">
<div>
<q-btn
@click="clickAdd()"
size="12px"
flat
round
color="add"
icon="mdi-plus"
>
<q-tooltip>เพมชองทางการรองเรยน</q-tooltip>
</q-btn>
</div>
<q-space />
<q-input
class="col-xs-12 col-sm-3 col-md-2"
standout
dense
v-model="filterKeyword"
ref="filterRef"
outlined
debounce="300"
placeholder="ค้นหา"
<div class="row col-12 q-col-gutter-sm q-mb-sm">
<div>
<q-btn
@click="clickAdd()"
size="12px"
flat
round
color="add"
icon="mdi-plus"
>
<template v-slot:append>
<q-icon v-if="filterKeyword == ''" name="search" />
<q-icon
v-if="filterKeyword !== ''"
name="clear"
class="cursor-pointer"
@click="resetFilter"
/>
</template>
</q-input>
<q-tooltip>เพมชองทางการรองเรยน</q-tooltip>
</q-btn>
</div>
<q-space />
<q-select
v-model="visibleColumns"
multiple
outlined
dense
options-dense
:display-value="$q.lang.table.columns"
emit-value
map-options
:options="columns"
option-value="name"
options-cover
style="min-width: 150px"
class="col-xs-12 col-sm-3 col-md-2"
/>
</div>
<div class="col-12">
<d-table
:columns="columns"
:rows="rows"
row-key="id"
:filter="filterKeyword"
:visible-columns="visibleColumns"
:pagination-label="paginationLabel"
v-model:pagination="pagination"
>
<template v-slot:header="props">
<q-tr :props="props">
<q-th v-for="col in props.cols" :key="col.name" :props="props">
<span class="text-weight-medium">{{ col.label }}</span>
</q-th>
<q-th auto-width />
</q-tr>
</template>
<template v-slot:body="props">
<q-tr :props="props" class="cursor-pointer">
<q-td key="no" :props="props">
{{ props.rowIndex + 1 }}
</q-td>
<q-td key="subject" :props="props">
{{ props.row.subject }}
</q-td>
<q-td>
<q-btn
dense
size="12px"
flat
round
color="red"
@click="clickDelete(props.row.id)"
icon="mdi-delete"
>
<q-tooltip>ลบขอม</q-tooltip>
</q-btn>
</q-td>
</q-tr>
</template>
<!-- <template v-slot:pagination="scope">
<q-pagination
v-model="pagination.page"
active-color="primary"
color="dark"
:max="scope.pagesNumber"
:max-pages="5"
size="sm"
boundary-links
direction-links
></q-pagination>
</template> -->
</d-table>
</div>
<q-input
class="col-xs-12 col-sm-3 col-md-2"
standout
dense
v-model="filterKeyword"
ref="filterRef"
outlined
debounce="300"
placeholder="ค้นหา"
>
<template v-slot:append>
<q-icon v-if="filterKeyword == ''" name="search" />
<q-icon
v-if="filterKeyword !== ''"
name="clear"
class="cursor-pointer"
@click="resetFilter"
/>
</template>
</q-input>
<q-select
v-model="visibleColumns"
multiple
outlined
dense
options-dense
:display-value="$q.lang.table.columns"
emit-value
map-options
:options="columns"
option-value="name"
options-cover
style="min-width: 150px"
class="col-xs-12 col-sm-3 col-md-2"
/>
</div>
<div class="col-12">
<d-table
:columns="columns"
:rows="rows"
row-key="id"
:filter="filterKeyword"
:visible-columns="visibleColumns"
:pagination-label="paginationLabel"
v-model:pagination="pagination"
>
<template v-slot:header="props">
<q-tr :props="props">
<q-th v-for="col in props.cols" :key="col.name" :props="props">
<span class="text-weight-medium">{{ col.label }}</span>
</q-th>
<q-th auto-width />
</q-tr>
</template>
<template v-slot:body="props">
<q-tr :props="props" class="cursor-pointer">
<q-td key="no" :props="props">
{{ props.rowIndex + 1 }}
</q-td>
<q-td key="subject" :props="props">
{{ props.row.subject }}
</q-td>
<q-td>
<q-btn
dense
size="12px"
flat
round
color="red"
@click="clickDelete(props.row.id)"
icon="mdi-delete"
>
<q-tooltip>ลบขอม</q-tooltip>
</q-btn>
</q-td>
</q-tr>
</template>
<!-- <template v-slot:pagination="scope">
<q-pagination
v-model="pagination.page"
active-color="primary"
color="dark"
:max="scope.pagesNumber"
:max-pages="5"
size="sm"
boundary-links
direction-links
></q-pagination>
</template> -->
</d-table>
</div>
</q-card>
</template>

View file

@ -84,8 +84,7 @@ function clickDelete(id: string) {
รายการชอกรรมการ
</div>
<q-card flat bordered class="col-12 q-mt-sm q-pa-md">
<div class="row q-col-gutter-sm">
<div class="row col-12 q-col-gutter-sm">
<div class="row col-12 q-col-gutter-sm q-mb-sm">
<div>
<q-btn @click="$router.push(`/discipline/director/add`)" size="12px" flat round color="add" icon="mdi-plus">
<q-tooltip>เพมรายชอกรรมการ</q-tooltip>
@ -138,6 +137,5 @@ function clickDelete(id: string) {
</d-table>
</div>
</div>
</q-card>
</template>