verdnatura/salix-front
verdnatura
/
salix-front
2
2
Fork 1
Code Issues Pull Requests 99 Releases Wiki Activity

7729-devToTest_2430 #554

Merged
alexm merged 401 commits from 7729-devToTest_2430 into test 2024-07-16 07:17:04 +00:00
Conversation 0 Commits 401 Files Changed 191 +7 -4
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 218cc47834 - Show all commits

9
src/pages/Order/Card/OrderCard.vue
View File

@ -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
@ -10,7 +11,9 @@ import OrderFilter from './OrderFilter.vue';
:descriptor="OrderDescriptor" :descriptor="OrderDescriptor"
:filter-panel="OrderFilter" :filter-panel="OrderFilter"
search-data-key="OrderList" search-data-key="OrderList"
searchbar-label="Search order" >
searchbar-info="ypu can search by order id or name" <template #searchbar>
/> <OrderSearchbar />
</template>
</VnCard>
</template> </template>

2
src/pages/Travel/Card/TravelCard.vue
View File

@ -37,7 +37,7 @@ const filter = {
search-data-key="TravelList" search-data-key="TravelList"
searchbar-label="Search travel" searchbar-label="Search travel"
searchbar-info="You can search by travel id or name" searchbar-info="You can search by travel id or name"
search-url="Travels" search-url="Travels/filter"
:filter="filter" :filter="filter"
:descriptor="TravelDescriptor" :descriptor="TravelDescriptor"
/> />