diff --git a/src/components/CrudModel.vue b/src/components/CrudModel.vue index fa7761c5f..a55bde6f2 100644 --- a/src/components/CrudModel.vue +++ b/src/components/CrudModel.vue @@ -10,7 +10,6 @@ import VnPaginate from 'components/ui/VnPaginate.vue'; import VnConfirm from 'components/ui/VnConfirm.vue'; import SkeletonTable from 'components/ui/SkeletonTable.vue'; import { tMobile } from 'src/composables/tMobile'; -import VnSubToolbar from './ui/VnSubToolbar.vue'; const { push } = useRouter(); const quasar = useQuasar(); diff --git a/src/components/ui/VnFilterPanel.vue b/src/components/ui/VnFilterPanel.vue index 2ea51ed8b..084f482d6 100644 --- a/src/components/ui/VnFilterPanel.vue +++ b/src/components/ui/VnFilterPanel.vue @@ -58,6 +58,7 @@ const $props = defineProps({ }, }); +defineExpose({ search }); const emit = defineEmits([ 'update:modelValue', 'refresh', @@ -192,6 +193,14 @@ function formatValue(value) { </script> <template> + <QBtn + class="q-mt-lg q-mr-xs q-mb-lg" + round + color="primary" + style="position: fixed; z-index: 1; right: 0; bottom: 0" + icon="search" + @click="search()" + ></QBtn> <QForm @submit="search" id="filterPanelForm"> <QList dense> <QItem class="q-mt-xs"> @@ -265,23 +274,6 @@ function formatValue(value) { <QList dense class="list q-gutter-y-sm q-mt-sm"> <slot name="body" :params="userParams" :search-fn="search"></slot> </QList> - <template v-if="$props.searchButton"> - <QItem> - <QItemSection class="q-py-sm"> - <QBtn - :label="t('Search')" - class="full-width" - color="primary" - dense - icon="search" - rounded - :type="disableSubmitEvent ? 'button' : 'submit'" - unelevated - /> - </QItemSection> - </QItem> - <QSeparator /> - </template> </QForm> <QInnerLoading :label="t('globals.pleaseWait')" diff --git a/src/components/ui/VnImg.vue b/src/components/ui/VnImg.vue index 8d747963b..985c9cc53 100644 --- a/src/components/ui/VnImg.vue +++ b/src/components/ui/VnImg.vue @@ -28,7 +28,7 @@ const $props = defineProps({ const show = ref(false); const token = useSession().getTokenMultimedia(); const timeStamp = ref(`timestamp=${Date.now()}`); -import noImage from '/public/no-user.png'; +import noImage from '/no-user.png'; import { useRole } from 'src/composables/useRole'; const url = computed(() => { const isEmployee = useRole().isEmployee(); diff --git a/src/pages/Entry/Card/EntrySummary.vue b/src/pages/Entry/Card/EntrySummary.vue index 7b92b29d4..fe530795c 100644 --- a/src/pages/Entry/Card/EntrySummary.vue +++ b/src/pages/Entry/Card/EntrySummary.vue @@ -1,5 +1,5 @@ <script setup> -import { onMounted, ref, computed, onUpdated } from 'vue'; +import { onMounted, ref, computed } from 'vue'; import { useRoute } from 'vue-router'; import { useI18n } from 'vue-i18n'; diff --git a/src/pages/Entry/EntryLatestBuys.vue b/src/pages/Entry/EntryLatestBuys.vue index dca32c08d..176820668 100644 --- a/src/pages/Entry/EntryLatestBuys.vue +++ b/src/pages/Entry/EntryLatestBuys.vue @@ -1,5 +1,5 @@ <script setup> -import { onMounted, ref, computed, reactive, onUnmounted } from 'vue'; +import { onMounted, onUnmounted } from 'vue'; import { useI18n } from 'vue-i18n'; import RightMenu from 'src/components/common/RightMenu.vue'; import VnTable from 'components/VnTable/VnTable.vue'; diff --git a/src/pages/Entry/EntryList.vue b/src/pages/Entry/EntryList.vue index fe719db6e..1d00b5af5 100644 --- a/src/pages/Entry/EntryList.vue +++ b/src/pages/Entry/EntryList.vue @@ -1,8 +1,6 @@ <script setup> import { onMounted, ref, computed } from 'vue'; import { useI18n } from 'vue-i18n'; -import { useRouter } from 'vue-router'; -import { useRoute } from 'vue-router'; import EntryFilter from './EntryFilter.vue'; import VnSearchbar from 'src/components/ui/VnSearchbar.vue'; import { useStateStore } from 'stores/useStateStore'; @@ -12,8 +10,6 @@ import { toDate } from 'src/filters'; const stateStore = useStateStore(); const { t } = useI18n(); -const route = useRoute(); -const entityId = computed(() => route.params.id); const tableRef = ref(); const entryFilter = { diff --git a/src/pages/Ticket/TicketFilter.vue b/src/pages/Ticket/TicketFilter.vue index 63ac48393..53fe46dfc 100644 --- a/src/pages/Ticket/TicketFilter.vue +++ b/src/pages/Ticket/TicketFilter.vue @@ -6,7 +6,6 @@ import FetchData from 'components/FetchData.vue'; import VnFilterPanel from 'src/components/ui/VnFilterPanel.vue'; import VnInput from 'src/components/common/VnInput.vue'; -import toDateString from 'filters/toDateString'; import VnInputDate from 'components/common/VnInputDate.vue'; const { t } = useI18n(); diff --git a/src/pages/Ticket/TicketList.vue b/src/pages/Ticket/TicketList.vue index 16d7aac5d..ae635fb4e 100644 --- a/src/pages/Ticket/TicketList.vue +++ b/src/pages/Ticket/TicketList.vue @@ -4,7 +4,6 @@ import { useI18n } from 'vue-i18n'; import { useRouter } from 'vue-router'; import { useStateStore } from 'stores/useStateStore'; import VnPaginate from 'src/components/ui/VnPaginate.vue'; -import { toDate, toDateString, toCurrency } from 'src/filters/index'; import TicketSummary from './Card/TicketSummary.vue'; import VnSearchbar from 'src/components/ui/VnSearchbar.vue'; import TicketFilter from './TicketFilter.vue'; diff --git a/src/pages/Travel/Card/TravelSummary.vue b/src/pages/Travel/Card/TravelSummary.vue index af9aa5f7f..d7dce911b 100644 --- a/src/pages/Travel/Card/TravelSummary.vue +++ b/src/pages/Travel/Card/TravelSummary.vue @@ -1,5 +1,5 @@ <script setup> -import { ref, computed, onUpdated } from 'vue'; +import { ref, computed } from 'vue'; import { useRoute } from 'vue-router'; import { useI18n } from 'vue-i18n'; diff --git a/test/cypress/integration/entry/myEntry.spec.js b/test/cypress/integration/entry/myEntry.spec.js index bd0e55c37..8edd3a11c 100644 --- a/test/cypress/integration/entry/myEntry.spec.js +++ b/test/cypress/integration/entry/myEntry.spec.js @@ -1,4 +1,4 @@ -describe('My entry when is supplier', () => { +describe('EntryMy when is supplier', () => { beforeEach(() => { cy.viewport(1920, 1080); cy.login('supplier');