Merge branch 'develop' into dev
All checks were successful
Build & Deploy on Dev / build (push) Successful in 2m12s
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:
commit
56705f0296
3 changed files with 4 additions and 2 deletions
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -248,6 +248,7 @@ export const useInvestigateFactStore = defineStore(
|
|||
? date2Thai(e.dateReceived as Date)
|
||||
: "-",
|
||||
status: e.status ? convertStatus(e.status) : "-",
|
||||
statusMain: e.status ? e.status : "",
|
||||
};
|
||||
});
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue