refactor: refs #8363 requested changes
gitea/salix-front/pipeline/pr-dev This commit looks good
Details
gitea/salix-front/pipeline/pr-dev This commit looks good
Details
This commit is contained in:
parent
461d48c69d
commit
bbd771e61d
|
@ -7,7 +7,7 @@ import { beforeSave } from 'src/composables/updateMinPriceBeforeSave';
|
||||||
|
|
||||||
import FetchedTags from 'components/ui/FetchedTags.vue';
|
import FetchedTags from 'components/ui/FetchedTags.vue';
|
||||||
import VnSelect from 'src/components/common/VnSelect.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 VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
|
||||||
import RightMenu from 'src/components/common/RightMenu.vue';
|
import RightMenu from 'src/components/common/RightMenu.vue';
|
||||||
import VnTable from 'src/components/VnTable/VnTable.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 { isLower, isBigger } from 'src/filters/date.js';
|
||||||
import ItemFixedPriceFilter from './ItemFixedPriceFilter.vue';
|
import ItemFixedPriceFilter from './ItemFixedPriceFilter.vue';
|
||||||
import ItemDescriptorProxy from './Card/ItemDescriptorProxy.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 stateStore = useStateStore();
|
||||||
const { t } = useI18n();
|
const { t } = useI18n();
|
||||||
|
@ -39,7 +39,14 @@ const columns = computed(() => [
|
||||||
label: t('item.fixedPrice.itemFk'),
|
label: t('item.fixedPrice.itemFk'),
|
||||||
labelAbbreviation: 'Id',
|
labelAbbreviation: 'Id',
|
||||||
toolTip: t('item.fixedPrice.itemFk'),
|
toolTip: t('item.fixedPrice.itemFk'),
|
||||||
component: 'number',
|
component: 'select',
|
||||||
|
attrs: {
|
||||||
|
url: 'Items',
|
||||||
|
fields: ['id', 'name', 'subName'],
|
||||||
|
optionLabel: 'name',
|
||||||
|
optionValue: 'id',
|
||||||
|
uppercase: false,
|
||||||
|
},
|
||||||
columnFilter: {
|
columnFilter: {
|
||||||
inWhere: true,
|
inWhere: true,
|
||||||
},
|
},
|
||||||
|
@ -62,14 +69,7 @@ const columns = computed(() => [
|
||||||
label: t('globals.name'),
|
label: t('globals.name'),
|
||||||
name: 'name',
|
name: 'name',
|
||||||
create: true,
|
create: true,
|
||||||
component: 'select',
|
component: 'input',
|
||||||
attrs: {
|
|
||||||
url: 'Items',
|
|
||||||
fields: ['id', 'name', 'subName'],
|
|
||||||
optionLabel: 'name',
|
|
||||||
optionValue: 'name',
|
|
||||||
uppercase: false,
|
|
||||||
},
|
|
||||||
isEditable: false,
|
isEditable: false,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
@ -232,7 +232,7 @@ const dateStyle = (date) =>
|
||||||
v-model:selected="selectedRows"
|
v-model:selected="selectedRows"
|
||||||
:create="{
|
:create="{
|
||||||
urlCreate: 'FixedPrices',
|
urlCreate: 'FixedPrices',
|
||||||
title: t('Create buy'),
|
title: t('Create fixed price'),
|
||||||
formInitialData: {},
|
formInitialData: {},
|
||||||
onDataSaved: () => tableRef.reload(),
|
onDataSaved: () => tableRef.reload(),
|
||||||
showSaveAndContinueBtn: true,
|
showSaveAndContinueBtn: true,
|
||||||
|
@ -398,4 +398,5 @@ tbody tr.highlight .q-td {
|
||||||
es:
|
es:
|
||||||
Add fixed price: Añadir precio fijado
|
Add fixed price: Añadir precio fijado
|
||||||
Edit fixed price(s): Editar precio(s) fijado(s)
|
Edit fixed price(s): Editar precio(s) fijado(s)
|
||||||
|
Create fixed price: Crear precio fijado
|
||||||
</i18n>
|
</i18n>
|
||||||
|
|
|
@ -66,8 +66,9 @@ const closeForm = () => {
|
||||||
<span class="title">{{ t('Edit') }}</span>
|
<span class="title">{{ t('Edit') }}</span>
|
||||||
<span class="countLines">{{ ` ${rows.length} ` }}</span>
|
<span class="countLines">{{ ` ${rows.length} ` }}</span>
|
||||||
<span class="title">{{ t('buy(s)') }}</span>
|
<span class="title">{{ t('buy(s)') }}</span>
|
||||||
<VnRow>
|
<VnRow class="q-mt-md">
|
||||||
<VnSelect
|
<VnSelect
|
||||||
|
class="editOption"
|
||||||
:label="t('Field to edit')"
|
:label="t('Field to edit')"
|
||||||
:options="fieldsOptions"
|
:options="fieldsOptions"
|
||||||
hide-selected
|
hide-selected
|
||||||
|
@ -75,6 +76,7 @@ const closeForm = () => {
|
||||||
v-model="selectedField"
|
v-model="selectedField"
|
||||||
data-cy="EditFixedPriceSelectOption"
|
data-cy="EditFixedPriceSelectOption"
|
||||||
@update:model-value="newValue = null"
|
@update:model-value="newValue = null"
|
||||||
|
:class="{ 'is-select': selectedField?.component === 'select' }"
|
||||||
/>
|
/>
|
||||||
<component
|
<component
|
||||||
:is="inputs[selectedField?.component || 'input']"
|
:is="inputs[selectedField?.component || 'input']"
|
||||||
|
@ -129,6 +131,15 @@ const closeForm = () => {
|
||||||
}
|
}
|
||||||
</style>
|
</style>
|
||||||
|
|
||||||
|
<style lang="scss">
|
||||||
|
.editOption .q-field__inner .q-field__control {
|
||||||
|
padding: 0 !important;
|
||||||
|
}
|
||||||
|
.editOption.is-select .q-field__inner .q-field__control {
|
||||||
|
padding: 1px !important;
|
||||||
|
}
|
||||||
|
</style>
|
||||||
|
|
||||||
<i18n>
|
<i18n>
|
||||||
es:
|
es:
|
||||||
Edit: Editar
|
Edit: Editar
|
Loading…
Reference in New Issue