diff --git a/src/pages/Item/ItemFixedPrice.vue b/src/pages/Item/ItemFixedPrice.vue index 11b57b3e2..846b15651 100644 --- a/src/pages/Item/ItemFixedPrice.vue +++ b/src/pages/Item/ItemFixedPrice.vue @@ -7,7 +7,7 @@ import { beforeSave } from 'src/composables/updateMinPriceBeforeSave'; import FetchedTags from 'components/ui/FetchedTags.vue'; import VnSelect from 'src/components/common/VnSelect.vue'; -import EditFixedPriceForm from 'src/components/EditFixedPriceForm.vue'; +import EditFixedPriceForm from 'src/pages/Item/components/EditFixedPriceForm.vue'; import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue'; import RightMenu from 'src/components/common/RightMenu.vue'; import VnTable from 'src/components/VnTable/VnTable.vue'; @@ -17,7 +17,7 @@ import { toDate } from 'src/filters'; import { isLower, isBigger } from 'src/filters/date.js'; import ItemFixedPriceFilter from './ItemFixedPriceFilter.vue'; import ItemDescriptorProxy from './Card/ItemDescriptorProxy.vue'; -import CloneFixedPriceForm from 'src/components/CloneFixedPriceForm.vue'; +import CloneFixedPriceForm from 'src/pages/Item/components/CloneFixedPriceForm.vue'; const stateStore = useStateStore(); const { t } = useI18n(); @@ -39,7 +39,14 @@ const columns = computed(() => [ label: t('item.fixedPrice.itemFk'), labelAbbreviation: 'Id', toolTip: t('item.fixedPrice.itemFk'), - component: 'number', + component: 'select', + attrs: { + url: 'Items', + fields: ['id', 'name', 'subName'], + optionLabel: 'name', + optionValue: 'id', + uppercase: false, + }, columnFilter: { inWhere: true, }, @@ -62,14 +69,7 @@ const columns = computed(() => [ label: t('globals.name'), name: 'name', create: true, - component: 'select', - attrs: { - url: 'Items', - fields: ['id', 'name', 'subName'], - optionLabel: 'name', - optionValue: 'name', - uppercase: false, - }, + component: 'input', isEditable: false, }, { @@ -232,7 +232,7 @@ const dateStyle = (date) => v-model:selected="selectedRows" :create="{ urlCreate: 'FixedPrices', - title: t('Create buy'), + title: t('Create fixed price'), formInitialData: {}, onDataSaved: () => tableRef.reload(), showSaveAndContinueBtn: true, @@ -398,4 +398,5 @@ tbody tr.highlight .q-td { es: Add fixed price: AƱadir precio fijado Edit fixed price(s): Editar precio(s) fijado(s) + Create fixed price: Crear precio fijado diff --git a/src/components/CloneFixedPriceForm.vue b/src/pages/Item/components/CloneFixedPriceForm.vue similarity index 100% rename from src/components/CloneFixedPriceForm.vue rename to src/pages/Item/components/CloneFixedPriceForm.vue diff --git a/src/components/EditFixedPriceForm.vue b/src/pages/Item/components/EditFixedPriceForm.vue similarity index 91% rename from src/components/EditFixedPriceForm.vue rename to src/pages/Item/components/EditFixedPriceForm.vue index 2def7fa3d..d904c7d14 100644 --- a/src/components/EditFixedPriceForm.vue +++ b/src/pages/Item/components/EditFixedPriceForm.vue @@ -66,8 +66,9 @@ const closeForm = () => { {{ t('Edit') }} {{ ` ${rows.length} ` }} {{ t('buy(s)') }} - + { v-model="selectedField" data-cy="EditFixedPriceSelectOption" @update:model-value="newValue = null" + :class="{ 'is-select': selectedField?.component === 'select' }" /> { } + + es: Edit: Editar