Merge branch 'develop' into dev
* develop: update selected and load data fix: insigniaForm.year refactor(ui): apply +543 year formatting to columns fix: payload multiple fix: rowsPerPage 100 fix fix:add filter rowsPerPage = 3000 fix : orgTreeDnaId feat:Change Round Multiple
This commit is contained in:
commit
6967d90c25
12 changed files with 511 additions and 220 deletions
|
|
@ -92,7 +92,7 @@ const baseColumns = ref<QTableColumn[]>([
|
|||
field: "year",
|
||||
headerStyle: "font-size: 14px",
|
||||
style: "font-size: 14px",
|
||||
format: (v) => v + 543,
|
||||
format: (v) => (v ? v + 543 : "-"),
|
||||
sort: (a: string, b: string) =>
|
||||
a
|
||||
.toString()
|
||||
|
|
@ -920,9 +920,11 @@ onMounted(async () => {
|
|||
:locale="'th'"
|
||||
:enableTimePicker="false"
|
||||
>
|
||||
<template #year="{ year }">{{ year + 543 }}</template>
|
||||
<template #year="{ year }">{{
|
||||
year ? year + 543 : "-"
|
||||
}}</template>
|
||||
<template #year-overlay-value="{ value }">{{
|
||||
parseInt(value + 543)
|
||||
value ? parseInt(value + 543) : "-"
|
||||
}}</template>
|
||||
<template #trigger>
|
||||
<q-input
|
||||
|
|
@ -930,7 +932,7 @@ onMounted(async () => {
|
|||
outlined
|
||||
hide-bottom-space
|
||||
class="inputgreen"
|
||||
:model-value="insigniaForm.year !== 0 ? (insigniaForm.year as number) + 543 : null"
|
||||
:model-value="insigniaForm.year != null && insigniaForm.year !== 0 ? (insigniaForm.year as number) + 543 : null"
|
||||
:rules="[
|
||||
(val:string) =>
|
||||
!!val ||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue