fix: refs #6891 rollback order & route searchbar
gitea/salix-front/pipeline/pr-dev There was a failure building this commit
Details
gitea/salix-front/pipeline/pr-dev There was a failure building this commit
Details
This commit is contained in:
parent
097e25a0b8
commit
0703de350c
|
@ -2,6 +2,7 @@
|
||||||
import VnCard from 'components/common/VnCard.vue';
|
import VnCard from 'components/common/VnCard.vue';
|
||||||
import OrderDescriptor from 'pages/Order/Card/OrderDescriptor.vue';
|
import OrderDescriptor from 'pages/Order/Card/OrderDescriptor.vue';
|
||||||
import OrderFilter from './OrderFilter.vue';
|
import OrderFilter from './OrderFilter.vue';
|
||||||
|
import OrderSearchbar from './OrderSearchbar.vue';
|
||||||
</script>
|
</script>
|
||||||
<template>
|
<template>
|
||||||
<VnCard
|
<VnCard
|
||||||
|
@ -9,9 +10,10 @@ import OrderFilter from './OrderFilter.vue';
|
||||||
base-url="Orders"
|
base-url="Orders"
|
||||||
:descriptor="OrderDescriptor"
|
:descriptor="OrderDescriptor"
|
||||||
:filter-panel="OrderFilter"
|
:filter-panel="OrderFilter"
|
||||||
searchbar-data-key="OrderList"
|
search-data-key="OrderList"
|
||||||
searchbar-url="Orders/filter"
|
>
|
||||||
searchbar-label="Search order"
|
<template #searchbar>
|
||||||
searchbar-info="You can search order by reference"
|
<OrderSearchbar />
|
||||||
/>
|
</template>
|
||||||
|
</VnCard>
|
||||||
</template>
|
</template>
|
||||||
|
|
|
@ -0,0 +1,22 @@
|
||||||
|
<script setup>
|
||||||
|
import { useI18n } from 'vue-i18n';
|
||||||
|
import VnSearchbar from 'components/ui/VnSearchbar.vue';
|
||||||
|
|
||||||
|
const { t } = useI18n();
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<template>
|
||||||
|
<VnSearchbar
|
||||||
|
data-key="OrderList"
|
||||||
|
url="Orders/filter"
|
||||||
|
:label="t('Search order')"
|
||||||
|
:info="t('You can search orders by reference')"
|
||||||
|
/>
|
||||||
|
</template>
|
||||||
|
|
||||||
|
<style scoped lang="scss"></style>
|
||||||
|
<i18n>
|
||||||
|
es:
|
||||||
|
Search order: Buscar orden
|
||||||
|
You can search orders by reference: Puedes buscar por referencia de la orden
|
||||||
|
</i18n>
|
|
@ -9,7 +9,7 @@ import WorkerDescriptorProxy from 'pages/Worker/Card/WorkerDescriptorProxy.vue';
|
||||||
import CustomerDescriptorProxy from 'pages/Customer/Card/CustomerDescriptorProxy.vue';
|
import CustomerDescriptorProxy from 'pages/Customer/Card/CustomerDescriptorProxy.vue';
|
||||||
import VnPaginate from 'components/ui/VnPaginate.vue';
|
import VnPaginate from 'components/ui/VnPaginate.vue';
|
||||||
import VnLv from 'components/ui/VnLv.vue';
|
import VnLv from 'components/ui/VnLv.vue';
|
||||||
import VnSearchbar from 'src/components/ui/VnSearchbar.vue';
|
import OrderSearchbar from 'pages/Order/Card/OrderSearchbar.vue';
|
||||||
import OrderFilter from 'pages/Order/Card/OrderFilter.vue';
|
import OrderFilter from 'pages/Order/Card/OrderFilter.vue';
|
||||||
import OrderSummary from 'pages/Order/Card/OrderSummary.vue';
|
import OrderSummary from 'pages/Order/Card/OrderSummary.vue';
|
||||||
import { useSummaryDialog } from 'src/composables/useSummaryDialog';
|
import { useSummaryDialog } from 'src/composables/useSummaryDialog';
|
||||||
|
@ -30,11 +30,7 @@ function navigate(id) {
|
||||||
<template>
|
<template>
|
||||||
<template v-if="stateStore.isHeaderMounted()">
|
<template v-if="stateStore.isHeaderMounted()">
|
||||||
<Teleport to="#searchbar">
|
<Teleport to="#searchbar">
|
||||||
<VnSearchbar
|
<OrderSearchbar />
|
||||||
data-key="OrderList"
|
|
||||||
:label="t('Search order')"
|
|
||||||
:info="t('You can search orders by reference')"
|
|
||||||
/>
|
|
||||||
</Teleport>
|
</Teleport>
|
||||||
<Teleport to="#actions-append">
|
<Teleport to="#actions-append">
|
||||||
<div class="row q-gutter-x-sm">
|
<div class="row q-gutter-x-sm">
|
||||||
|
|
|
@ -1,2 +0,0 @@
|
||||||
Search order: Buscar orden
|
|
||||||
You can search orders by reference: Puedes buscar por referencia de la orden
|
|
|
@ -2,6 +2,7 @@
|
||||||
import VnCard from 'components/common/VnCard.vue';
|
import VnCard from 'components/common/VnCard.vue';
|
||||||
import RouteDescriptor from 'pages/Route/Card/RouteDescriptor.vue';
|
import RouteDescriptor from 'pages/Route/Card/RouteDescriptor.vue';
|
||||||
import RouteFilter from './RouteFilter.vue';
|
import RouteFilter from './RouteFilter.vue';
|
||||||
|
import RouteSearchbar from 'pages/Route/Card/RouteSearchbar.vue';
|
||||||
</script>
|
</script>
|
||||||
<template>
|
<template>
|
||||||
<VnCard
|
<VnCard
|
||||||
|
@ -9,9 +10,10 @@ import RouteFilter from './RouteFilter.vue';
|
||||||
base-url="Routes"
|
base-url="Routes"
|
||||||
:descriptor="RouteDescriptor"
|
:descriptor="RouteDescriptor"
|
||||||
:filter-panel="RouteFilter"
|
:filter-panel="RouteFilter"
|
||||||
searchbar-data-key="RouteList"
|
search-data-key="RouteList"
|
||||||
searchbar-label="searchLabel"
|
>
|
||||||
searchbar-info="searchInfo"
|
<template #searchbar>
|
||||||
custom-route-redirect-name="RouteList"
|
<RouteSearchbar />
|
||||||
/>
|
</template>
|
||||||
|
</VnCard>
|
||||||
</template>
|
</template>
|
||||||
|
|
|
@ -0,0 +1,21 @@
|
||||||
|
<script setup>
|
||||||
|
import VnSearchbar from 'components/ui/VnSearchbar.vue';
|
||||||
|
import { useI18n } from 'vue-i18n';
|
||||||
|
const { t } = useI18n();
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<template>
|
||||||
|
<VnSearchbar
|
||||||
|
data-key="RouteList"
|
||||||
|
:label="t('Search route')"
|
||||||
|
:info="t('You can search by route reference')"
|
||||||
|
custom-route-redirect-name="RouteList"
|
||||||
|
/>
|
||||||
|
</template>
|
||||||
|
|
||||||
|
<style scoped lang="scss"></style>
|
||||||
|
<i18n>
|
||||||
|
es:
|
||||||
|
Search route: Buscar rutas
|
||||||
|
You can search by route reference: Puedes buscar por referencia de la ruta
|
||||||
|
</i18n>
|
|
@ -11,7 +11,7 @@ import VnInputDate from 'components/common/VnInputDate.vue';
|
||||||
import VnInput from 'components/common/VnInput.vue';
|
import VnInput from 'components/common/VnInput.vue';
|
||||||
import VnInputTime from 'components/common/VnInputTime.vue';
|
import VnInputTime from 'components/common/VnInputTime.vue';
|
||||||
import axios from 'axios';
|
import axios from 'axios';
|
||||||
import VnSearchbar from 'src/components/ui/VnSearchbar.vue';
|
import RouteSearchbar from 'pages/Route/Card/RouteSearchbar.vue';
|
||||||
import RouteFilter from 'pages/Route/Card/RouteFilter.vue';
|
import RouteFilter from 'pages/Route/Card/RouteFilter.vue';
|
||||||
import RouteSummary from 'pages/Route/Card/RouteSummary.vue';
|
import RouteSummary from 'pages/Route/Card/RouteSummary.vue';
|
||||||
import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
|
import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
|
||||||
|
@ -179,12 +179,7 @@ const openTicketsDialog = (id) => {
|
||||||
<template>
|
<template>
|
||||||
<template v-if="stateStore.isHeaderMounted()">
|
<template v-if="stateStore.isHeaderMounted()">
|
||||||
<Teleport to="#searchbar">
|
<Teleport to="#searchbar">
|
||||||
<VnSearchbar
|
<RouteSearchbar />
|
||||||
data-key="RouteList"
|
|
||||||
:label="t('Search route')"
|
|
||||||
:info="t('You can search by route reference')"
|
|
||||||
custom-route-redirect-name="RouteList"
|
|
||||||
/>
|
|
||||||
</Teleport>
|
</Teleport>
|
||||||
<Teleport to="#actions-append">
|
<Teleport to="#actions-append">
|
||||||
<div class="row q-gutter-x-sm">
|
<div class="row q-gutter-x-sm">
|
||||||
|
|
|
@ -1,2 +0,0 @@
|
||||||
searchLabel: Search route
|
|
||||||
searchInfo: You can search by route reference
|
|
|
@ -1,3 +0,0 @@
|
||||||
route:
|
|
||||||
searchLabel: Buscar rutas
|
|
||||||
searchInfo: Puedes buscar por referencia de la ruta
|
|
Loading…
Reference in New Issue