Merge branch 'develop' into dev
All checks were successful
Build & Deploy on Dev / build (push) Successful in 2m50s
All checks were successful
Build & Deploy on Dev / build (push) Successful in 2m50s
This commit is contained in:
commit
141a5e40d6
2 changed files with 3 additions and 2 deletions
|
|
@ -304,7 +304,7 @@ function onClickOpenDialog() {
|
|||
id.value = informaData.value.id;
|
||||
age.value = calculateAge(informaData.value.birthDate);
|
||||
formData.citizenId = informaData.value.citizenId;
|
||||
formData.prefix = informaData.value.prefixMain;
|
||||
formData.prefix = informaData.value.prefix;
|
||||
formData.rank = informaData.value.rank;
|
||||
formData.firstName = informaData.value.firstName;
|
||||
formData.lastName = informaData.value.lastName;
|
||||
|
|
@ -590,6 +590,7 @@ onMounted(() => {
|
|||
<div class="col-xs-6 col-sm-6 col-md-6">
|
||||
<q-select
|
||||
:readonly="checkPermission($route)?.attrOwnership !== 'OWNER'"
|
||||
:class="checkPermission($route)?.attrOwnership === 'OWNER' ? 'inputgreen' : ''"
|
||||
dense
|
||||
outlined
|
||||
use-input
|
||||
|
|
|
|||
|
|
@ -565,7 +565,7 @@ onMounted(async () => {
|
|||
:class="props.row.isEntry ? 'text-grey' : ''"
|
||||
>
|
||||
<div class="table_ellipsis">
|
||||
{{ col.value }}
|
||||
{{ col.value ? col.value : "-" }}
|
||||
</div>
|
||||
</q-td>
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue