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

Merge pull request #1527 from Frappet/fix/discipline

Browse source 
Fix/discipline
This commit is contained in:
Warunee Tamkoo 2025-12-08 10:24:45 +07:00 • committed by GitHub
commit c8cdfb70d3
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/modules/11_discipline/components/2_InvestigateFacts/MainPage.vue
View file

@ -264,7 +264,8 @@ onMounted(() => {
<q-btn <q-btn
v-if=" v-if="
checkPermission($route)?.attrIsGet && checkPermission($route)?.attrIsGet &&
checkPermission($route)?.attrIsUpdate checkPermission($route)?.attrIsUpdate &&
props.row.statusMain != 'SEND_DISCIPLINARY'
" "
flat flat
dense dense

2
src/modules/11_discipline/components/PopupSendToNext.vue
View file

@ -194,7 +194,7 @@ watch(
:visible-columns="props.visibleColumns" :visible-columns="props.visibleColumns"
selection="multiple" selection="multiple"
v-model:selected="selected" v-model:selected="selected"
:pagination="initialPagination" v-model:pagination="initialPagination"
> >
<template v-slot:header-selection="scope"> <template v-slot:header-selection="scope">
<q-checkbox <q-checkbox

1
src/modules/11_discipline/store/InvestigateFactStore.ts
View file

@ -248,6 +248,7 @@ export const useInvestigateFactStore = defineStore(
? date2Thai(e.dateReceived as Date) ? date2Thai(e.dateReceived as Date)
: "-", : "-",
status: e.status ? convertStatus(e.status) : "-", status: e.status ? convertStatus(e.status) : "-",
statusMain: e.status ? e.status : "",
}; };
}); });
} }