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

Merge remote-tracking branch 'origin/develop' into develop

Browse source
This commit is contained in:
Suphonchai Phoonsawat 2023-10-20 17:39:05 +07:00
commit 41cdbc7992
22 changed files with 1139 additions and 1103 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/api/recruiting/api.period-exam.ts
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}`,

2
src/modules/03_recruiting/components/Career.vue
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"

961
src/modules/03_recruiting/components/Information.vue
View file

File diff suppressed because it is too large Load diff

97
src/modules/03_recruiting/views/02_qualify/ExamForm.vue
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;
};

179
src/modules/09_leave/components/1_Work/TableList.vue
View file

@ -13,7 +13,6 @@ const workStore = useWorklistDataStore();
const { date2Thai } = mixin;
const { searchDataFn, filterFn } = workStore;
onMounted(() => {});
//ข้อมูล Table
const columns = ref<QTableProps["columns"]>([
@ -90,6 +89,12 @@ const visibleColumns = ref<string[]>([
"coordinatesOut",
"status",
]);
onMounted(() => {
workStore.columns = columns.value;
workStore.visibleColumns = visibleColumns.value;
});
//DialogDetail
const modal = ref<boolean>(false);
const dataDetail = ref<any>([]);
@ -108,96 +113,9 @@ const pagination = ref({
page: 1,
rowsPerPage: 10,
});
const paging = ref<boolean>(true);
const paginationLabel = (start: string, end: string, total: string) => {
if (paging.value == true) return " " + start + "-" + end + " ใน " + total;
else return start + "-" + end + " ใน " + total;
};
</script>
<template>
<q-toolbar style="padding: 0" class="q-gutter-sm q-mb-md">
<div class="col-2">
<datepicker
menu-class-name="modalfix"
v-model="workStore.selectDate"
:locale="'th'"
autoApply
:enableTimePicker="false"
week-start="0"
@update:model-value="
searchDataFn(workStore.selectDate, workStore.selectStatus)
"
>
<template #year="{ year }">{{ year + 543 }}</template>
<template #year-overlay-value="{ value }">{{
parseInt(value + 543)
}}</template>
<template #trigger>
<q-input
dense
outlined
lazy-rules
:model-value="
workStore.selectDate !== null
? date2Thai(workStore.selectDate)
: null
"
hide-bottom-space
:label="`${'วันที่'}`"
>
<template v-slot:prepend>
<q-icon name="event" class="cursor-pointer text-primary">
</q-icon>
</template>
</q-input>
</template>
</datepicker>
</div>
<div class="col-3">
<q-select
emit-value
map-options
outlined
dense
v-model="workStore.selectStatus"
:options="workStore.optionStatus"
option-value="id"
option-label="name"
label="สถานะ"
@update:model-value="
searchDataFn(workStore.selectDate, workStore.selectStatus)
"
use-input
@filter="filterFn"
>
<template v-slot:no-option>
<q-item>
<q-item-section class="text-grey"> ไม่มีข้อมูล </q-item-section>
</q-item>
</template></q-select
>
</div>
<q-space />
<div class="col-2">
<q-input dense outlined v-model="workStore.filterTable" label="ค้นหา" />
</div>
<div class="col-2">
<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
/>
</div>
</q-toolbar>
<d-table
ref="table"
:columns="columns"
@ -209,8 +127,7 @@ const paginationLabel = (start: string, end: string, total: string) => {
:paging="true"
dense
class="custom-header-table"
:visible-columns="visibleColumns"
:pagination-label="paginationLabel"
:visible-columns="workStore.visibleColumns"
v-model:pagination="pagination"
>
<template v-slot:header="props">
@ -222,64 +139,38 @@ const paginationLabel = (start: string, end: string, total: string) => {
</template>
<template v-slot:body="props">
<q-tr :props="props" class="cursor-pointer">
<q-td key="no" :props="props" @click.prevent="clickDetail(props.row)">
{{ props.rowIndex + 1 }}
</q-td>
<q-td
key="fullName"
v-for="col in props.cols"
:key="col.name"
:props="props"
@click.prevent="clickDetail(props.row)"
>
{{ props.row.fullName }}
</q-td>
<q-td
key="timeIn"
:props="props"
@click.prevent="clickDetail(props.row)"
>
{{ props.row.timeIn }}
</q-td>
<q-td
key="coordinatesIn"
:props="props"
@click.prevent="clickDetail(props.row)"
>
<q-item style="padding: 0">
<q-item-section>
<q-item-label> {{ props.row.coordinatesIn }}</q-item-label>
<q-item-label caption lines="2">{{
props.row.latIn + " " + props.row.longIn
}}</q-item-label>
</q-item-section>
</q-item>
</q-td>
<q-td
key="timeOut"
:props="props"
@click.prevent="clickDetail(props.row)"
>
{{ props.row.timeOut }}
</q-td>
<q-td
key="coordinatesOut"
:props="props"
@click.prevent="clickDetail(props.row)"
>
<q-item style="padding: 0">
<q-item-section>
<q-item-label> {{ props.row.coordinatesOut }}</q-item-label>
<q-item-label caption lines="2">{{
props.row.latOut + " " + props.row.longOut
}}</q-item-label>
</q-item-section>
</q-item>
</q-td>
<q-td
key="status"
:props="props"
@click.prevent="clickDetail(props.row)"
>
{{ props.row.status }}
<div v-if="col.name == 'no'">
{{ props.rowIndex + 1 }}
</div>
<div v-else-if="col.name == 'coordinatesIn'">
<q-item style="padding: 0">
<q-item-section>
<q-item-label> {{ props.row.coordinatesIn }}</q-item-label>
<q-item-label caption lines="2">{{
props.row.latIn + " " + props.row.longIn
}}</q-item-label>
</q-item-section>
</q-item>
</div>
<div v-else-if="col.name == 'coordinatesOut'">
<q-item style="padding: 0">
<q-item-section>
<q-item-label> {{ props.row.coordinatesOut }}</q-item-label>
<q-item-label caption lines="2">{{
props.row.latOut + " " + props.row.longOut
}}</q-item-label>
</q-item-section>
</q-item>
</div>
<div v-else>
{{ col.value }}
</div>
</q-td>
</q-tr>
</template>

98
src/modules/09_leave/components/1_Work/ToolBar.vue Normal file
View file

@ -0,0 +1,98 @@
<script setup lang="ts">
//import Stores
import { useCounterMixin } from "@/stores/mixin";
import { useWorklistDataStore } from "@/modules/09_leave/stores/WorkStore";
const workStore = useWorklistDataStore();
const mixin = useCounterMixin();
const { date2Thai } = mixin;
const { filterFn, searchDataFn } = workStore;
</script>
<template>
<q-toolbar style="padding: 0" class="q-gutter-sm q-mb-sm">
<div class="col-2">
<datepicker
menu-class-name="modalfix"
v-model="workStore.selectDate"
:locale="'th'"
autoApply
:enableTimePicker="false"
week-start="0"
@update:model-value="
searchDataFn(workStore.selectDate, workStore.selectStatus)
"
>
<template #year="{ year }">{{ year + 543 }}</template>
<template #year-overlay-value="{ value }">{{
parseInt(value + 543)
}}</template>
<template #trigger>
<q-input
dense
outlined
lazy-rules
:model-value="
workStore.selectDate !== null
? date2Thai(workStore.selectDate)
: null
"
hide-bottom-space
:label="`${'วันที่'}`"
>
<template v-slot:prepend>
<q-icon name="event" class="cursor-pointer text-primary">
</q-icon>
</template>
</q-input>
</template>
</datepicker>
</div>
<div class="col-3">
<q-select
emit-value
map-options
outlined
dense
v-model="workStore.selectStatus"
:options="workStore.optionStatus"
option-value="id"
option-label="name"
label="สถานะ"
@update:model-value="
searchDataFn(workStore.selectDate, workStore.selectStatus)
"
use-input
@filter="filterFn"
>
<template v-slot:no-option>
<q-item>
<q-item-section class="text-grey"> ไม่มีข้อมูล </q-item-section>
</q-item>
</template></q-select
>
</div>
<q-space />
<div class="col-2">
<q-input dense outlined v-model="workStore.filterTable" label="ค้นหา" />
</div>
<div class="col-2">
<q-select
v-model="workStore.visibleColumns"
multiple
outlined
dense
options-dense
:display-value="$q.lang.table.columns"
emit-value
map-options
:options="workStore.columns"
option-value="name"
options-cover
/>
</div>
</q-toolbar>
</template>
<style scoped></style>

127
src/modules/09_leave/components/2_Leave/TableList.vue
View file

@ -1,9 +1,8 @@
q
<script setup lang="ts">
import { ref } from "vue";
import { ref, onMounted } from "vue";
import type { QTableProps } from "quasar";
import { useRouter } from "vue-router";
//import Stores
import { useCounterMixin } from "@/stores/mixin";
import { useLeavelistDataStore } from "@/modules/09_leave/stores/LeaveStore";
@ -71,6 +70,11 @@ const visibleColumns = ref<string[]>([
"status",
]);
onMounted(() => {
leaveStore.columns = columns.value;
leaveStore.visibleColumns = visibleColumns.value;
});
const pagination = ref({
descending: true,
page: 1,
@ -85,89 +89,6 @@ const paginationLabel = (start: string, end: string, total: string) => {
</script>
<template>
<q-toolbar style="padding: 0" class="q-gutter-sm q-mb-md">
<div class="col-2">
<q-select
emit-value
map-options
outlined
dense
v-model="leaveStore.selectYear"
:options="optionYear"
option-value="id"
option-label="name"
label="ปีงบประมาณ"
/>
</div>
<div class="col-3">
<q-select
emit-value
map-options
outlined
dense
v-model="leaveStore.selectType"
:options="leaveStore.optionType"
option-value="id"
option-label="name"
label="ประเภทการลา"
@update:model-value="
searchDataFn(leaveStore.selectType, leaveStore.selectStatus)
"
use-input
@filter="
(inputValue:any, doneFn:Function) =>
filterOption(inputValue, doneFn, 'type')
"
>
<template v-slot:no-option>
<q-item>
<q-item-section class="text-grey"> ไม่มีข้อมูล </q-item-section>
</q-item>
</template></q-select
>
</div>
<div class="col-2">
<q-select
v-if="leaveStore.tab == '2'"
emit-value
map-options
outlined
dense
v-model="leaveStore.selectStatus"
:options="leaveStore.optionStatus"
option-value="id"
option-label="name"
label="สถานะ"
@update:model-value="
searchDataFn(leaveStore.selectType, leaveStore.selectStatus)
"
use-input
@filter="
(inputValue:any, doneFn:Function) =>
filterOption(inputValue, doneFn, 'status')
"
/>
</div>
<q-space />
<div class="col-2">
<q-input dense outlined v-model="leaveStore.filterTable" label="ค้นหา" />
</div>
<div class="col-2">
<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
/>
</div>
</q-toolbar>
<d-table
ref="table"
:columns="columns"
@ -179,7 +100,7 @@ const paginationLabel = (start: string, end: string, total: string) => {
:paging="true"
dense
class="custom-header-table"
:visible-columns="visibleColumns"
:visible-columns="leaveStore.visibleColumns"
:pagination-label="paginationLabel"
v-model:pagination="pagination"
:loading="leaveStore.loadTable"
@ -192,26 +113,20 @@ const paginationLabel = (start: string, end: string, total: string) => {
</q-tr>
</template>
<template v-slot:body="props">
<q-tr
:props="props"
class="cursor-pointer"
@click.prevent="router.push(`/leave/detail/${props.row.name}`)"
>
<q-td key="no" :props="props"> {{ props.rowIndex + 1 }} </q-td>
<q-td key="leaveType" :props="props">
{{ props.row.leaveType }}
</q-td>
<q-td key="name" :props="props">
{{ props.row.name }}
</q-td>
<q-td key="Date" :props="props">
{{ props.row.Date }}
</q-td>
<q-td key="timeOut" :props="props">
{{ props.row.timeOut }}
</q-td>
<q-td key="status" :props="props">
{{ props.row.status }}
<q-tr :props="props" class="cursor-pointer">
<q-td
v-for="col in props.cols"
:key="col.name"
:props="props"
@click.prevent="router.push(`/leave/detail/${props.row.name}`)"
>
<div v-if="col.name == 'no'">
{{ props.rowIndex + 1 }}
</div>
<div v-else>
{{ col.value }}
</div>
</q-td>
</q-tr>
</template>

95
src/modules/09_leave/components/2_Leave/ToolBar.vue Normal file
View file

@ -0,0 +1,95 @@
<script setup lang="ts">
//import Stores
import { useLeavelistDataStore } from "@/modules/09_leave/stores/LeaveStore";
const leaveStore = useLeavelistDataStore();
const { searchDataFn, filterOption } = leaveStore;
</script>
<template>
<q-toolbar style="padding: 0" class="q-gutter-sm q-mb-sm">
<div class="col-2">
<q-select
emit-value
map-options
outlined
dense
v-model="leaveStore.selectYear"
:options="leaveStore.optionYear"
option-value="id"
option-label="name"
label="ปีงบประมาณ"
/>
</div>
<div class="col-3">
<q-select
emit-value
map-options
outlined
dense
v-model="leaveStore.selectType"
:options="leaveStore.optionType"
option-value="id"
option-label="name"
label="ประเภทการลา"
@update:model-value="
searchDataFn(leaveStore.selectType, leaveStore.selectStatus)
"
use-input
@filter="
(inputValue:any, doneFn:Function) =>
filterOption(inputValue, doneFn, 'type')
"
>
<template v-slot:no-option>
<q-item>
<q-item-section class="text-grey"> ไม่มีข้อมูล </q-item-section>
</q-item>
</template></q-select
>
</div>
<div class="col-2">
<q-select
v-if="leaveStore.tab == '2'"
emit-value
map-options
outlined
dense
v-model="leaveStore.selectStatus"
:options="leaveStore.optionStatus"
option-value="id"
option-label="name"
label="สถานะ"
@update:model-value="
searchDataFn(leaveStore.selectType, leaveStore.selectStatus)
"
use-input
@filter="
(inputValue:any, doneFn:Function) =>
filterOption(inputValue, doneFn, 'status')
"
/>
</div>
<q-space />
<div class="col-2">
<q-input dense outlined v-model="leaveStore.filterTable" label="ค้นหา" />
</div>
<div class="col-2">
<q-select
v-model="leaveStore.visibleColumns"
multiple
outlined
dense
options-dense
:display-value="$q.lang.table.columns"
emit-value
map-options
:options="leaveStore.columns"
option-value="name"
options-cover
/>
</div>
</q-toolbar>
</template>
<style scoped></style>

0
src/modules/09_leave/interface/request/work.ts Normal file
View file

9
src/modules/09_leave/interface/response/leave.ts Normal file
View file

@ -0,0 +1,9 @@
interface DataRows {
leaveType: string
name: string
Date: string
status: string
}
export type {
DataRows
}

15
src/modules/09_leave/interface/response/work.ts Normal file
View file

@ -0,0 +1,15 @@
interface TableRows {
fullName: string
timeIn: string
coordinatesIn: string
latIn: string
longIn: string
timeOut: string
coordinatesOut: string
latOut: string
longOut: string
status: string
}
export type {
TableRows
}

21
src/modules/09_leave/stores/LeaveStore.ts
View file

@ -3,6 +3,8 @@ import { ref } from "vue";
import { useCounterMixin } from "@/stores/mixin";
import type { DataOption } from "@/modules/09_leave/interface/index/Main"
import type { QTableProps } from "quasar";
import type { DataRows } from "@/modules/09_leave/interface/response/leave"
const mixin = useCounterMixin();
@ -10,21 +12,23 @@ const { date2Thai, showLoader, hideLoader } = mixin;
export const useLeavelistDataStore = defineStore("leave", () => {
//TABMENU
const tab = ref<string>("1");
const amounttab1 = ref<string>("")
const amounttab2 = ref<string>("")
const amounttab1 = ref<number>(0)
const amounttab2 = ref<number>(0)
//ข้อมูลในตาราง
const mainData = ref<any>([])
const rows = ref<any>([])
const rows = ref<DataRows[]>([])
const columns = ref<QTableProps["columns"]>([]);
const visibleColumns = ref<string[]>([]);
const loadTable = ref<boolean>(false)
async function fetchList(data: any) {
let datalist = data.map((e: any) => ({
async function fetchList(data: DataRows[]) {
let datalist = data.map((e: DataRows) => ({
leaveType: e.leaveType,
name: e.name,
Date: e.Date,
status: convertSatatus(e.status)
}))
tab.value !== "1" ? mainData.value = datalist : mainData.value = datalist.filter((e: any) => e.status === "อยู่ระหว่างกำเนินการ")
const filteramounttab1 = datalist.filter((e: any) => e.status === "อยู่ระหว่างกำเนินการ")
tab.value !== "1" ? mainData.value = datalist : mainData.value = datalist.filter((e) => e.status === "อยู่ระหว่างกำเนินการ")
const filteramounttab1 = datalist.filter((e) => e.status === "อยู่ระหว่างกำเนินการ")
amounttab1.value = filteramounttab1.length
amounttab2.value = datalist.length
await fetchOption()
@ -163,6 +167,9 @@ export const useLeavelistDataStore = defineStore("leave", () => {
rows,
fetchList,
loadTable,
columns,
visibleColumns,
//filter table
filterTable,
selectYear,

16
src/modules/09_leave/stores/WorkStore.ts
View file

@ -1,15 +1,19 @@
import { defineStore } from "pinia";
import { ref } from "vue";
import { useCounterMixin } from "@/stores/mixin";
import type { QTableProps } from "quasar";
import type { DataOption } from "@/modules/09_leave/interface/index/Main"
import type { TableRows } from "@/modules/09_leave/interface/response/work"
const mixin = useCounterMixin();
const { date2Thai } = mixin;
export const useWorklistDataStore = defineStore("work", () => {
// ข้อมูลในตาราง
const rows = ref<any>([])
const dataMain = ref<any>([])
function fetchList(data: any) {
let datalist = data.map((e: any) => ({
const rows = ref<TableRows[]>([])
const columns = ref<QTableProps["columns"]>([]);
const visibleColumns = ref<string[]>([]);
const dataMain = ref<TableRows[]>([])
function fetchList(data: TableRows[]) {
let datalist = data.map((e: TableRows) => ({
fullName: e.fullName,
timeIn: e.timeIn,
coordinatesIn: e.coordinatesIn,
@ -58,7 +62,7 @@ export const useWorklistDataStore = defineStore("work", () => {
}
}
}
function filterFn(val: string, update: any) {
function filterFn(val: string, update: Function) {
if (val == "") {
update(() => {
optionStatus.value = optionStatusMain.value;
@ -86,6 +90,8 @@ export const useWorklistDataStore = defineStore("work", () => {
return {
//ข้อมูลในตาราง
rows,
columns,
visibleColumns,
fetchList,
//ค้นหาข้อมูล
filterTable,

8
src/modules/09_leave/views/LeaveListMain.vue
View file

@ -1,10 +1,12 @@
<script setup lang="ts">
import { ref, onMounted } from "vue";
import type { DataRows } from "@/modules/09_leave/interface/response/leave";
// importStroe
import { useLeavelistDataStore } from "@/modules/09_leave/stores/LeaveStore";
// importComponets
import TableList from "@/modules/09_leave/components/2_Leave/TableList.vue";
import ToolBar from "@/modules/09_leave/components/2_Leave/ToolBar.vue";
const leaveStore = useLeavelistDataStore();
const { fetchList, clearFilter } = leaveStore;
@ -13,7 +15,7 @@ onMounted(() => {
});
// เรียกข้อมูลจาก API
function fecthLeaveList() {
const data = [
const data: DataRows = [
{
leaveType: "ลาป่วย",
name: "นายกัณฐิมา กาฬสินธ์ุ",
@ -96,11 +98,13 @@ function changTab() {
<q-tab-panels v-model="leaveStore.tab" animated>
<q-tab-panel name="1">
<!-- <TableList1 /> -->
<ToolBar />
<TableList />
</q-tab-panel>
<q-tab-panel name="2">
<!-- <TabList2Vue /> -->
<ToolBar />
<TableList />
</q-tab-panel>
</q-tab-panels>

8
src/modules/09_leave/views/WorkingMain.vue
View file

@ -5,6 +5,9 @@ import { useCounterMixin } from "@/stores/mixin";
import { useWorklistDataStore } from "@/modules/09_leave/stores/WorkStore";
//import Components
import TableList from "@/modules/09_leave/components/1_Work/TableList.vue";
import ToolBar from "@/modules/09_leave/components/1_Work/ToolBar.vue";
// import Type
import type { TableRows } from "@/modules/09_leave/interface/response/work";
// use Store
const mixin = useCounterMixin();
const workStore = useWorklistDataStore();
@ -16,7 +19,7 @@ onMounted(() => {
});
//เรียกข้อมูลรายการลงเวลาปฏิบัติงาน
function fecthWorkList() {
const listData = [
const listData: TableRows[] = [
{
fullName: "นายกัณฐิมา กาฬสินธ์ุ",
timeIn: "8:04",
@ -75,8 +78,7 @@ function fecthWorkList() {
</div>
<div>
<q-card flat bordered class="col-12 q-mt-sm">
<div class="q-pa-md">
<TableList /></div
<div class="q-pa-md"><ToolBar /> <TableList /></div
></q-card>
</div>
</template>

90
src/modules/11_discipline/components/1_Complaint/MainPage.vue
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>

206
src/modules/11_discipline/components/2_InvestigateFacts/MainPage.vue
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>

4
src/modules/11_discipline/components/3_InvestigateDisciplinary/MainPage.vue
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>

6
src/modules/11_discipline/components/3_InvestigateDisciplinary/Table.vue
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"

84
src/modules/11_discipline/components/4_Order/MainPage.vue
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>

210
src/modules/11_discipline/components/6_BasicInformation/Channel/MainPage.vue
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>

4
src/modules/11_discipline/components/6_BasicInformation/Director/MainPage.vue
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>