diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml index 1d1a287c2..f2ef57f05 100644 --- a/src/i18n/locale/en.yml +++ b/src/i18n/locale/en.yml @@ -1184,7 +1184,7 @@ item: producer: Producer landed: Landed fixedPrice: - itemId: Item ID + itemFk: Item ID groupingPrice: Grouping price packingPrice: Packing price hasMinPrice: Has min price diff --git a/src/i18n/locale/es.yml b/src/i18n/locale/es.yml index db717824a..924a50bfd 100644 --- a/src/i18n/locale/es.yml +++ b/src/i18n/locale/es.yml @@ -1168,7 +1168,7 @@ item: producer: Productor landed: F. entrega fixedPrice: - itemId: ID Artículo + itemFk: ID Artículo groupingPrice: Precio grouping packingPrice: Precio packing hasMinPrice: Tiene precio mínimo diff --git a/src/pages/Item/ItemFixedPrice.vue b/src/pages/Item/ItemFixedPrice.vue index d91b5189e..fddf154a2 100644 --- a/src/pages/Item/ItemFixedPrice.vue +++ b/src/pages/Item/ItemFixedPrice.vue @@ -36,23 +36,23 @@ const user = state.getUser(); const fixedPrices = ref([]); const warehousesOptions = ref([]); const rowsSelected = ref([]); - const itemFixedPriceFilterRef = ref(); - const params = reactive({}); -const defaultColumnAttrs = { - align: 'left', - sortable: true, -}; + onMounted(async () => { stateStore.rightDrawer = true; params.warehouseFk = user.value.warehouseFk; }); onUnmounted(() => (stateStore.rightDrawer = false)); + +const defaultColumnAttrs = { + align: 'left', + sortable: true, +}; const columns = computed(() => [ { - label: t('item.fixedPrice.itemId'), - name: 'itemId', + label: t('item.fixedPrice.itemFk'), + name: 'itemFk', ...defaultColumnAttrs, isId: true, cardVisible: true, @@ -76,16 +76,8 @@ const columns = computed(() => [ name: 'rate2', ...defaultColumnAttrs, cardVisible: true, - columnField: { - class: 'expand', - component: 'input', - type: 'number', - }, - columnFilter: { - class: 'expand', - component: 'input', - type: 'number', - }, + component: 'input', + type: 'number', }, { label: t('item.fixedPrice.packingPrice'), @@ -93,35 +85,18 @@ const columns = computed(() => [ name: 'rate3', ...defaultColumnAttrs, cardVisible: true, - columnField: { - class: 'expand', - component: 'input', - type: 'number', - }, - columnFilter: { - class: 'expand', - component: 'input', - type: 'number', - }, + component: 'input', + type: 'number', }, { label: t('item.fixedPrice.minPrice'), field: 'minPrice', - columnClass: 'shrink', name: 'minPrice', ...defaultColumnAttrs, cardVisible: true, - columnField: { - class: 'expand', - component: 'input', - type: 'number', - }, - columnFilter: { - class: 'expand', - component: 'input', - type: 'number', - }, + component: 'input', + type: 'number', }, { label: t('item.fixedPrice.started'), @@ -162,16 +137,9 @@ const columns = computed(() => [ name: 'warehouseFk', ...defaultColumnAttrs, columnClass: 'shrink', - columnFilter: { - component: 'select', - }, - columnField: { - component: 'select', - class: 'expand', - }, - attrs: { - options: warehousesOptions, - }, + component: 'select', + + options: warehousesOptions, }, { align: 'right', @@ -458,7 +426,7 @@ function handleOnDataSave({ CrudModelRef }) { :default-save="false" data-key="ItemFixedPrices" url="FixedPrices/filter" - :order="['itemFk ASC']" + :order="['description DESC']" save-url="FixedPrices/crud" :user-params="{ warehouseFk: user.warehouseFk }" ref="tableRef" @@ -492,7 +460,7 @@ function handleOnDataSave({ CrudModelRef }) { -