Merge branch 'develop' into dev-tee

This commit is contained in:
setthawutttty 2023-09-07 12:06:03 +07:00
commit 223730cb8f
31 changed files with 809 additions and 477 deletions

View file

@ -611,9 +611,9 @@
class="full-width"
text-color="dark"
:max-size="10000000"
accept=".jpg,.png,.pdf,.csv,.doc"
accept=".jpg,.png,.pdf,.csv,.doc,.docx"
bordered
label="[ไฟล์ jpg,png,pdf,csv,doc ขนาดไม่เกิน 10MB]"
label="[ไฟล์ jpg,png,pdf,csv,doc,docx ขนาดไม่เกิน 10MB]"
multiple
@added="fileUploadImg"
@removed="fileRemoveImg"
@ -648,7 +648,9 @@
/>
<div class="col">
<div class="q-uploader__title">
{{ "[ไฟล์ jpg,png,pdf,csv,doc ขนาดไม่เกิน 10MB]" }}
{{
"[ไฟล์ jpg,png,pdf,csv,doc,docx ขนาดไม่เกิน 10MB]"
}}
</div>
<div class="q-uploader__subtitle">
{{ scope.uploadSizeLabel }}
@ -746,9 +748,9 @@
class="full-width"
text-color="dark"
:max-size="10000000"
accept=".jpg,.png,.pdf,.csv,.doc"
accept=".jpg,.png,.pdf,.csv,.doc,.docx"
bordered
label="[ไฟล์ jpg,png,pdf,csv,doc ขนาดไม่เกิน 10MB]"
label="[ไฟล์ jpg,png,pdf,csv,doc,docx ขนาดไม่เกิน 10MB]"
multiple
@added="fileUploadDoc"
@removed="fileRemoveDoc"
@ -783,7 +785,9 @@
/>
<div class="col">
<div class="q-uploader__title">
{{ "[ไฟล์ jpg,png,pdf,csv,doc ขนาดไม่เกิน 10MB]" }}
{{
"[ไฟล์ jpg,png,pdf,csv,doc,docx ขนาดไม่เกิน 10MB]"
}}
</div>
<div class="q-uploader__subtitle">
{{ scope.uploadSizeLabel }}

View file

@ -42,8 +42,8 @@
icon="mdi-file-document-outline"
@click="openFile(props.row.file)"
>
<q-tooltip>ไฟลเอกสารหลกฐาน</q-tooltip>
</q-btn>
<q-tooltip>ไฟลเอกสารหลกฐาน</q-tooltip>
</q-btn>
<q-btn
color="info"
flat
@ -53,9 +53,8 @@
icon="mdi-history"
@click="clickHistory(props.row)"
>
<q-tooltip>ประวการเปลยนช-นามสก
</q-tooltip>
</q-btn>
<q-tooltip>ประวการเปลยนช-นามสก </q-tooltip>
</q-btn>
</q-td>
</q-tr>
</template>
@ -172,9 +171,9 @@
class="full-width"
text-color="white"
:max-size="10000000"
accept=".jpg,.png,.pdf,.csv,.doc"
accept=".jpg,.png,.pdf,.csv,.doc,.docx"
bordered
label="[ไฟล์ jpg,png,pdf,csv,doc ขนาดไม่เกิน 10MB]"
label="[ไฟล์ jpg,png,pdf,csv,doc,docx ขนาดไม่เกิน 10MB]"
@added="fileAdd"
>
<template v-slot:header="scope">
@ -205,7 +204,7 @@
/>
<div class="col">
<div class="q-uploader__title">
{{ "[ไฟล์ jpg,png,pdf,csv,doc ขนาดไม่เกิน 10MB]" }}
{{ "[ไฟล์ jpg,png,pdf,csv,doc,docx ขนาดไม่เกิน 10MB]" }}
</div>
<div class="q-uploader__subtitle">
{{ scope.uploadSizeLabel }} /

View file

@ -23,7 +23,7 @@
@click="selectData(props)"
class="cursor-pointer"
>
<div
<!-- <div
v-if="
col.name == 'receiveDate' ||
col.name == 'dateAnnounce' ||
@ -32,8 +32,8 @@
class="table_ellipsis"
>
{{ col.value == null ? null : date2Thai(col.value) }}
</div>
<div v-else-if="col.name == 'year'" class="table_ellipsis">
</div> -->
<div v-if="col.name == 'year'" class="table_ellipsis">
{{ col.value + 543 }}
</div>
<div v-else class="table_ellipsis">
@ -532,7 +532,7 @@ const checkValidate = ref<boolean>(false); //validate data ผ่านหรื
const profileId = ref<string>(
route.params.id ? route.params.id.toString() : ""
);
const rows = ref<RequestItemsObject[]>([]);
const rows = ref<any>([]);
const filter = ref<string>(""); //search data table
const visibleColumns = ref<String[]>([]);
profileData.insignia.columns.length == 0
@ -550,6 +550,7 @@ profileData.insignia.columns.length == 0
"dateAnnounce",
"refCommandNo",
"refCommandDate",
"createdAt"
])
: (visibleColumns.value = profileData.insignia.columns);
const columns = ref<QTableProps["columns"]>([
@ -961,13 +962,13 @@ const fetchData = async () => {
volume: e.volume,
section: e.section,
page: e.page,
receiveDate: new Date(e.receiveDate),
dateAnnounce: new Date(e.dateAnnounce),
receiveDate: date2Thai(e.receiveDate),
dateAnnounce: date2Thai(e.dateAnnounce),
refCommandNo: e.refCommandNo,
refCommandDate:
e.refCommandDate == null ? null : new Date(e.refCommandDate),
e.refCommandDate == null ? null : date2Thai(e.refCommandDate),
createdFullName: e.createdFullName,
createdAt: new Date(e.createdAt),
createdAt: date2Thai(e.createdAt),
});
});
})

View file

@ -44,6 +44,7 @@ const educationOld = ref<string>("");
const reason = ref<string>("");
const date = ref<Date | null>(null);
const status = ref<string>("");
const avatar = ref<string>("");
onMounted(async () => {
await fecthappointmentByid();
});
@ -73,6 +74,7 @@ const fecthappointmentByid = async () => {
// organization.value = data.organization; //
reason.value = data.reason;
date.value = data.positionDate;
avatar.value = data.avatar ?? "";
})
.catch((e) => {
messageError($q, e);
@ -167,11 +169,8 @@ const getClass = (val: boolean) => {
<div class="row col-12 q-pa-md">
<div class="col-12 row bg-white q-col-gutter-md">
<div class="col-xs-3 col-sm-2 col-md-1 row">
<!-- <q-img
:src="responseData.avataPath"
v-if="responseData.avataPath !== ''"
/> -->
<q-img src="@/assets/avatar_user.jpg" />
<q-img :src="avatar" v-if="avatar !== ''" />
<q-img src="@/assets/avatar_user.jpg" v-else />
</div>
<div class="col-xs-6 col-sm-3 row items-center">
<div class="col-12 q-pl-md">

View file

@ -61,6 +61,7 @@ const organization = ref<string>("");
const date = ref<Date | null>(null);
const reason = ref<string>("");
const Otherdata = ref<any>([]);
const avatar = ref<string>("");
onMounted(async () => {
if (keycloak.tokenParsed != null) {
@ -79,7 +80,7 @@ const fecthOther = async () => {
const data = res.data.result;
Otherdata.value = res.data.result;
// console.log(data);
avatar.value = data.avatar ?? "";
title.value.fullname = `${data.firstname ?? "-"} ${data.lastname ?? "-"}`;
title.value.organizationPositionOld = data.organizationPositionOld ?? "-";
title.value.positionLevelOld = data.positionLevelOld ?? "-";
@ -197,11 +198,8 @@ const getClass = (val: boolean) => {
<div class="row col-12 q-pa-md">
<div class="col-12 row bg-white q-col-gutter-md">
<div class="col-xs-3 col-sm-2 col-md-1 row">
<!-- <q-img
:src="responseData.avataPath"
v-if="responseData.avataPath !== ''"
/> -->
<q-img src="@/assets/avatar_user.jpg" />
<q-img :src="avatar" v-if="avatar !== ''" />
<q-img src="@/assets/avatar_user.jpg" v-else />
</div>
<div class="col-xs-6 col-sm-3 row items-center">
<div class="col-12 q-pl-md">

View file

@ -1,5 +1,5 @@
<script setup lang="ts">
import { ref, onMounted, watch, reactive, computed, watchEffect } from "vue";
import { ref, onMounted, watch, reactive, computed } from "vue";
import { useQuasar, QForm } from "quasar";
import type { QTableProps } from "quasar";
import { useCounterMixin } from "@/stores/mixin";
@ -216,7 +216,7 @@ const getTable = async () => {
await http
.get(config.API.personalList(examIdString))
.then(async (res: any) => {
// console.log(res);
console.log(res);
dataRes.value = res.data.result;
rowsAll.value = [];
(rowsFilter.value = []),
@ -226,7 +226,8 @@ const getTable = async () => {
idCard: data.idCard,
fullName: data.fullName + " " + data.idCard,
name: data.fullName,
profilePhoto: data.profilePhoto,
profilePhoto: data.profilePhoto ?? "",
avatar: data.avatar ?? "",
organizationName:
data.organizationName +
" " +
@ -505,11 +506,14 @@ onMounted(async () => {
}
await getTable();
});
watchEffect(() => {
if (getTable()) {
props.statCard();
}
});
// watch(rowsAll, () => {
// props.statCard();
// });
// watchEffect(() => {
// if (getTable()) {
// props.statCard();
// }
// });
const containStatus = ref<boolean>(false);
watch(containStatus, () => {
@ -531,24 +535,27 @@ const savelist = () => {
});
if (personal_selected.value) {
// console.log(personal_selected.value);
dialogConfirm($q, async () => {
showLoader();
await http
.put(config.API.putPosition(examId), personal_selected.value)
.then(() => {
success($q, "บันทึกสำเร็จ");
})
.catch((e: any) => {
console.log(e);
})
.finally(async () => {
await getTable();
dialogConfirm(
$q,
async () => {
showLoader();
await http
.put(config.API.putPosition(examId), personal_selected.value)
.then(() => {
success($q, "บันทึกสำเร็จ");
})
.catch((e: any) => {
console.log(e);
})
.finally(async () => {
await getTable();
hideLoader();
});
},
hideLoader();
});
},
"ยืนยันการส่งรายชื่อไปยังหน่วยงาน",
"ต้องการยืนยันการส่งรายชื่อไปยังหน่วยงานหรือไม่?")
"ต้องการยืนยันการส่งรายชื่อไปยังหน่วยงานหรือไม่?"
);
}
};
const handleModalAddListUpdate = (val: boolean) => {
@ -573,22 +580,47 @@ const paginationLabel = (start: number, end: number, total: number) => {
</script>
<template>
<q-form ref="myForm">
<Table :contain-status="containStatus" :rows="rows" :columns="columns" :filter="filter"
:visible-columns="visibleColumns" v-model:inputfilter="filter" v-model:inputvisible="visibleColumns"
v-model:editvisible="editvisible" v-model:containfilter="containStatus"
@update-modaladdlist="handleModalAddListUpdate" :history="true" :boss="true" :saveNoDraft="true"
:role-admin="roleAdmin" :displayAdd="displayAdd" row-key="fullname">
<Table
:contain-status="containStatus"
:rows="rows"
:columns="columns"
:filter="filter"
:visible-columns="visibleColumns"
v-model:inputfilter="filter"
v-model:inputvisible="visibleColumns"
v-model:editvisible="editvisible"
v-model:containfilter="containStatus"
@update-modaladdlist="handleModalAddListUpdate"
:history="true"
:boss="true"
:saveNoDraft="true"
:role-admin="roleAdmin"
:displayAdd="displayAdd"
row-key="fullname"
>
<template #columns="props">
<q-tr :props="props">
<q-td v-for="col in props.cols" :key="col.name" :props="props" @click="selectData(props.row.personalId)"
class="cursor-pointer">
<q-td
v-for="col in props.cols"
:key="col.name"
:props="props"
@click="selectData(props.row.personalId)"
class="cursor-pointer"
>
<template v-if="col.name === 'position'">
{{ props.rowIndex + 1 }}
</template>
<template v-else-if="col.name === 'fullName'" class="table_ellipsis">
<template
v-else-if="col.name === 'fullName'"
class="table_ellipsis"
>
<q-item v-ripple>
<q-item-section avatar>
<img v-if="props.row.avatar == null" src="@/assets/avatar_user.jpg" class="col-4 img-info" />
<img
v-if="props.row.avatar == ''"
src="@/assets/avatar_user.jpg"
class="col-4 img-info"
/>
<img v-else :src="props.row.avatar" class="col-4 img-info" />
</q-item-section>
@ -605,27 +637,30 @@ const paginationLabel = (start: number, end: number, total: number) => {
</template>
<template v-else-if="col.name === 'organizationName'">
<div v-if="props.row.orgName !== null || props.row.positionPath !== null
">
<div
v-if="
props.row.orgName !== null || props.row.positionPath !== null
"
>
<div class="col-4">
<div class="text-weight-medium">
{{ props.row.orgName !== null ? props.row.orgName : "-" }}
{{
props.row.organizationShortName !== null
? `(${props.row.organizationShortName})`
: ""
? `(${props.row.organizationShortName})`
: ""
}}
</div>
<div class="text-weight-light">
{{
props.row.positionPath !== null
? props.row.positionPath
: "-"
? props.row.positionPath
: "-"
}}
{{
props.row.positionNumber !== null
? `(${props.row.positionNumber})`
: ""
? `(${props.row.positionNumber})`
: ""
}}
</div>
</div>
@ -637,14 +672,19 @@ const paginationLabel = (start: number, end: number, total: number) => {
</div>
</template>
<template v-else-if="col.name === 'positionCandidate'">
<div class="text-weight-medium" v-if="props.row.positionCandidate == null">
<div
class="text-weight-medium"
v-if="props.row.positionCandidate == null"
>
-
</div>
<div class="text-weight-medium" v-else>
{{ props.row.positionCandidate }}
</div>
</template>
<template v-else-if="col.name === 'reportingDate' && col.value !== '-'">
<template
v-else-if="col.name === 'reportingDate' && col.value !== '-'"
>
<div class="text-weight-medium">
{{ props.row.reportingDate }}
</div>
@ -666,48 +706,121 @@ const paginationLabel = (start: number, end: number, total: number) => {
</template>
</q-td>
<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-list dense style="min-width: 100px">
<q-item v-if="(roleAdmin && props.row.statusId === 'UN-CONTAIN') ||
(props.row.draft === 'รอส่งตัว' &&
props.row.statusId !== 'DISCLAIM')
" 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
v-if="
(roleAdmin && props.row.statusId === 'UN-CONTAIN') ||
(props.row.draft === 'รอส่งตัว' &&
props.row.statusId !== 'DISCLAIM')
"
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
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
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')">
<q-item-section style="min-width: 0px" avatar class="q-py-sm">
<q-icon color="pink" size="xs" name="mdi-account-cancel-outline" />
<q-item
v-if="
props.row.statusId === 'UN-CONTAIN' ||
props.row.statusId === 'PREPARE-CONTAIN'
"
clickable
v-close-popup
@click="editDetail(props.row, 'disclaim')"
>
<q-item-section
style="min-width: 0px"
avatar
class="q-py-sm"
>
<q-icon
color="pink"
size="xs"
name="mdi-account-cancel-outline"
/>
</q-item-section>
<q-item-section>สละสทธ</q-item-section>
</q-item>
<q-item v-else-if="props.row.statusId === 'DISCLAIM'" clickable v-close-popup
@click="editDetail(props.row, 'disclaimInfo')">
<q-item-section style="min-width: 0px" avatar class="q-py-sm">
<q-icon color="pink" size="xs" name="mdi-account-cancel-outline" />
<q-item
v-else-if="props.row.statusId === 'DISCLAIM'"
clickable
v-close-popup
@click="editDetail(props.row, 'disclaimInfo')"
>
<q-item-section
style="min-width: 0px"
avatar
class="q-py-sm"
>
<q-icon
color="pink"
size="xs"
name="mdi-account-cancel-outline"
/>
</q-item-section>
<q-item-section>อมลการสละสทธ</q-item-section>
</q-item>
@ -721,26 +834,58 @@ const paginationLabel = (start: number, end: number, total: number) => {
</q-form>
<!-- เลอกหนวยงานทบรรจ -->
<DialogOrgTree v-model:modal="appointModal" :personalId="personalId" :close="clickCloseModalTree"
:personal="personal" />
<DialogOrgTree
v-model:modal="appointModal"
:personalId="personalId"
:close="clickCloseModalTree"
:personal="personal"
/>
<!-- popup ขอผอนผ / สละสทธ -->
<q-form ref="myForm">
<DialogCard v-model:Modal="modal" :personal-id="personalId" :close="clickClose" :validate="validateData" />
<DialogCard
v-model:Modal="modal"
:personal-id="personalId"
:close="clickClose"
:validate="validateData"
/>
</q-form>
<q-dialog v-model="modalDefermentDisclaim" persistent>
<q-card style="width: 800px">
<q-form ref="myForm">
<DialogHeader :title="`${modalDisclaim ? 'สละสิทธิ์' : 'ขอผ่อนผัน'} ${Name}`" :close="clickClose" />
<DialogHeader
:title="`${modalDisclaim ? 'สละสิทธิ์' : 'ขอผ่อนผัน'} ${Name}`"
:close="clickClose"
/>
<q-separator />
<q-card-section class="q-p-sm">
<div class="col-xs-12 col-sm-12 col-md-12">
<q-input :class="getClass(edit)" hide-bottom-space :outlined="edit" dense lazy-rules
:rules="[(val) => !!val || 'กรุณากรอกเหตุผล']" :readonly="!edit" :borderless="!edit" v-model="userNote"
:label="`${'กรอกเหตุผล'}`" @update:model-value="clickEditRow" type="textarea" />
<q-file v-if="getNumFile === 1" v-model="files" dense :label="`${'เลือกไฟล์เอกสารหลักฐาน'}`" outlined
use-chips :rules="[(val) => !!val || 'กรุณาเลือกไฟล์เอกสารหลักฐาน']" multiple
@update:model-value="clickEditRow" class="q-py-sm">
<q-input
:class="getClass(edit)"
hide-bottom-space
:outlined="edit"
dense
lazy-rules
:rules="[(val) => !!val || 'กรุณากรอกเหตุผล']"
:readonly="!edit"
:borderless="!edit"
v-model="userNote"
:label="`${'กรอกเหตุผล'}`"
@update:model-value="clickEditRow"
type="textarea"
/>
<q-file
v-if="getNumFile === 1"
v-model="files"
dense
:label="`${'เลือกไฟล์เอกสารหลักฐาน'}`"
outlined
use-chips
:rules="[(val) => !!val || 'กรุณาเลือกไฟล์เอกสารหลักฐาน']"
multiple
@update:model-value="clickEditRow"
class="q-py-sm"
>
<template v-slot:prepend>
<q-icon name="attach_file" color="primary" />
</template>
@ -748,7 +893,11 @@ const paginationLabel = (start: number, end: number, total: number) => {
</div>
</q-card-section>
<q-separator />
<DialogFooter :editvisible="true" :validate="validateData" :save="modalDisclaim ? saveDisclaim : saveDeferment" />
<DialogFooter
:editvisible="true"
:validate="validateData"
:save="modalDisclaim ? saveDisclaim : saveDeferment"
/>
</q-form>
</q-card>
</q-dialog>
@ -757,7 +906,10 @@ const paginationLabel = (start: number, end: number, total: number) => {
<q-dialog v-model="modalwaitInfo" persistent>
<q-card style="width: 500px; max-width: 500px">
<q-form ref="myForm">
<DialogHeader :title="`${modalDisclaim ? 'สละสิทธิ์' : 'ขอผ่อนผัน'} ${Name}`" :close="clickClose" />
<DialogHeader
:title="`${modalDisclaim ? 'สละสิทธิ์' : 'ขอผ่อนผัน'} ${Name}`"
:close="clickClose"
/>
<q-separator />
<q-card-section class="q-p-sm">
<div class="row">
@ -767,8 +919,17 @@ const paginationLabel = (start: number, end: number, total: number) => {
<div v-if="!modalDisclaim" class="row q-pt-md">
<div class="col-3 text-grey-7 q-mt-sm">เอกสารหลกฐาน</div>
<div class="col-2 q-mt-sm">
<q-btn type="a" :href="dataInfo.reliefDoc" color="primary" flat dense round size="14px" icon="mdi-download"
target="_blank" />
<q-btn
type="a"
:href="dataInfo.reliefDoc"
color="primary"
flat
dense
round
size="14px"
icon="mdi-download"
target="_blank"
/>
</div>
</div>
</q-card-section>
@ -780,30 +941,68 @@ const paginationLabel = (start: number, end: number, total: number) => {
<!-- dialog เพมรายช -->
<q-dialog v-model="modaladdlist">
<q-card style="width: 900px; max-width: 80vw">
<DialogHeader title="ส่งรายชื่อไปยังหน่วยงาน" :close="clickCloseSendModal" />
<DialogHeader
title="ส่งรายชื่อไปยังหน่วยงาน"
:close="clickCloseSendModal"
/>
<q-separator />
<q-card-section class="q-pt-none">
<div class="row justify-end">
<div class="col-5">
<q-toolbar style="padding: 0">
<q-input borderless outlined dense debounce="300" v-model="filterlistAdd" placeholder="ค้นหา"
style="width: 850px; max-width: auto">
<q-input
borderless
outlined
dense
debounce="300"
v-model="filterlistAdd"
placeholder="ค้นหา"
style="width: 850px; max-width: auto"
>
<template v-slot:append>
<q-icon name="search" />
</template>
</q-input>
<q-select v-model="visibleColumnslist" 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="gt-xs q-ml-sm" />
<q-select
v-model="visibleColumnslist"
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="gt-xs q-ml-sm"
/>
</q-toolbar>
</div>
</div>
<q-table flat bordered dense :rows="rowsFilter" :columns="columns" :filter="filterlistAdd" row-key="name"
class="custom-header-table" selection="multiple" v-model:selected="selected" :pagination-label="paginationLabel"
:visible-columns="visibleColumnslist">
<q-table
flat
bordered
dense
:rows="rowsFilter"
:columns="columns"
:filter="filterlistAdd"
row-key="name"
class="custom-header-table"
selection="multiple"
v-model:selected="selected"
:pagination-label="paginationLabel"
:visible-columns="visibleColumnslist"
>
<template v-slot:header-selection="scope">
<q-checkbox keep-color color="primary" dense v-model="scope.selected" />
<q-checkbox
keep-color
color="primary"
dense
v-model="scope.selected"
/>
</template>
<!-- <template v-slot:body-selection="scope">
<q-checkbox
@ -816,16 +1015,37 @@ const paginationLabel = (start: number, end: number, total: number) => {
<template v-slot:body="props">
<q-tr :props="props">
<q-td>
<q-checkbox keep-color color="primary" dense v-model="props.selected" />
<q-checkbox
keep-color
color="primary"
dense
v-model="props.selected"
/>
</q-td>
<q-td v-for="col in props.cols" :key="col.name" :props="props" class="cursor-pointer">
<q-td
v-for="col in props.cols"
:key="col.name"
:props="props"
class="cursor-pointer"
>
<template v-if="col.name === 'position'">
{{ props.rowIndex + 1 }}
</template>
<template v-else-if="col.name === 'fullName'" class="table_ellipsis">
<template
v-else-if="col.name === 'fullName'"
class="table_ellipsis"
>
<div class="row col-12 text-no-wrap items-center">
<img v-if="props.row.avatar == null" src="@/assets/avatar_user.jpg" class="col-4 img-info" />
<img v-else :src="props.row.avatar" class="col-4 img-info" />
<img
v-if="props.row.avatar == null"
src="@/assets/avatar_user.jpg"
class="col-4 img-info"
/>
<img
v-else
:src="props.row.avatar"
class="col-4 img-info"
/>
<div class="col-4">
<div class="text-weight-medium">{{ props.row.name }}</div>
<div class="text-weight-light">
@ -843,9 +1063,12 @@ const paginationLabel = (start: number, end: number, total: number) => {
</template>
<template v-else-if="col.name === 'organizationName'">
<div v-if="props.row.orgName !== null ||
props.row.positionPath !== null
">
<div
v-if="
props.row.orgName !== null ||
props.row.positionPath !== null
"
>
<div class="col-4">
<div class="text-weight-medium">
{{
@ -853,20 +1076,20 @@ const paginationLabel = (start: number, end: number, total: number) => {
}}
{{
props.row.organizationShortName !== null
? `(${props.row.organizationShortName})`
: ""
? `(${props.row.organizationShortName})`
: ""
}}
</div>
<div class="text-weight-light">
{{
props.row.positionPath !== null
? props.row.positionPath
: "-"
? props.row.positionPath
: "-"
}}
{{
props.row.positionNumber !== null
? `(${props.row.positionNumber})`
: ""
? `(${props.row.positionNumber})`
: ""
}}
</div>
</div>
@ -878,14 +1101,19 @@ const paginationLabel = (start: number, end: number, total: number) => {
</div>
</template>
<template v-else-if="col.name === 'positionCandidate'">
<div class="text-weight-medium" v-if="props.row.positionCandidate == null">
<div
class="text-weight-medium"
v-if="props.row.positionCandidate == null"
>
-
</div>
<div class="text-weight-medium" v-else>
{{ props.row.positionCandidate }}
</div>
</template>
<template v-else-if="col.name === 'reportingDate' && col.value !== '-'">
<template
v-else-if="col.name === 'reportingDate' && col.value !== '-'"
>
<div class="text-weight-medium">
{{ props.row.reportingDate }}
</div>
@ -911,14 +1139,26 @@ const paginationLabel = (start: number, end: number, total: number) => {
</q-tr>
</template>
<template v-slot:pagination="scope">
<q-pagination v-model="pagination.page" color="primary" :max="scope.pagesNumber" :max-pages="5" size="sm"
boundary-links direction-links></q-pagination>
<q-pagination
v-model="pagination.page"
color="primary"
:max="scope.pagesNumber"
:max-pages="5"
size="sm"
boundary-links
direction-links
></q-pagination>
</template>
</q-table>
</q-card-section>
<q-card-actions align="right" class="bg-white text-teal">
<q-btn label="ส่งรายชื่อ" @click="savelist" :disable="checkSelected" color="public" />
<q-btn
label="ส่งรายชื่อ"
@click="savelist"
:disable="checkSelected"
color="public"
/>
</q-card-actions>
</q-card>
</q-dialog>

View file

@ -86,6 +86,7 @@ const positionTypeOld = ref<string>("");
const positionLevelOld = ref<string>("");
const posNo = ref<string>("");
const salary = ref<number>(0);
const avatar = ref<string>("");
// const organization = ref<string>("");
// const date = ref<Date | null>(null);
const reason = ref<string>("");
@ -199,7 +200,7 @@ const getData = async () => {
.get(config.API.receiveDataId(paramsId.toString()))
.then(async (res: any) => {
const data = res.data.result;
// console.log(data);
console.log(data);
let list: any[] = [];
if (data.docs.length > 0) {
data.docs.map((doc: any) => {
@ -211,6 +212,7 @@ const getData = async () => {
}
rows.value = list;
profileId.value = data.profileId;
avatar.value = data.avatar ?? "";
title.value.fullname = `${data.firstname ?? "-"} ${data.lastname ?? "-"}`;
title.value.organizationPositionOld = data.organizationPositionOld ?? "-";
title.value.positionLevelOld = data.positionLevelOld ?? "-";
@ -508,11 +510,8 @@ const getClass = (val: boolean) => {
<div class="row col-12 q-pa-md">
<div class="col-12 row bg-white q-col-gutter-md">
<div class="col-xs-3 col-sm-2 col-md-1 row">
<!-- <q-img
:src="responseData.avataPath"
v-if="responseData.avataPath !== ''"
/> -->
<q-img src="@/assets/avatar_user.jpg" />
<q-img :src="avatar" v-if="avatar !== ''" />
<q-img v-else src="@/assets/avatar_user.jpg" />
</div>
<div class="col-xs-6 col-sm-3 row items-center">
<div class="col-12 q-pl-md">
@ -1052,36 +1051,45 @@ const getClass = (val: boolean) => {
</div>
</q-form>
<q-card bordered class="row col-12 text-dark q-mt-sm">
<div class="bg-grey-1 q-pa-sm col-12 row items-center text-primary">
<div class="q-pl-sm text-weight-bold text-dark">เอกสารเพมเต</div>
</div>
<div class="col-12"><q-separator /></div>
<div class="col-12">
<d-table
:rows="rows"
:columns="columns"
row-key="fileName"
hide-header
hide-bottom
>
<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="fileName" :props="props">
{{ props.row.fileName }}
</q-td>
<q-td key="btnMicrosoft" :props="props">
<q-btn type="a" target="_blank" :href="props.row.pathName" flat dense round color="red" icon="picture_as_pdf">
<q-tooltip>ไฟล PDF</q-tooltip>
</q-btn>
</q-td>
</q-tr>
</template>
</d-table>
</div>
</q-card>
<div class="bg-grey-1 q-pa-sm col-12 row items-center text-primary">
<div class="q-pl-sm text-weight-bold text-dark">เอกสารเพมเต</div>
</div>
<div class="col-12"><q-separator /></div>
<div class="col-12">
<d-table
:rows="rows"
:columns="columns"
row-key="fileName"
hide-header
hide-bottom
>
<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="fileName" :props="props">
{{ props.row.fileName }}
</q-td>
<q-td key="btnMicrosoft" :props="props">
<q-btn
type="a"
target="_blank"
:href="props.row.pathName"
flat
dense
round
color="red"
icon="picture_as_pdf"
>
<q-tooltip>ไฟล PDF</q-tooltip>
</q-btn>
</q-td>
</q-tr>
</template>
</d-table>
</div>
</q-card>
</q-card>
</template>

View file

@ -50,6 +50,7 @@ const positionLevelOld = ref<string>("");
const positionNumberOld = ref<string>("");
const organizationPositionOld = ref<string>("");
const isActive = ref<string>("");
const avatar = ref<string>("");
const getData = async () => {
showLoader();
@ -63,6 +64,7 @@ const getData = async () => {
prefix.value = data.prefix;
firstName.value = data.firstName;
lastName.value = data.lastName;
avatar.value = data.avatar ?? "";
position.value = data.position;
posNo.value = data.posNo;
positionLevel.value = data.positionLevel;
@ -177,7 +179,8 @@ onMounted(async () => {
<div class="row col-12 q-pa-md">
<div class="col-12 row bg-white q-col-gutter-md">
<div class="col-xs-3 col-sm-2 col-md-1 row">
<q-img src="@/assets/avatar_user.jpg" />
<q-img :src="avatar" v-if="avatar !== ''" />
<q-img v-else src="@/assets/avatar_user.jpg" />
</div>
<div class="col-xs-6 col-sm-3 row items-center">
<div class="col-12 q-pl-md">

View file

@ -55,6 +55,7 @@ const positionLevelOld = ref<string>("");
const positionNumberOld = ref<string>("");
const organizationPositionOld = ref<string>("");
const isActive = ref<string>("");
const avatar = ref<string>("");
const getData = async () => {
showLoader();
@ -67,6 +68,7 @@ const getData = async () => {
(id.value = data.id);
profileId.value = data.profileId;
prefix.value = data.prefix;
avatar.value = data.avatar ?? "";
firstName.value = data.firstName;
lastName.value = data.lastName;
position.value = data.position;
@ -184,7 +186,8 @@ onMounted(async () => {
<div class="row col-12 q-pa-md">
<div class="col-12 row bg-white q-col-gutter-md">
<div class="col-xs-3 col-sm-2 col-md-1 row">
<q-img src="@/assets/avatar_user.jpg" />
<q-img :src="avatar" v-if="avatar !== ''" />
<q-img src="@/assets/avatar_user.jpg" v-else />
</div>
<div class="col-xs-6 col-sm-3 row items-center">
<div class="col-12 q-pl-md">

View file

@ -409,7 +409,7 @@ const getData = async () => {
responseData.value.reason = data.reason ?? "";
responseData.value.salary = data.salary !== null ? data.salary : 0;
responseData.value.status = data.status ?? "";
responseData.value.avataPath = data.avataPath ?? "";
responseData.value.avataPath = data.avatar ?? "";
responseData.value.fullname = `${data.firstName ?? "-"} ${
data.lastName ?? "-"
}`;

View file

@ -415,7 +415,7 @@ const getData = async () => {
responseData.value.reason = data.reason ?? "";
responseData.value.salary = data.salary !== null ? data.salary : 0;
responseData.value.status = data.status ?? "";
responseData.value.avataPath = data.avataPath ?? "";
responseData.value.avataPath = data.avatar ?? "";
responseData.value.fullname = `${data.firstName ?? "-"} ${
data.lastName ?? "-"
}`;

View file

@ -42,14 +42,14 @@
</div>
</div>
</div>
<!-- <div class="col-xs-6 col-sm-3 row items-center">
<div class="col-xs-6 col-sm-3 row items-center">
<div class="col-12">
<div class="col-12 text-top">งก</div>
<div class="col-12 text-detail">
{{ Org }}
</div>
</div>
</div> -->
</div>
</div>
</div>
</q-card>
@ -526,6 +526,7 @@ const getData = async () => {
Position.value = data.position ?? "";
PositionLevel.value = data.positionLevel ?? "";
Org.value = data.org ?? "";
fullname.value = data.fullname ?? "";
prefix.value = data.prefix ?? "";
reasonWork.value = data.reasonWork ?? [];

View file

@ -33,7 +33,8 @@
<div class="row col-12 q-pa-md">
<div class="col-12 row bg-white q-col-gutter-md">
<div class="col-xs-3 col-sm-2 col-md-1 row">
<q-img src="@/assets/avatar_user.jpg" />
<q-img :src="detail.avatar" v-if="detail.avatar !== null" />
<q-img src="@/assets/avatar_user.jpg" v-else />
</div>
<div class="col-xs-6 col-sm-3 row items-center">
<div class="col-12 q-pl-md">
@ -189,9 +190,9 @@ const redirectToRegistry = (id: string) => {
console.log(id);
router.push(`/registry/${id}`);
};
const openDeceased = (id:string) => {
const openDeceased = (id: string) => {
router.push(`/deceased/detail/${id}`);
}
};
const nextPage = (page: string) => {
window.open(page, "_blank");
};

View file

@ -335,6 +335,7 @@ const clickBack = () => {
label="อัปโหลดเอกสารประกอบ"
hide-bottom-space
lazy-rules
accept=".pdf,.xlsx,.doc"
>
<!-- :rules="[
(val) => val || 'กรุณาเลือกไฟล์หนังสือถึงหน่วยงานที่รับโอน',

View file

@ -101,20 +101,20 @@ const fetchData = async () => {
.get(config.API.listRoundInsignia())
.then((res) => {
const data = res.data.result;
rows.value = data.map((e: FormProprsalsRound2) =>({
period_id: e.period_id,
period_name: e.period_name,
period_year: e.period_year + 543,
period_amount: e.period_amount,
period_start: e.period_start == null ? null : date2Thai(new Date(e.period_start)),
period_end: e.period_end == null ? null : date2Thai(new Date(e.period_end)),
period_isActive: e.period_isActive,
period_doc: e.period_doc,
period_status: e.period_status.result
})
);
console.log(rows.value)
rows.value = data.map((e: FormProprsalsRound2) => ({
period_id: e.period_id,
period_name: e.period_name,
period_year: e.period_year + 543,
period_amount: e.period_amount,
period_start:
e.period_start == null ? null : date2Thai(new Date(e.period_start)),
period_end:
e.period_end == null ? null : date2Thai(new Date(e.period_end)),
period_isActive: e.period_isActive,
period_doc: e.period_doc,
period_status: e.period_status.result,
}));
console.log(rows.value);
})
.catch((e) => {
messageError($q, e);
@ -179,6 +179,16 @@ const getRequest = async (id: string) => {
await fetchData();
});
};
// const downloadFile = (response: any, name: string) => {
// const link = document.createElement("a");
// var fileName = name;
// link.href = response;
// link.setAttribute("target", "_blank");
// link.setAttribute("download", fileName);
// document.body.appendChild(link);
// link.click();
// document.body.removeChild(link);
// };
//
const filterKeyword = ref<string>("");
@ -288,10 +298,18 @@ const paginationLabel = (start: string, end: string, total: string) => {
</template>
<template v-slot:body="props">
<q-tr :props="props" class="cursor-pointer">
<q-td key="period_name" :props="props" @click="clickEdit(props.row)">
<q-td
key="period_name"
:props="props"
@click="clickEdit(props.row)"
>
{{ props.row.period_name }}
</q-td>
<q-td key="period_year" :props="props" @click="clickEdit(props.row)">
<q-td
key="period_year"
:props="props"
@click="clickEdit(props.row)"
>
{{ props.row.period_year }}
</q-td>
<q-td
@ -301,10 +319,18 @@ const paginationLabel = (start: string, end: string, total: string) => {
>
{{ props.row.period_start }}
</q-td>
<q-td key="period_end" :props="props" @click="clickEdit(props.row)">
<q-td
key="period_end"
:props="props"
@click="clickEdit(props.row)"
>
{{ props.row.period_end }}
</q-td>
<q-td key="period_isActive" :props="props" @click="clickEdit(props.row)">
<q-td
key="period_isActive"
:props="props"
@click="clickEdit(props.row)"
>
<q-icon
v-if="props.row.period_isActive == true"
name="mdi-close"
@ -343,7 +369,7 @@ const paginationLabel = (start: string, end: string, total: string) => {
flat
round
color="primary"
@click="clickListInsignia(props.row.id)"
@click="clickListInsignia(props.row.period_id)"
icon="mdi-account-check"
>
<q-tooltip>ไดบเครองราชฯ</q-tooltip>
@ -358,9 +384,13 @@ const paginationLabel = (start: string, end: string, total: string) => {
target="_blank"
round
color="light-blue-8"
:href="props.row.period_doc"
icon="mdi-file-download"
:href="props.row.period_doc"
>
<!-- @click="
downloadFile(props.row.period_doc, props.row.period_name)
" -->
<q-tooltip>ดาวนโหลดเอกสารประกอบ </q-tooltip>
</q-btn>
</q-td>

View file

@ -607,7 +607,12 @@ const paginationLabel2 = (start: number, end: number, total: number) => {
:outlined="true"
:hide-dropdown-icon="false"
style="min-width: 150px"
@update:model-value="DataStore.searchFilterTable"
@update:model-value="
DataStore.searchDataTable(
DataStore.typeinsignia,
DataStore.employeeClass
)
"
/>
<div>
<q-select
@ -626,7 +631,10 @@ const paginationLabel2 = (start: number, end: number, total: number) => {
:borderless="false"
style="min-width: 150px"
@update:model-value="
DataStore.selectEmployeeClass(DataStore.employeeClass)
DataStore.searchDataTable(
DataStore.typeinsignia,
DataStore.employeeClass
)
"
/>
</div>

View file

@ -246,7 +246,12 @@ const closeReson = () => {
:outlined="true"
:hide-dropdown-icon="false"
style="min-width: 150px"
@update:model-value="DataStore.searchFilterTable"
@update:model-value="
DataStore.searchDataTable(
DataStore.typeinsignia,
DataStore.employeeClass
)
"
/>
<div>
<q-select
@ -265,7 +270,10 @@ const closeReson = () => {
:borderless="false"
style="min-width: 150px"
@update:model-value="
DataStore.selectEmployeeClass(DataStore.employeeClass)
DataStore.searchDataTable(
DataStore.typeinsignia,
DataStore.employeeClass
)
"
/>
</div>

View file

@ -243,7 +243,12 @@ const closeReson = () => {
:outlined="true"
:hide-dropdown-icon="false"
style="min-width: 150px"
@update:model-value="DataStore.searchFilterTable"
@update:model-value="
DataStore.searchDataTable(
DataStore.typeinsignia,
DataStore.employeeClass
)
"
/>
<div>
<q-select
@ -262,7 +267,10 @@ const closeReson = () => {
:borderless="false"
style="min-width: 150px"
@update:model-value="
DataStore.selectEmployeeClass(DataStore.employeeClass)
DataStore.searchDataTable(
DataStore.typeinsignia,
DataStore.employeeClass
)
"
/>
</div>

View file

@ -24,6 +24,8 @@ const { messageError, dialogConfirm, showLoader, hideLoader, success } = mixin;
const $q = useQuasar(); // noti quasar
const loading = ref<boolean>(false);
const loadview = ref<boolean>(false);
const hideBottom = ref<boolean>(false);
const round = ref<string>("");
const roundName = ref<string>("");
const optionRound = ref<any>([]);
@ -39,7 +41,6 @@ const stat = ref<any>({
onMounted(async () => {
await checkRole();
await fecthlistRound();
await fecthAgency();
});
const checkRole = async () => {
@ -60,16 +61,19 @@ const checkRole = async () => {
const fecthlistRound = async () => {
await http
.get(config.API.listRoundInsignia())
.then((res: any) => {
.then(async (res: any) => {
optionRound.value = res.data.result.map((e: any) => ({
id: e.period_id,
year: e.period_year,
name: e.period_name,
}));
const lastValue = optionRound.value[0];
round.value = lastValue.id.toString();
roundName.value = lastValue.name;
fecthStat(round.value);
if (optionRound.value.length !== 0) {
const lastValue = optionRound.value[0];
round.value = lastValue.id.toString();
roundName.value = lastValue.name;
await fecthStat(round.value);
await fecthAgency();
}
})
.catch((err) => {
console.log(err);
@ -98,11 +102,13 @@ const fecthAgency = async () => {
.get(config.API.insigniaAgency())
.then(async (res) => {
DataStore.agency = res.data.result;
loadview.value = true;
if (roleUser.value == "admin") {
await fecthType();
}
})
.catch((err) => {
console.log(err);
messageError($q, err);
})
.finally(() => {
@ -125,7 +131,7 @@ const fecthType = async () => {
messageError($q, err);
})
.finally(() => {
loading.value = true;
// loading.value = true;
});
};
@ -159,6 +165,16 @@ const fecthInsigniaByOc = async (
requestStatus.value = res.data.result.requestStatus;
await DataStore.fetchData(res.data.result.items);
await DataStore.fetchDataInsignia(res.data.result);
loading.value = true;
if (res.data.result.items !== null) {
if (res.data.result.items.length !== 0) {
hideBottom.value = true;
} else hideBottom.value = false;
}
// if (res.data.result.items.length !== 0) {
// hideBottom.value = true;
// }
// DataStore.isLock = await res.data.result.isLock;
// DataStore.requestId = await res.data.result.requestId;
})
@ -166,7 +182,6 @@ const fecthInsigniaByOc = async (
messageError($q, err);
})
.finally(() => {
loading.value = true;
hideLoader();
});
};
@ -265,6 +280,9 @@ const directorApproved = async () => {
};
const requestSendNote = async () => {
var organization = await (DataStore.agency != null
? DataStore.agency
: DataStore.typeOc);
dialogConfirm($q, async () => {
showLoader();
await http
@ -275,7 +293,7 @@ const requestSendNote = async () => {
success($q, "บันทึกสำเร็จ");
await fecthInsigniaByOc(
round.value,
DataStore.agency,
organization,
"officer",
tab.value
);
@ -294,7 +312,7 @@ const requestSendNote = async () => {
<div class="toptitle text-dark col-12 row items-center">
รายชอขาราชการสามญฯ ทธนขอพระราชทานเครองราชอสรยาภรณ
</div>
<q-card bordered class="row col-12 q-mt-sm">
<q-card bordered class="row col-12 q-mt-sm" v-if="loadview">
<div class="row col-12 items-center bg-grey-1">
<div class="q-pl-md q-pr-sm text-weight-medium text-grey-7">รอบ</div>
<q-select
@ -312,7 +330,7 @@ const requestSendNote = async () => {
<q-space />
<!-- สกจ. Freez อม -->
<q-btn
v-if="roleUser == 'admin' && DataStore.isLock !== true"
v-if="roleUser == 'admin' && DataStore.isLock !== true && hideBottom"
dense
unelevated
label="ล็อกข้อมูล"
@ -351,6 +369,13 @@ const requestSendNote = async () => {
</div>
</div>
</q-card>
<q-card v-else>
<div class="q-pa-md q-gutter-sm">
<q-banner inline-actions rounded class="bg-grey-1 text-center">
ไมอมลรอบการเสนอขอพระราชทานเครองราชอสรยาภรณ
</q-banner>
</div>
</q-card>
<q-card flat bordered class="col-12 q-mt-sm" v-if="loading">
<div

View file

@ -66,7 +66,9 @@ const fecthRound = async () => {
}));
selectRound.value = data[0].id;
roundYear.value = data[0].year;
await fecthInsigniaType();
if (roundYear.value) {
await fecthInsigniaType();
}
}
})
.catch((err) => {

View file

@ -62,7 +62,7 @@ const fecthRound = async () => {
selectRound.value = data[0].id;
yearRound.value = data[0].year;
roundYear.value = data[0].year;
if (roundYear.value !== "") {
if (roundYear.value) {
await fecthInsigniaType();
}
}
@ -288,34 +288,11 @@ watch(tab, async () => {
fecthlistInsignia();
});
const selectorInsignia = async () => {
const dataCopy = await DataStore.listInsignia;
rows.value =
DataStore.insignia != ""
? dataCopy.filter((x: any) => x.requestInsigniaId == DataStore.insignia)
: dataCopy;
};
const selectEmployeeClass = async (employeeClass: string) => {
if (employeeClass == "officer") {
let list = DataStore.listInsignia.filter(
(e: any) => e.employeeType === "ข้าราชการ กทม.สามัญ"
);
rows.value = list;
} else if (employeeClass === "perm") {
let list = DataStore.listInsignia.filter(
(e: any) => e.employeeType === "ลูกจ้างประจำ"
);
rows.value = list;
} else rows.value = DataStore.listInsignia;
};
const yearRound = ref<number>();
const selectorRound = async (round: number) => {
roundYear.value = round;
await fecthlistInsignia();
};
const rows = ref<any[]>([]);
const fecthlistInsignia = async () => {
showLoader();
await http
@ -324,7 +301,6 @@ const fecthlistInsignia = async () => {
)
.then(async (res) => {
await DataStore.fetchlistinsignia(res.data.result);
rows.value = DataStore.rows;
})
.catch((err) => {
messageError($q, err);
@ -441,7 +417,12 @@ const paginationLabel = (start: number, end: number, total: number) => {
:readonly="false"
:borderless="false"
style="min-width: 150px"
@update:model-value="selectorInsignia"
@update:model-value="
DataStore.searchDatatable(
DataStore.insignia,
DataStore.employeeClass
)
"
/>
</div>
<div>
@ -461,7 +442,10 @@ const paginationLabel = (start: number, end: number, total: number) => {
:borderless="false"
style="min-width: 150px"
@update:model-value="
selectEmployeeClass(DataStore.employeeClass)
DataStore.searchDatatable(
DataStore.insignia,
DataStore.employeeClass
)
"
/>
</div>
@ -521,7 +505,7 @@ const paginationLabel = (start: number, end: number, total: number) => {
</div>
</div>
<d-table
:rows="rows"
:rows="DataStore.rows"
:columns="columns"
:visible-columns="visibleColumns"
:filter="filter"

View file

@ -15,7 +15,7 @@ export const useInsigniaDataStore = defineStore("insignia", () => {
const agency = ref<string>("");
let rows = ref<any>([]);
const listinsignia = ref<any>([]);
const typeinsignia = ref<number | string>("all");
const typeinsignia = ref<string>("all");
let typeinsigniaOptions = ref<any>([{ id: "all", name: "ทั้งหมด" }]);
const employeeClass = ref<string>("all");
const employeeClassOps = ref<any>([{ name: "ทั้งหมด", id: "all" }, { name: "ข้าราชการ กทม.สามัญ", id: "officer" }, { name: "ลูกจ้างประจำ", id: "perm" }])
@ -48,6 +48,7 @@ export const useInsigniaDataStore = defineStore("insignia", () => {
}));
rows.value = await datalist
listinsignia.value = await datalist;
searchDataTable(typeinsignia.value, employeeClass.value)
filtertypeInsignia();
} else rows.value = [];
};
@ -77,53 +78,20 @@ export const useInsigniaDataStore = defineStore("insignia", () => {
id: type,
name: type,
};
// typeinsigniaOptions.value = [{ id: "all", name: "ทั้งหมด" }]
typeinsigniaOptions.value.push(listtype);
}
} else typeinsigniaOptions.value = [{ id: "all", name: "ทั้งหมด" }];
};
const searchDataTable = async (type: string, employeeClass: string) => {
if (type !== 'all' && employeeClass !== 'all') {
rows.value = listinsignia.value.filter((e: any) => e.insigniaType === type && e.employeeType === profileType(employeeClass))
} else if (type !== 'all' && employeeClass === 'all') {
rows.value = listinsignia.value.filter((e: any) => e.insigniaType === type)
} else if (type === 'all' && employeeClass !== 'all') {
rows.value = listinsignia.value.filter((e: any) => e.employeeType === profileType(employeeClass))
}
const searchFilterTable = async () => {
console.log(employeeClass.value);
if (employeeClass.value === "all") {
if (typeinsignia.value !== undefined && typeinsignia.value !== null) {
if (typeinsignia.value === "all") {
rows.value = listinsignia.value;
} else {
rows.value = listinsignia.value.filter(
(e: any) => e.insigniaSend === typeinsignia.value
);
}
}
} else {
if (typeinsignia.value !== undefined && typeinsignia.value !== null) {
if (typeinsignia.value === "all") {
rows.value = listinsignia.value.filter((e: any) => e.employeeType === profileType(employeeClass.value))
} else {
rows.value = listinsignia.value.filter(
(e: any) => e.insigniaSend === typeinsignia.value && e.employeeType === profileType(employeeClass.value)
);
}
}
}
};
const selectEmployeeClass = (employeeClass: string) => {
if (typeinsignia.value !== "all") {
if (employeeClass !== "all") {
let list = listinsignia.value.filter((e: any) => e.employeeType === profileType(employeeClass) && e.insigniaSend === typeinsignia.value)
rows.value = list
} else {
let list = listinsignia.value.filter((e: any) => e.insigniaSend === typeinsignia.value)
rows.value = list
}
} else if (typeinsignia.value == "all") {
if (employeeClass !== "all") {
let list = listinsignia.value.filter((e: any) => e.employeeType === profileType(employeeClass))
rows.value = list
} else {
rows.value = listinsignia.value
}
}
}
const convertOcid = (oc: string) => {
let ocdata = optionsTypeOc.value.find((e: any) => e.name === oc)
@ -149,12 +117,11 @@ export const useInsigniaDataStore = defineStore("insignia", () => {
agency,
fetchData,
fetchOption,
searchFilterTable,
searchDataTable,
setTypeandTitle,
convertOcid,
typeReport,
titleReport,
selectEmployeeClass,
employeeClass,
employeeClassOps,
fetchDataInsignia,

View file

@ -54,7 +54,19 @@ export const useBrrowDataStore = defineStore("insigniaBrrow", () => {
}));
rows.value = list
listInsignia.value = list
// selectInvoice(invoiceType.value)
searchDatatable(insignia.value, employeeClass.value)
}
const searchDatatable = (type: string, employeeClass: string) => {
if (type !== '' && employeeClass !== "all") {
rows.value = listInsignia.value.filter((e: any) => e.requestInsigniaId == type && e.profileType == employeeClass
)
} else if (type !== '' && employeeClass == "all") {
rows.value = listInsignia.value.filter((e: any) => e.requestInsigniaId == type
)
} else if (type == '' && employeeClass !== "all") {
rows.value = listInsignia.value.filter((e: any) => e.profileType == employeeClass
)
}
}
const status = (val: string) => {
@ -89,5 +101,6 @@ export const useBrrowDataStore = defineStore("insigniaBrrow", () => {
fetchDataInsignia,
profileType,
fetchlistinsignia,
searchDatatable,
};
});

View file

@ -43,10 +43,12 @@ export const useResultDataStore = defineStore("insigniaResult", () => {
position: e.position,
status: status(e.status),
dateReceive: date2Thai(e.dateReceive),
name: e.fullName,
name: e.prefix + e.fullName,
type: e.requestInsignia,
employeeType: profileType(e.profileType),
profileType: e.profileType,
volumeNo: e.volumeNo,
section: e.section,
page: e.page,
number: e.no,
vatnumber: e.number,
@ -56,27 +58,20 @@ export const useResultDataStore = defineStore("insigniaResult", () => {
}));
rows.value = alllist
listInsignia.value = alllist
selectInvoice(invoiceType.value)
searchData(invoiceType.value, employeeClass.value);
}
const selectInvoice = (invoice: string) => {
console.log(invoice);
if (invoice === "noDate") {
let list = listInsignia.value.filter((e: any) => e.datepay === null)
const searchData = (invoice: string, employeeClass: string) => {
if (invoice !== 'all' && employeeClass !== 'all') {
let list = listInsignia.value.filter((e: any) => convertDatepay(e.datepay) === invoice && e.employeeType === profileType(employeeClass))
rows.value = list
} else if (invoice === "haveDate") {
let list = listInsignia.value.filter((e: any) => e.datepay !== null)
} else if (invoice !== 'all' && employeeClass === 'all') {
let list = listInsignia.value.filter((e: any) => convertDatepay(e.datepay) === invoice)
rows.value = list
} else rows.value = listInsignia.value
}
const selectEmployeeClass = (employeeClass: string) => {
if (employeeClass == "officer") {
let list = listInsignia.value.filter((e: any) => e.employeeType === "ข้าราชการ กทม.สามัญ")
} else if (invoice === 'all' && employeeClass !== 'all') {
let list = listInsignia.value.filter((e: any) => e.employeeType === profileType(employeeClass))
rows.value = list
} else if (employeeClass === "perm") {
let list = listInsignia.value.filter((e: any) => e.employeeType === "ลูกจ้างประจำ")
rows.value = list
} else rows.value = listInsignia.value
}
}
const status = (val: string) => {
switch (val) {
@ -98,6 +93,14 @@ export const useResultDataStore = defineStore("insigniaResult", () => {
return "ลูกจ้างประจำ";
}
}
const convertDatepay = (val: any) => {
switch (val) {
case null:
return "noDate";
default:
return "haveDate";
}
}
return {
rows,
insignia,
@ -113,7 +116,8 @@ export const useResultDataStore = defineStore("insigniaResult", () => {
status,
profileType,
fetchlistinsignia,
selectInvoice,
selectEmployeeClass,
searchData,
// selectInvoice,
// selectEmployeeClass,
};
});

View file

@ -85,7 +85,6 @@ const fecthInsigniaType = async () => {
.catch((err) => {
messageError($q, err);
console.log("fecthInsigniaType");
});
};
const visibleColumns = ref<String[]>([
@ -96,6 +95,8 @@ const visibleColumns = ref<String[]>([
"type",
"dateReceive",
"employeeType",
"volumeNo",
"section",
"page",
"number",
"vatnumber",
@ -114,7 +115,6 @@ const columns = ref<QTableProps["columns"]>([
sort: (a: string, b: string) =>
a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
},
{
name: "status",
align: "left",
@ -142,6 +142,15 @@ const columns = ref<QTableProps["columns"]>([
sort: (a: string, b: string) =>
a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
},
{
name: "employeeType",
align: "left",
label: "สถานภาพ",
field: "employeeType",
sortable: true,
sort: (a: string, b: string) =>
a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
},
{
name: "type",
align: "left",
@ -161,14 +170,24 @@ const columns = ref<QTableProps["columns"]>([
a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
},
{
name: "employeeType",
name: "volumeNo",
align: "left",
label: "สถานภาพ",
field: "employeeType",
label: "เล่มในราชกิจนุเบกษา",
field: "volumeNo",
sortable: true,
sort: (a: string, b: string) =>
a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
},
{
name: "section",
align: "left",
label: "ตอนในราชกิจนุเบกษา",
field: "section",
sortable: true,
sort: (a: string, b: string) =>
a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
},
{
name: "page",
align: "left",
@ -540,7 +559,10 @@ const paginationLabel = (start: number, end: number, total: number) => {
:borderless="false"
style="min-width: 150px"
@update:model-value="
DataStore.selectInvoice(DataStore.invoiceType)
DataStore.searchData(
DataStore.invoiceType,
DataStore.employeeClass
)
"
/>
</div>
@ -561,7 +583,10 @@ const paginationLabel = (start: number, end: number, total: number) => {
:borderless="false"
style="min-width: 150px"
@update:model-value="
DataStore.selectEmployeeClass(DataStore.employeeClass)
DataStore.searchData(
DataStore.invoiceType,
DataStore.employeeClass
)
"
/>
</div>

View file

@ -1,140 +1,140 @@
<template>
<q-card flat bordered class="col-12 row q-px-lg q-py-md">
<q-form ref="myform" class="col-12">
<HeaderTop
v-model:edit="edit"
header="เอกสารหลักฐาน"
icon="mdi-file-document"
:history="false"
:changeBtn="changeBtn"
:cancel="onCancel"
:disable="statusEdit"
:save="uploadData"
/>
<div class="row col-12 q-pt-sm">
<q-card bordered flat class="full-width">
<q-list separator>
<q-item v-for="file in files" :key="file.key" class="q-my-xs">
<q-item-section>
<q-item-label class="full-width ellipsis">
{{ file.fileName }}
</q-item-label>
<q-item-label caption> </q-item-label>
</q-item-section>
<q-item-section top side>
<div class="row col-12">
<q-btn
class="gt-xs"
size="12px"
flat
dense
round
color="blue"
icon="mdi-download-outline"
@click="downloadData(file.file)"
/>
<q-btn
class="gt-xs"
size="12px"
flat
dense
round
color="red"
icon="mdi-delete-outline"
v-show="edit"
@click="deleteData(file.id)"
/>
</div>
</q-item-section>
</q-item>
</q-list>
</q-card>
<q-input
v-if="edit"
class="q-mt-sm col-12 q-pb-xs"
outlined
dense
lazy-rules
v-model="name"
hide-bottom-space
:rules="[(val) => !!val || `${'กรุณากรอกชื่อเอกสาร'}`]"
:label="`${'ชื่อเอกสาร'}`"
<HeaderTop
v-model:edit="edit"
header="เอกสารหลักฐาน"
icon="mdi-file-document"
:history="false"
:changeBtn="changeBtn"
:cancel="onCancel"
:disable="statusEdit"
:save="uploadData"
/>
<q-uploader
v-if="edit"
color="gray"
type="file"
flat
@factory="uploadData"
ref="uploader"
class="full-width"
text-color="white"
:max-size="10000000"
accept=".jpg,.png,.pdf,.csv,.doc"
bordered
label="[ไฟล์ jpg,png,pdf,csv,doc ขนาดไม่เกิน 10MB]"
@added="fileAdd"
>
<template v-slot:header="scope">
<div class="row no-wrap items-center q-pa-sm q-gutter-xs">
<q-btn
v-if="scope.queuedFiles.length > 0"
icon="clear_all"
@click="scope.removeQueuedFiles"
round
dense
flat
>
<q-tooltip>ลบทงหมด</q-tooltip>
</q-btn>
<q-btn
v-if="scope.uploadedFiles.length > 0"
icon="done_all"
@click="scope.removeUploadedFiles"
round
dense
flat
>
<q-tooltip>ลบไฟลปโหลด</q-tooltip>
</q-btn>
<q-spinner v-if="scope.isUploading" class="q-uploader__spinner" />
<div class="col">
<div class="q-uploader__title">
{{ "[ไฟล์ jpg,png,pdf,csv,doc ขนาดไม่เกิน 10MB]" }}
</div>
<div class="q-uploader__subtitle">
{{ scope.uploadSizeLabel }} / {{ scope.uploadProgressLabel }}
<div class="row col-12 q-pt-sm">
<q-card bordered flat class="full-width">
<q-list separator>
<q-item v-for="file in files" :key="file.key" class="q-my-xs">
<q-item-section>
<q-item-label class="full-width ellipsis">
{{ file.fileName }}
</q-item-label>
<q-item-label caption> </q-item-label>
</q-item-section>
<q-item-section top side>
<div class="row col-12">
<q-btn
class="gt-xs"
size="12px"
flat
dense
round
color="blue"
icon="mdi-download-outline"
@click="downloadData(file.file)"
/>
<q-btn
class="gt-xs"
size="12px"
flat
dense
round
color="red"
icon="mdi-delete-outline"
v-show="edit"
@click="deleteData(file.id)"
/>
</div>
</q-item-section>
</q-item>
</q-list>
</q-card>
<q-input
v-if="edit"
class="q-mt-sm col-12 q-pb-xs"
outlined
dense
lazy-rules
v-model="name"
hide-bottom-space
:rules="[(val) => !!val || `${'กรุณากรอกชื่อเอกสาร'}`]"
:label="`${'ชื่อเอกสาร'}`"
/>
<q-uploader
v-if="edit"
color="gray"
type="file"
flat
@factory="uploadData"
ref="uploader"
class="full-width"
text-color="white"
:max-size="10000000"
accept=".jpg,.png,.pdf,.csv,.doc,.docx"
bordered
label="[ไฟล์ jpg,png,pdf,csv,doc,docx ขนาดไม่เกิน 10MB]"
@added="fileAdd"
>
<template v-slot:header="scope">
<div class="row no-wrap items-center q-pa-sm q-gutter-xs">
<q-btn
v-if="scope.queuedFiles.length > 0"
icon="clear_all"
@click="scope.removeQueuedFiles"
round
dense
flat
>
<q-tooltip>ลบทงหมด</q-tooltip>
</q-btn>
<q-btn
v-if="scope.uploadedFiles.length > 0"
icon="done_all"
@click="scope.removeUploadedFiles"
round
dense
flat
>
<q-tooltip>ลบไฟลปโหลด</q-tooltip>
</q-btn>
<q-spinner v-if="scope.isUploading" class="q-uploader__spinner" />
<div class="col">
<div class="q-uploader__title">
{{ "[ไฟล์ jpg,png,pdf,csv,doc,docx ขนาดไม่เกิน 10MB]" }}
</div>
<div class="q-uploader__subtitle">
{{ scope.uploadSizeLabel }} / {{ scope.uploadProgressLabel }}
</div>
</div>
<q-btn
v-if="scope.canAddFiles"
type="a"
icon="add_box"
@click="scope.pickFiles"
round
dense
flat
>
<q-uploader-add-trigger />
<q-tooltip>เลอกไฟล</q-tooltip>
</q-btn>
<q-btn
v-if="scope.isUploading"
icon="clear"
@click="scope.abort"
round
dense
flat
>
<q-tooltip>ยกเลกการอปโหลด</q-tooltip>
</q-btn>
</div>
<q-btn
v-if="scope.canAddFiles"
type="a"
icon="add_box"
@click="scope.pickFiles"
round
dense
flat
>
<q-uploader-add-trigger />
<q-tooltip>เลอกไฟล</q-tooltip>
</q-btn>
<q-btn
v-if="scope.isUploading"
icon="clear"
@click="scope.abort"
round
dense
flat
>
<q-tooltip>ยกเลกการอปโหลด</q-tooltip>
</q-btn>
</div>
</template>
</q-uploader>
</div>
</q-form>
</template>
</q-uploader>
</div>
</q-form>
</q-card>
</template>
<script setup lang="ts">
@ -167,7 +167,7 @@ const emit = defineEmits(["update:statusEdit"]);
const $q = useQuasar(); // show dialog
const mixin = useCounterMixin();
const route = useRoute();
const { success, messageError, showLoader, hideLoader ,dialogConfirm} = mixin;
const { success, messageError, showLoader, hideLoader, dialogConfirm } = mixin;
const profileId = ref<string>(
route.params.id ? route.params.id.toString() : ""
);
@ -176,7 +176,7 @@ const uploader = ref<any>();
const files = ref<any>([]);
const file = ref<any>([]);
const name = ref<string>("");
const myform = ref<QForm | null>(null);
const myform = ref<QForm | null>(null);
onMounted(async () => {
await getData();
});
@ -213,9 +213,9 @@ const deleteData = async (id: string) => {
await getData();
});
};
const uploadData = () =>{
dialogConfirm($q,()=> Datasave())
}
const uploadData = () => {
dialogConfirm($q, () => Datasave());
};
const Datasave = async () => {
if (myform.value != null) {
await myform.value.validate().then(async (success: boolean) => {

View file

@ -167,9 +167,9 @@
class="full-width"
text-color="white"
:max-size="10000000"
accept=".jpg,.png,.pdf,.csv,.doc"
accept=".jpg,.png,.pdf,.csv,.doc,.docx"
bordered
label="[ไฟล์ jpg,png,pdf,csv,doc ขนาดไม่เกิน 10MB]"
label="[ไฟล์ jpg,png,pdf,csv,doc,docx ขนาดไม่เกิน 10MB]"
@added="fileAdd"
>
<template v-slot:header="scope">
@ -200,7 +200,7 @@
/>
<div class="col">
<div class="q-uploader__title">
{{ "[ไฟล์ jpg,png,pdf,csv,doc ขนาดไม่เกิน 10MB]" }}
{{ "[ไฟล์ jpg,png,pdf,csv,doc,docx ขนาดไม่เกิน 10MB]" }}
</div>
<div class="q-uploader__subtitle">
{{ scope.uploadSizeLabel }} /

View file

@ -77,7 +77,7 @@ const clickOpenpopup = () => {
OrderTypeOption.value = props.OrderTypeOption.filter(
(e: any) => e.name !== "ทั้งหมด"
);
reportType.value = OrderTypeOption.value[0].id;
reportType.value = OrderTypeOption.value[0].name;
let currentDate = new Date();
let currentYear = currentDate.getFullYear();
reportYear.value = currentYear;
@ -89,7 +89,7 @@ const clickSearch = async () => {
await myForm.value!.validate().then((result: boolean) => {
if (result) {
let body = {
commandTypeId: reportType.value,
commandType: reportType.value,
year: reportYear.value,
posno: reportNo.value,
};
@ -110,7 +110,7 @@ const clickSearch = async () => {
position: e.position,
}));
} else {
notifyError($q, "ไม่มีข้อมูลที่ต้องการค้นหา");
// notifyError($q, "");
rows.value = [];
}
})
@ -188,7 +188,7 @@ const paginationLabel = (start: number, end: number, total: number) => {
map-options
:options="OrderTypeOption"
option-label="name"
option-value="id"
option-value="name"
:label="`${' ประเภท'}`"
>
<template v-slot:no-option>

View file

@ -1719,7 +1719,7 @@ const getClass = (val: boolean) => {
lazy-rules
v-model="organizationsOld"
:rules="[(val) => !!val || `${'กรุณากรอกหน่วยงาน (ต้นทาง)'}`]"
:label="`${'ชื่อหน่วยงาน (ต้นทาง'}`"
:label="`${'ชื่อหน่วยงาน (ต้นทาง)'}`"
hide-bottom-space
/>
</div>