diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml index 373773635..d5ceaeba5 100644 --- a/src/i18n/locale/en.yml +++ b/src/i18n/locale/en.yml @@ -46,6 +46,7 @@ globals: noPinnedModules: You don't have any pinned modules summary: basicData: Basic data + daysOnward: Days onward today: Today yesterday: Yesterday dateFormat: en-GB diff --git a/src/i18n/locale/es.yml b/src/i18n/locale/es.yml index f8c6363c2..d42064666 100644 --- a/src/i18n/locale/es.yml +++ b/src/i18n/locale/es.yml @@ -45,6 +45,7 @@ globals: noPinnedModules: No has fijado ningún módulo summary: basicData: Datos básicos + daysOnward: Días adelante today: Hoy yesterday: Ayer dateFormat: es-ES diff --git a/src/pages/Entry/MyEntries.vue b/src/pages/Entry/MyEntries.vue index 58a69f70c..d4b73b479 100644 --- a/src/pages/Entry/MyEntries.vue +++ b/src/pages/Entry/MyEntries.vue @@ -7,6 +7,7 @@ import { toDate } from 'src/filters/index'; import { useQuasar } from 'quasar'; import EntryBuysTableDialog from './EntryBuysTableDialog.vue'; import VnTable from 'components/VnTable/VnTable.vue'; +import VnInput from 'src/components/common/VnInput.vue'; const stateStore = useStateStore(); const { t } = useI18n(); @@ -34,6 +35,10 @@ const columns = computed(() => [ isTitle: false, create: true, cardVisible: true, + component: 'date', + columnField: { + component: null, + }, format: ({ shipped }) => toDate(shipped), }, { @@ -43,6 +48,10 @@ const columns = computed(() => [ isTitle: false, create: true, cardVisible: false, + component: 'date', + columnField: { + component: null, + }, format: ({ landed }) => toDate(landed), }, { @@ -93,14 +102,23 @@ const printBuys = (rowId) => { :columns="columns" default-mode="card" auto-load + :right-search="true" > + + + -es: - Search entries: Buscar entradas You can search by entry reference: Puedes buscar por referencia de la entrada diff --git a/src/pages/Item/ItemRequestFilter.vue b/src/pages/Item/ItemRequestFilter.vue index 2fbe849d1..c9340dc1f 100644 --- a/src/pages/Item/ItemRequestFilter.vue +++ b/src/pages/Item/ItemRequestFilter.vue @@ -209,7 +209,7 @@ const decrement = (paramsObj, key) => { -import { ref } from 'vue'; -import { useI18n } from 'vue-i18n'; - -import VnFilterPanel from 'src/components/ui/VnFilterPanel.vue'; -import VnSelect from 'src/components/common/VnSelect.vue'; -import FetchData from 'components/FetchData.vue'; -import VnInputDate from 'components/common/VnInputDate.vue'; - -const { t } = useI18n(); -const props = defineProps({ - dataKey: { - type: String, - required: true, - }, -}); - -const warehousesOptions = ref([]); -const continentsOptions = ref([]); -const agenciesOptions = ref([]); - -const add = (paramsObj, key) => { - if (paramsObj[key] === undefined) { - paramsObj[key] = 1; - } else { - paramsObj[key]++; - } -}; - -const decrement = (paramsObj, key) => { - if (paramsObj[key] === 0) return; - - paramsObj[key]--; -}; - - - - (warehousesOptions = data)" - auto-load - /> - (continentsOptions = data)" - auto-load - /> - (agenciesOptions = data)" - auto-load - /> - - - - - {{ t(`params.${tag.label}`) }}: - {{ formatFn(tag.value) }} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -en: - params: - search: Id/Reference - landedFrom: Landed from - landedTo: Landed to - continent: Continent out - totalEntries: Total entries -es: - params: - search: Id/Referencia - landedFrom: Llegada desde - landedTo: Llegada hasta - continent: Cont. Salida - totalEntries: Ent. totales - - diff --git a/src/pages/Travel/locale/en.yml b/src/pages/Travel/locale/en.yml deleted file mode 100644 index c67eddce0..000000000 --- a/src/pages/Travel/locale/en.yml +++ /dev/null @@ -1,6 +0,0 @@ -travelFilter: - filter: - warehouseOutFk: Warehouse Out - warehouseInFk: Warehouse In - agencyModeFk: Agency - scopeDays: Days onward diff --git a/src/pages/Travel/locale/es.yml b/src/pages/Travel/locale/es.yml deleted file mode 100644 index 8e958c074..000000000 --- a/src/pages/Travel/locale/es.yml +++ /dev/null @@ -1,6 +0,0 @@ -travelFilter: - filter: - warehouseInFk: Alm. entrada - warehouseOutFk: Alm. salida - agencyModeFk: Agencia - scopeDays: Días adelante