Merge branch 'develop' into devTee

This commit is contained in:
setthawutttty 2025-07-09 13:37:03 +07:00
commit 8d42f39bb5
42 changed files with 84 additions and 84 deletions

View file

@ -312,7 +312,7 @@ onMounted(() => {
dense
color="info"
icon="mdi-eye"
@click.pervent="onClickView(props.row.id)"
@click.prevent="onClickView(props.row.id)"
>
<q-tooltip>รายละเอยด</q-tooltip>
</q-btn>
@ -323,7 +323,7 @@ onMounted(() => {
round
color="red"
icon="mdi-delete "
@click.pervent="onClickDelete(props.row.id)"
@click.prevent="onClickDelete(props.row.id)"
>
<q-tooltip>ลบขอม</q-tooltip>
</q-btn>

View file

@ -494,7 +494,7 @@ onMounted(() => {
v-if="checkPermission($route)?.attrIsDelete"
clickable
v-close-popup
@click.stop.pervent="deleteData(props.row.id)"
@click.stop.prevent="deleteData(props.row.id)"
>
<q-item-section style="min-width: 0px" avatar>
<q-tooltip>ลบขอม</q-tooltip>

View file

@ -543,7 +543,7 @@ onMounted(async () => {
v-if="checkPermission($route)?.attrIsDelete"
clickable
v-close-popup
@click.stop.pervent="onClickDelete(props.row.id)"
@click.stop.prevent="onClickDelete(props.row.id)"
>
<q-item-section style="min-width: 0px" avatar>
<q-tooltip>ลบขอม</q-tooltip>

View file

@ -768,7 +768,7 @@ watch(
color="deep-purple"
icon="mdi-history"
round
@click.stop.pervent="onClickHistoryPos(props.row.id)"
@click.stop.prevent="onClickHistoryPos(props.row.id)"
>
<q-tooltip>ประวตำแหน</q-tooltip>
</q-btn>

View file

@ -225,7 +225,7 @@ function clearFilter() {
rounded
flat
label="ล้างทั้งหมด"
@click.stop.pervent="clearFilter"
@click.stop.prevent="clearFilter"
/>
</q-card-section>
<q-card-section class="q-pa-none">

View file

@ -292,7 +292,7 @@ onMounted(() => {
flat
color="edit
"
@click.pervent="onclickEdit(props.row)"
@click.prevent="onclickEdit(props.row)"
>
<q-tooltip>แกไขสถานะคำรอง</q-tooltip>
</q-btn>

View file

@ -370,7 +370,7 @@ onMounted(() => {
dense
flat
color="edit"
@click.pervent="onclickEdit(props.row.id)"
@click.prevent="onclickEdit(props.row.id)"
>
<q-tooltip>แกไขสถานะคำรอง</q-tooltip>
</q-btn>
@ -402,7 +402,7 @@ onMounted(() => {
dense
flat
color="primary"
@click.pervent="onDownloadFile(props.row.id)"
@click.prevent="onDownloadFile(props.row.id)"
>
<q-tooltip>ดาวนโหลดเอกสารหลกฐาน</q-tooltip>
</q-btn>

View file

@ -515,7 +515,7 @@ onMounted(async () => {
:disable="rowIndex === 0"
:color="rowIndex === 0 ? 'grey' : 'public'"
icon="mdi-chevron-left"
@click.stop.pervent="onNavigateRow('previous')"
@click.stop.prevent="onNavigateRow('previous')"
>
<q-tooltip>อมลกอนหน</q-tooltip>
</q-btn>
@ -526,7 +526,7 @@ onMounted(async () => {
:disable="rowIndex + 1 === rowData.length"
:color="rowIndex + 1 === rowData.length ? 'grey' : 'public'"
icon="mdi-chevron-right"
@click.stop.pervent="onNavigateRow('next')"
@click.stop.prevent="onNavigateRow('next')"
>
<q-tooltip>อมลถดไป</q-tooltip>
</q-btn>

View file

@ -838,7 +838,7 @@ onMounted(async () => {
:color="props.rowIndex + 1 == 1 ? 'grey' : 'green'"
:disable="props.rowIndex + 1 == 1"
icon="mdi-arrow-up-bold"
@click.stop.pervent="onSwapData('up', props.row.id)"
@click.stop.prevent="onSwapData('up', props.row.id)"
/>
<q-btn
dense
@ -847,7 +847,7 @@ onMounted(async () => {
:color="rows.length == props.rowIndex + 1 ? 'grey' : 'red'"
:disable="rows.length == props.rowIndex + 1"
icon="mdi-arrow-down-bold"
@click.stop.pervent="onSwapData('down', props.row.id)"
@click.stop.prevent="onSwapData('down', props.row.id)"
>
</q-btn>
@ -857,7 +857,7 @@ onMounted(async () => {
round
color="edit"
icon="edit"
@click.stop.pervent="onEditData(props.rowIndex)"
@click.stop.prevent="onEditData(props.rowIndex)"
>
<q-tooltip>แกไขขอม</q-tooltip>
</q-btn>
@ -867,7 +867,7 @@ onMounted(async () => {
round
:icon="props.row.isDelete ? 'mdi-refresh-circle' : 'delete'"
:color="props.row.isDelete ? 'orange' : 'red'"
@click.stop.pervent="
@click.stop.prevent="
onConfirmDeleteData(props.row.id, props.row.isDelete)
"
>

View file

@ -236,7 +236,7 @@ onMounted(async () => {
"
outline
label="ยืนยันการแก้ไขสำเร็จ"
@click.stop.pervent="onConfirmEdit"
@click.stop.prevent="onConfirmEdit"
/>
<q-btn
flat
@ -254,7 +254,7 @@ onMounted(async () => {
color="public"
outline
label="ยืนยันข้อมูลถูกต้อง"
@click.stop.pervent="onConfirmDone"
@click.stop.prevent="onConfirmDone"
/>
<q-btn
flat

View file

@ -245,7 +245,7 @@ onMounted(() => {
rounded
flat
label="ล้างทั้งหมด"
@click.stop.pervent="clearFilter"
@click.stop.prevent="clearFilter"
/>
</q-card-section>
<q-card-section class="q-pa-none">

View file

@ -368,7 +368,7 @@ onMounted(async () => {
round
color="info"
icon="mdi-eye"
@click.pervent="
@click.prevent="
onRedirectToDetail('resign-detail', props.row.id)
"
>
@ -388,7 +388,7 @@ onMounted(async () => {
round
color="edit"
icon="edit"
@click.pervent="onRedirectToDetail('resign', props.row.id)"
@click.prevent="onRedirectToDetail('resign', props.row.id)"
>
<q-tooltip>แกไขขอม</q-tooltip>
</q-btn>

View file

@ -364,7 +364,7 @@ onMounted(async () => {
round
color="info"
icon="mdi-eye"
@click.pervent="
@click.prevent="
onRedirectToDetail('resign-employee-detail', props.row.id)
"
>
@ -380,7 +380,7 @@ onMounted(async () => {
round
color="edit"
icon="edit"
@click.pervent="
@click.prevent="
onRedirectToDetail('resign-employee', props.row.id)
"
>

View file

@ -246,7 +246,7 @@ onMounted(() => {
<q-item
clickable
v-close-popup
@click.stop.pervent="
@click.stop.prevent="
genReportXLSX(
detailReport,
`${
@ -264,7 +264,7 @@ onMounted(() => {
<q-item
clickable
v-close-popup
@click.stop.pervent="
@click.stop.prevent="
genReportXLSX(
detailReport,
`${
@ -304,7 +304,7 @@ onMounted(() => {
rounded
flat
label="ล้างทั้งหมด"
@click.stop.pervent="clearFilter"
@click.stop.prevent="clearFilter"
/>
</q-card-section>
<q-card-section class="q-pa-none">

View file

@ -1336,7 +1336,7 @@ onMounted(async () => {
dense
icon="info"
color="red"
@click.pervent="
@click.prevent="
onClickViewInfo(
'discipline',
props.row.profileId,
@ -1356,7 +1356,7 @@ onMounted(async () => {
dense
icon="info"
color="red"
@click.pervent="
@click.prevent="
onClickViewInfo(
'leave',
props.row.profileId,
@ -1377,7 +1377,7 @@ onMounted(async () => {
dense
icon="info"
color="info"
@click.pervent="
@click.prevent="
onClickViewInfo(
'assessments',
props.row.profileId,
@ -1397,7 +1397,7 @@ onMounted(async () => {
dense
icon="info"
color="info"
@click.pervent="
@click.prevent="
onClickViewInfo(
'insignia',
props.row.profileId,

View file

@ -534,7 +534,7 @@ watch(
flat
round
color="blue"
@click.pervent="
@click.prevent="
showReson(props.row.name, props.row.requestNote)
"
icon="mdi-information-outline"

View file

@ -448,7 +448,7 @@ onMounted(async () => {
rounded
flat
label="ล้างทั้งหมด"
@click.stop.pervent="clearFilter"
@click.stop.prevent="clearFilter"
/>
</q-card-section>
<q-card-section class="q-pa-none">

View file

@ -545,7 +545,7 @@ onMounted(async () => {
round
color="primary"
icon="mdi-plus"
@click.stop.pervent="onOpenDialogForm(false)"
@click.stop.prevent="onOpenDialogForm(false)"
>
<q-tooltip>เพ</q-tooltip>
</q-btn>
@ -594,7 +594,7 @@ onMounted(async () => {
round
color="edit"
icon="edit"
@click.stop.pervent="onOpenDialogForm(true, props.row)"
@click.stop.prevent="onOpenDialogForm(true, props.row)"
><q-tooltip>แกไขขอม</q-tooltip>
</q-btn>
<q-btn
@ -604,7 +604,7 @@ onMounted(async () => {
round
color="red"
icon="delete"
@click.stop.pervent="onDeleteDataReclaim(props.row.id)"
@click.stop.prevent="onDeleteDataReclaim(props.row.id)"
><q-tooltip>ลบขอม</q-tooltip>
</q-btn>
</q-td>

View file

@ -440,7 +440,7 @@ onMounted(async () => {
: 'blue'
"
icon="mdi-account-settings"
@click.pervent="onClickSelectPos(props.row)"
@click.prevent="onClickSelectPos(props.row)"
>
<q-tooltip>กำหนดตำแหน </q-tooltip>
</q-btn>
@ -455,7 +455,7 @@ onMounted(async () => {
dense
color="edit"
icon="edit"
@click.pervent="redirectToPageDetail(props.row.id)"
@click.prevent="redirectToPageDetail(props.row.id)"
>
<q-tooltip>แกไขขอม </q-tooltip>
</q-btn>

View file

@ -303,7 +303,7 @@ onMounted(() => {
</div>
<q-space />
<!-- @click.stop.pervent="
<!-- @click.stop.prevent="
genReportXLSX(
detailReport,
`${

View file

@ -303,7 +303,7 @@ onMounted(async () => {
round
color="primary"
icon="add"
@click.stop.pervent="onOpenDialogForm(false)"
@click.stop.prevent="onOpenDialogForm(false)"
>
<q-tooltip>เพมขอมลวนลายอนหล</q-tooltip>
</q-btn>
@ -381,7 +381,7 @@ onMounted(async () => {
round
color="edit"
icon="edit"
@click.stop.pervent="onOpenDialogForm(true, props.row)"
@click.stop.prevent="onOpenDialogForm(true, props.row)"
><q-tooltip>แกไขขอม</q-tooltip>
</q-btn>
<q-btn
@ -391,7 +391,7 @@ onMounted(async () => {
round
color="red"
icon="delete"
@click.stop.pervent="onDeleteLeaveBeginning(props.row.id)"
@click.stop.prevent="onDeleteLeaveBeginning(props.row.id)"
><q-tooltip>ลบขอม</q-tooltip>
</q-btn>
</q-td>

View file

@ -399,7 +399,7 @@ onMounted(async () => {
rounded
flat
label="ล้างทั้งหมด"
@click.stop.pervent="clearFilter"
@click.stop.prevent="clearFilter"
/>
</q-card-section>
<q-card-section class="q-pa-none">

View file

@ -275,7 +275,7 @@ watch(
denes
icon="edit"
color="edit"
@click.stop.pervent="onEditDuty(props.row)"
@click.stop.prevent="onEditDuty(props.row)"
>
<q-tooltip>แกไขหนาท</q-tooltip>
</q-btn>

View file

@ -371,7 +371,7 @@ onMounted(async () => {
v-for="col in props.cols"
:key="col.name"
:props="props"
@click.stop.pervent="returnDetail(props.row)"
@click.stop.prevent="returnDetail(props.row)"
>
<div v-if="col.name == 'no'">
{{
@ -387,7 +387,7 @@ onMounted(async () => {
round
color="info"
icon="info"
@click.stop.pervent="
@click.stop.prevent="
onclickViewinfo(props.row.personId)
"
>

View file

@ -204,7 +204,7 @@ onMounted(() => {
round
color="info"
icon="mdi-eye"
@click.pervent="onOpenDetail(props.row.id, 'VIEW')"
@click.prevent="onOpenDetail(props.row.id, 'VIEW')"
>
<q-tooltip>รายละเอยด</q-tooltip>
</q-btn>
@ -218,7 +218,7 @@ onMounted(() => {
round
color="edit"
icon="edit"
@click.pervent="onOpenDetail(props.row.id, 'EDIT')"
@click.prevent="onOpenDetail(props.row.id, 'EDIT')"
>
<q-tooltip>แกไขขอม</q-tooltip>
</q-btn>
@ -228,7 +228,7 @@ onMounted(() => {
flat
round
color="red"
@click.pervent="clickDelete(props.row.id)"
@click.prevent="clickDelete(props.row.id)"
icon="mdi-delete"
>
<q-tooltip>ลบขอม</q-tooltip>

View file

@ -172,7 +172,7 @@ onMounted(() => {
round
color="info"
icon="mdi-eye"
@click.pervent="
@click.prevent="
router.push(`/evaluate/meeting-detail/${props.row.id}`)
"
>
@ -188,7 +188,7 @@ onMounted(() => {
round
color="edit"
icon="edit"
@click.pervent="
@click.prevent="
router.push(`/evaluate/meeting/${props.row.id}`)
"
>
@ -200,7 +200,7 @@ onMounted(() => {
flat
round
color="red"
@click.pervent="clickDelete(props.row.id)"
@click.prevent="clickDelete(props.row.id)"
icon="mdi-delete"
>
<q-tooltip>ลบขอม</q-tooltip>

View file

@ -539,7 +539,7 @@ function onClickViewInfo(type: string, id: string) {
dense
icon="info"
color="info"
@click.pervent="onClickViewInfo(col.name, props.row.profileId)"
@click.prevent="onClickViewInfo(col.name, props.row.profileId)"
>
</q-btn>
</div>
@ -550,7 +550,7 @@ function onClickViewInfo(type: string, id: string) {
dense
icon="info"
color="red"
@click.pervent="onClickViewInfo(col.name, props.row.profileId)"
@click.prevent="onClickViewInfo(col.name, props.row.profileId)"
>
</q-btn>

View file

@ -563,7 +563,7 @@ watch(
class="q-pa-none q-ml-xs"
color="info"
size="12px"
@click.pervent="onClickViewInfo(col.name, props.row.profileId)"
@click.prevent="onClickViewInfo(col.name, props.row.profileId)"
>
</q-btn>
</div>
@ -577,7 +577,7 @@ watch(
class="q-pa-none q-ml-xs"
color="red"
size="12px"
@click.pervent="onClickViewInfo(col.name, props.row.profileId)"
@click.prevent="onClickViewInfo(col.name, props.row.profileId)"
>
</q-btn>
<div v-else>-</div>

View file

@ -459,7 +459,7 @@ onMounted(async () => {
dense
color="primary"
icon="mdi-account-arrow-right"
@click.pervent="modalCommand = true"
@click.prevent="modalCommand = true"
>
<q-tooltip>งไปออกคำส</q-tooltip>
</q-btn>

View file

@ -422,7 +422,7 @@ onMounted(async () => {
dense
color="primary"
icon="mdi-account-arrow-right"
@click.pervent="modalCommand = true"
@click.prevent="modalCommand = true"
>
<q-tooltip>งไปออกคำส</q-tooltip>
</q-btn>

View file

@ -428,7 +428,7 @@ watch(
item.id == 'HEAD' || item.id == 'GROUP' ? 'mdi-eye' : 'edit'
"
color="info"
@click.stop.pervent="onEdit(props.row, item.id)"
@click.stop.prevent="onEdit(props.row, item.id)"
>
<q-tooltip v-if="item.id == 'HEAD' || item.id == 'GROUP'"
>รายละเอยด</q-tooltip
@ -510,7 +510,7 @@ watch(
round
icon="delete"
color="red"
@click.stop.pervent="onDelete(props.row.id, item.id)"
@click.stop.prevent="onDelete(props.row.id, item.id)"
>
<q-tooltip>ลบขอม </q-tooltip>
</q-btn>

View file

@ -339,7 +339,7 @@ onMounted(() => {
round
icon="edit"
color="edit"
@click.stop.pervent="onEdit(props.row.id)"
@click.stop.prevent="onEdit(props.row.id)"
>
<q-tooltip>แกไข </q-tooltip>
</q-btn>
@ -348,7 +348,7 @@ onMounted(() => {
round
icon="delete"
color="red"
@click.stop.pervent="onDelete(props.row.id)"
@click.stop.prevent="onDelete(props.row.id)"
>
<q-tooltip>ลบขอม </q-tooltip>
</q-btn>

View file

@ -600,7 +600,7 @@ onMounted(() => {
rounded
flat
label="ล้างทั้งหมด"
@click.stop.pervent="clearFilter"
@click.stop.prevent="clearFilter"
/>
</q-card-section>
<q-card-section class="q-pa-none">

View file

@ -325,7 +325,7 @@ defineExpose({
round
color="edit"
icon="edit"
@click.pervent="onClickAddAcademic(true, props.row)"
@click.prevent="onClickAddAcademic(true, props.row)"
>
<q-tooltip>แกไขอม</q-tooltip>
</q-btn>
@ -336,7 +336,7 @@ defineExpose({
round
color="red"
icon="delete"
@click.pervent="onDeleteAcademic(props.row.id)"
@click.prevent="onDeleteAcademic(props.row.id)"
>
<q-tooltip>ลบ</q-tooltip>
</q-btn>

View file

@ -507,7 +507,7 @@ onMounted(() => {
dense
color="info"
icon="mdi-eye"
@click.pervent="onDetail(props.row.id)"
@click.prevent="onDetail(props.row.id)"
>
<q-tooltip>รายละเอยด</q-tooltip></q-btn
>
@ -521,7 +521,7 @@ onMounted(() => {
dense
color="edit"
icon="edit"
@click.pervent="onClickAddOrView(true, props.row.id)"
@click.prevent="onClickAddOrView(true, props.row.id)"
>
<q-tooltip>แกไขขอม</q-tooltip></q-btn
>
@ -536,7 +536,7 @@ onMounted(() => {
dense
color="public"
icon="mdi-content-save-edit-outline"
@click.pervent="onRedirectToRecordPage(props.row.id)"
@click.prevent="onRedirectToRecordPage(props.row.id)"
>
<q-tooltip>นทกผานการอบรม</q-tooltip></q-btn
>

View file

@ -199,7 +199,7 @@ onMounted(() => {
"
clickable
v-close-popup
@click.pervent="onRedirectToDetail('edit', props.row.id)"
@click.prevent="onRedirectToDetail('edit', props.row.id)"
>
<q-item-section>
<div class="row items-center">
@ -219,7 +219,7 @@ onMounted(() => {
v-if="checkPermission($route)?.attrIsGet"
clickable
v-close-popup
@click.pervent="onRedirectToDetail('view', props.row.id)"
@click.prevent="onRedirectToDetail('view', props.row.id)"
>
<q-item-section>
<div class="row items-center">
@ -239,7 +239,7 @@ onMounted(() => {
v-if="checkPermission($route)?.attrIsCreate"
clickable
v-close-popup
@click.pervent="onCopy(props.row.id)"
@click.prevent="onCopy(props.row.id)"
>
<q-item-section>
<div class="row items-center">
@ -263,7 +263,7 @@ onMounted(() => {
"
clickable
v-close-popup
@click.pervent="onCancel(props.row.id)"
@click.prevent="onCancel(props.row.id)"
>
<q-item-section>
<div class="row items-center">
@ -286,7 +286,7 @@ onMounted(() => {
"
clickable
v-close-popup
@click.pervent="onReCommand(props.row.id)"
@click.prevent="onReCommand(props.row.id)"
>
<q-item-section>
<div class="row items-center">
@ -303,7 +303,7 @@ onMounted(() => {
store.tabsMain === 'CANCEL' &&
checkPermission($route)?.attrIsDelete
"
@click.pervent="onDeleteCommand(props.row.id)"
@click.prevent="onDeleteCommand(props.row.id)"
>
<q-item-section>
<div class="row items-center">

View file

@ -430,7 +430,7 @@ onMounted(async () => {
round
dense
icon="edit"
@click.stop.pervent="onSetCondution(props.row)"
@click.stop.prevent="onSetCondution(props.row)"
/>
</q-td>
<q-td auto-width>

View file

@ -188,7 +188,7 @@ watch(
<q-item
clickable
v-close-popup
@click.stop.pervent="
@click.stop.prevent="
genReportXLSX(
detailReport,
`${baseDocument.find((e) => e.val === title)?.name}`,
@ -204,7 +204,7 @@ watch(
<q-item
clickable
v-close-popup
@click.stop.pervent="
@click.stop.prevent="
genReportXLSX(
detailReport,
`${baseDocument.find((e) => e.val === title)?.name}`

View file

@ -958,7 +958,7 @@ watch(
rounded
flat
label="ล้างทั้งหมด"
@click.stop.pervent="clearFilter"
@click.stop.prevent="clearFilter"
/>
</q-card-section>
<q-separator />
@ -1789,7 +1789,7 @@ watch(
dense
icon="info"
color="info"
@click.pervent="
@click.prevent="
onViewInfo(props.row.profileId, props.row.empType)
"
>

View file

@ -304,7 +304,7 @@ onMounted(async () => {
rounded
flat
label="ล้างทั้งหมด"
@click.stop.pervent="clearFilter"
@click.stop.prevent="clearFilter"
/>
</q-card-section>
<q-card-section class="q-pa-none">

View file

@ -182,7 +182,7 @@ onMounted(() => {
<q-item
clickable
v-close-popup
@click.stop.pervent="onDownloadFile('pdf')"
@click.stop.prevent="onDownloadFile('pdf')"
>
<q-item-section avatar
><q-icon color="red" name="mdi-file-pdf"
@ -192,7 +192,7 @@ onMounted(() => {
<q-item
clickable
v-close-popup
@click.stop.pervent="onDownloadFile('xlsx')"
@click.stop.prevent="onDownloadFile('xlsx')"
>
<q-item-section avatar
><q-icon color="green" name="mdi-file-excel"
@ -225,7 +225,7 @@ onMounted(() => {
rounded
flat
label="ล้างทั้งหมด"
@click.stop.pervent="clearFilter"
@click.stop.prevent="clearFilter"
/>
</q-card-section>
<q-card-section class="q-pa-none">

View file

@ -374,7 +374,7 @@ onMounted(() => {
<q-item
clickable
v-close-popup
@click.stop.pervent="onDownloadFile('pdf')"
@click.stop.prevent="onDownloadFile('pdf')"
>
<q-item-section avatar
><q-icon color="red" name="mdi-file-pdf"
@ -384,7 +384,7 @@ onMounted(() => {
<q-item
clickable
v-close-popup
@click.stop.pervent="onDownloadFile('xlsx')"
@click.stop.prevent="onDownloadFile('xlsx')"
>
<q-item-section avatar
><q-icon color="green" name="mdi-file-excel"
@ -417,7 +417,7 @@ onMounted(() => {
rounded
flat
label="ล้างทั้งหมด"
@click.stop.pervent="clearFilter"
@click.stop.prevent="clearFilter"
/>
</q-card-section>
<q-card-section class="q-pa-none">