verdnatura/salix-front
verdnatura
/
salix-front
2
2
Fork 1
Code Issues Pull Requests 99 Releases Wiki Activity

8231_testToMaster_2448 #997

Merged
alexm merged 400 commits from 8231_testToMaster_2448 into master 2024-11-26 06:28:29 +00:00
Conversation 2 Commits 400 Files Changed 268 +4 -12
2 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 494fc66c06 - Show all commits

15
src/pages/Item/ItemTypeList.vue
View File

@ -7,7 +7,6 @@ import FetchData from 'components/FetchData.vue';
const { t } = useI18n(); const { t } = useI18n();
const tableRef = ref(); const tableRef = ref();
const workerOptions = ref([]);
const ItemCategoriesOptions = ref([]); const ItemCategoriesOptions = ref([]);
const columns = computed(() => [ const columns = computed(() => [
@ -40,12 +39,12 @@ const columns = computed(() => [
create: true, create: true,
component: 'select', component: 'select',
attrs: { attrs: {
options: workerOptions.value, url: 'Workers/search',
optionLabel: 'firstName', optionLabel: 'nickname',
optionValue: 'id', optionValue: 'id',
}, },
cardVisible: false, cardVisible: true,
visible: false, visible: true,
}, },
{ {
align: 'left', align: 'left',
@ -78,12 +77,6 @@ const columns = computed(() => [
</script> </script>
<template> <template>
<FetchData
url="Workers"
:filter="{ fields: ['id', 'firstName'], order: ['firstName ASC'] }"
@on-fetch="(data) => (workerOptions = data)"
auto-load
/>
<FetchData <FetchData
url="ItemCategories" url="ItemCategories"
:filter="{ fields: ['id', 'name'], order: ['name ASC'] }" :filter="{ fields: ['id', 'name'], order: ['name ASC'] }"

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

@ -58,7 +58,6 @@ const itemPackingTypesOptions = ref([]);
:label="t('shared.worker')" :label="t('shared.worker')"
sort-by="nickname ASC" sort-by="nickname ASC"
:fields="['id', 'nickname']" :fields="['id', 'nickname']"
:params="{ departmentCodes: ['shopping'] }"
option-label="nickname" option-label="nickname"
option-value="id" option-value="id"
hide-selected hide-selected