diff --git a/src/components/common/VnCardBeta.vue b/src/components/common/VnCardBeta.vue index 349956be9..a1f07ff17 100644 --- a/src/components/common/VnCardBeta.vue +++ b/src/components/common/VnCardBeta.vue @@ -12,6 +12,7 @@ const props = defineProps({ baseUrl: { type: String, default: undefined }, customUrl: { type: String, default: undefined }, filter: { type: Object, default: () => {} }, + userFilter: { type: Object, default: () => {} }, descriptor: { type: Object, required: true }, filterPanel: { type: Object, default: undefined }, searchDataKey: { type: String, default: undefined }, @@ -32,6 +33,7 @@ const url = computed(() => { const arrayData = useArrayData(props.dataKey, { url: url.value, filter: props.filter, + userFilter: props.userFilter, }); onBeforeMount(async () => { diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml index de3c92b37..c5f0b6490 100644 --- a/src/i18n/locale/en.yml +++ b/src/i18n/locale/en.yml @@ -683,6 +683,9 @@ supplier: consumption: entry: Entry travel: + search: Search travel + searchInfo: You can search by travel id or name + id: Id travelList: tableVisibleColumns: ref: Reference diff --git a/src/i18n/locale/es.yml b/src/i18n/locale/es.yml index aa6dc69ec..1303e90e6 100644 --- a/src/i18n/locale/es.yml +++ b/src/i18n/locale/es.yml @@ -680,6 +680,9 @@ supplier: consumption: entry: Entrada travel: + search: Buscar envío + searchInfo: Buscar envío por id o nombre + id: Id travelList: tableVisibleColumns: ref: Referencia diff --git a/src/pages/Travel/Card/TravelCard.vue b/src/pages/Travel/Card/TravelCard.vue index 9c67428f5..445675b90 100644 --- a/src/pages/Travel/Card/TravelCard.vue +++ b/src/pages/Travel/Card/TravelCard.vue @@ -1,9 +1,8 @@ diff --git a/src/pages/Travel/TravelList.vue b/src/pages/Travel/TravelList.vue index c976678e0..e90c01be2 100644 --- a/src/pages/Travel/TravelList.vue +++ b/src/pages/Travel/TravelList.vue @@ -5,18 +5,18 @@ import { useRouter, useRoute } from 'vue-router'; import VnTable from 'components/VnTable/VnTable.vue'; import { useSummaryDialog } from 'src/composables/useSummaryDialog'; import TravelSummary from './Card/TravelSummary.vue'; -import VnSearchbar from 'components/ui/VnSearchbar.vue'; import { toDate } from 'src/filters'; import { getDateQBadgeColor } from 'src/composables/getDateQBadgeColor.js'; -import RightMenu from 'src/components/common/RightMenu.vue'; import TravelFilter from './TravelFilter.vue'; import VnInputNumber from 'src/components/common/VnInputNumber.vue'; +import VnSection from 'src/components/common/VnSection.vue'; const { viewSummary } = useSummaryDialog(); const router = useRouter(); const { t } = useI18n(); const route = useRoute(); const tableRef = ref(); +const dataKey = 'TravelList'; const $props = defineProps({ id: { type: Number, @@ -196,90 +196,93 @@ const columns = computed(() => [