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

Merge branch 'dev' of https: refs #7283//gitea.verdnatura.es/verdnatura/salix-front into 7283-itemMigration

This commit is contained in:
Carlos Satorres 2024-10-23 09:54:25 +02:00
parent b40af0ce7b 3cbd294168
commit d2da1e3544
3 changed files with 36 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/components/VnSelectProvince.vue
View File

@ -1,5 +1,5 @@
<script setup> <script setup>
import { ref, watch } from 'vue'; import { ref } from 'vue';
import { useValidator } from 'src/composables/useValidator'; import { useValidator } from 'src/composables/useValidator';
import { useI18n } from 'vue-i18n'; import { useI18n } from 'vue-i18n';

24
src/pages/Item/ItemTypeCreate.vue
View File

@ -52,15 +52,27 @@ const redirectToItemTypeBasicData = (_, { id }) => {
</VnRow> </VnRow>
<VnRow> <VnRow>
<VnSelect <VnSelect
url="Workers/search"
v-model="data.workerFk" v-model="data.workerFk"
:label="t('itemType.shared.worker')" :label="t('shared.worker')"
url="Workers" sort-by="nickname ASC"
sort-by="firstName ASC" :fields="['id', 'nickname']"
:fields="['id', 'firstName']" :params="{ departmentCodes: ['shopping'] }"
option-label="nickname"
option-value="id" option-value="id"
option-label="firstName"
hide-selected hide-selected
/> ><template #option="scope">
<QItem v-bind="scope.itemProps">
<QItemSection>
<QItemLabel>{{ scope.opt?.name }}</QItemLabel>
<QItemLabel caption
>{{ scope.opt?.nickname }},
{{ scope.opt?.code }}</QItemLabel
>
</QItemSection>
</QItem>
</template>
</VnSelect>
<VnSelect <VnSelect
v-model="data.categoryFk" v-model="data.categoryFk"
:label="t('itemType.shared.category')" :label="t('itemType.shared.category')"

22
src/pages/ItemType/Card/ItemTypeBasicData.vue
View File

@ -41,15 +41,27 @@ const temperaturesOptions = ref([]);
</VnRow> </VnRow>
<VnRow> <VnRow>
<VnSelect <VnSelect
url="Workers/search"
v-model="data.workerFk" v-model="data.workerFk"
:label="t('shared.worker')" :label="t('shared.worker')"
url="Workers" sort-by="nickname ASC"
sort-by="firstName ASC" :fields="['id', 'nickname']"
:fields="['id', 'firstName']" :params="{ departmentCodes: ['shopping'] }"
option-label="nickname"
option-value="id" option-value="id"
option-label="firstName"
hide-selected hide-selected
/> ><template #option="scope">
<QItem v-bind="scope.itemProps">
<QItemSection>
<QItemLabel>{{ scope.opt?.name }}</QItemLabel>
<QItemLabel caption
>{{ scope.opt?.nickname }},
{{ scope.opt?.code }}</QItemLabel
>
</QItemSection>
</QItem>
</template></VnSelect
>
<VnSelect <VnSelect
v-model="data.categoryFk" v-model="data.categoryFk"
:label="t('shared.category')" :label="t('shared.category')"