wbuezas
/
salix-front-mindshore-fork2
forked from verdnatura/salix-front
0
0
Fork 0
Code Pull Requests Activity

Merge branch 'dev' into 6797-use-pnpm

This commit is contained in:
Alex Moreno 2024-02-29 09:26:08 +00:00
parent 138e62a5e1 742b87c78e
commit 3c72acda37
3 changed files with 35 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "salix-front", "name": "salix-front",
"version": "24.10.0", "version": "24.12.0",
"description": "Salix frontend", "description": "Salix frontend",
"productName": "Salix", "productName": "Salix",
"author": "Verdnatura", "author": "Verdnatura",

10
src/components/ui/VnRow.vue
View File

@ -1,16 +1,18 @@
<template> <template>
<div id="row" class="q-gutter-md"> <div id="row" class="q-gutter-md q-mb-md">
<slot></slot> <slot></slot>
</div> </div>
</template> </template>
<style lang="scss" scopped> <style lang="scss" scopped>
#row { #row {
display: grid; display: flex;
grid-template-columns: 1fr 1fr; > * {
flex: 1;
}
} }
@media screen and (max-width: 800px) { @media screen and (max-width: 800px) {
#row { #row {
grid-template-columns: 1fr; flex-direction: column;
} }
} }
</style> </style>

10
src/pages/Entry/Card/EntryNotes.vue
View File

@ -50,7 +50,6 @@ onMounted(() => {
:key="index" :key="index"
class="row q-gutter-md q-mb-md" class="row q-gutter-md q-mb-md"
> >
<div class="col-3">
<VnSelectFilter <VnSelectFilter
:label="t('entry.notes.observationType')" :label="t('entry.notes.observationType')"
v-model="row.observationTypeFk" v-model="row.observationTypeFk"
@ -60,15 +59,14 @@ onMounted(() => {
option-value="id" option-value="id"
hide-selected hide-selected
/> />
</div>
<div class="col">
<VnInput <VnInput
:label="t('globals.description')" :label="t('globals.description')"
v-model="row.description" v-model="row.description"
:rules="validate('EntryObservation.description')" :rules="validate('EntryObservation.description')"
/> />
</div>
<div class="col-1 row justify-center items-center"> <div class="row justify-center items-center">
<QIcon <QIcon
name="delete" name="delete"
size="sm" size="sm"
@ -82,7 +80,6 @@ onMounted(() => {
</QIcon> </QIcon>
</div> </div>
</VnRow> </VnRow>
<VnRow>
<QIcon <QIcon
name="add" name="add"
size="sm" size="sm"
@ -94,7 +91,6 @@ onMounted(() => {
{{ t('Add note') }} {{ t('Add note') }}
</QTooltip> </QTooltip>
</QIcon> </QIcon>
</VnRow>
</QCard> </QCard>
</template> </template>
</CrudModel> </CrudModel>