Merge branch 'develop' into dev
All checks were successful
Build & Deploy on Dev / build (push) Successful in 2m12s

* develop:
  fix(investigatefacts):display icon
  fix: dialog pagination
This commit is contained in:
Warunee Tamkoo 2025-12-08 10:25:35 +07:00
commit 56705f0296
3 changed files with 4 additions and 2 deletions

View file

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

View file

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

View file

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