diff --git a/src/components/UserPanel.vue b/src/components/UserPanel.vue
index 5c143740e..fce41ef99 100644
--- a/src/components/UserPanel.vue
+++ b/src/components/UserPanel.vue
@@ -7,7 +7,7 @@ import axios from 'axios';
import { useState } from 'src/composables/useState';
import { useSession } from 'src/composables/useSession';
import { localeEquivalence } from 'src/i18n/index';
-import VnSelectFilter from 'src/components/common/VnSelectFilter.vue';
+import VnSelect from 'src/components/common/VnSelect.vue';
import VnRow from 'components/ui/VnRow.vue';
import FetchData from 'components/FetchData.vue';
@@ -172,24 +172,24 @@ function copyUserToken() {
-
-
+ >
-
-
-
-
+
diff --git a/src/pages/Customer/components/CustomerAddressCreate.vue b/src/pages/Customer/components/CustomerAddressCreate.vue
index 752024944..d92377f54 100644
--- a/src/pages/Customer/components/CustomerAddressCreate.vue
+++ b/src/pages/Customer/components/CustomerAddressCreate.vue
@@ -9,7 +9,7 @@ import FetchData from 'components/FetchData.vue';
import FormModel from 'components/FormModel.vue';
import VnRow from 'components/ui/VnRow.vue';
import VnInput from 'src/components/common/VnInput.vue';
-import VnSelectFilter from 'src/components/common/VnSelectFilter.vue';
+import VnSelect from 'src/components/common/VnSelect.vue';
import VnSelectDialog from 'src/components/common/VnSelectDialog.vue';
import CustomerCreateNewPostcode from 'src/components/CreateNewPostcodeForm.vue';
import CustomerNewCustomsAgent from 'src/pages/Customer/components/CustomerNewCustomsAgent.vue';
@@ -101,7 +101,7 @@ function handleLocation(data, location) {
/>
-
- {
/>
-
{
- {
/>
- {
/>
-
{
- {
/>
-
{
-
{
v-if="sampleType?.hasCompany || sampleType?.datepickerEnabled"
>
- {
/>
- {
{{ t('Edit address') }}
-
+
diff --git a/src/pages/Item/ItemCreate.vue b/src/pages/Item/ItemCreate.vue
index 18e7522cb..baa51414c 100644
--- a/src/pages/Item/ItemCreate.vue
+++ b/src/pages/Item/ItemCreate.vue
@@ -4,7 +4,7 @@ import { useI18n } from 'vue-i18n';
import { useRouter } from 'vue-router';
import FetchData from 'components/FetchData.vue';
-import VnSelectFilter from 'src/components/common/VnSelectFilter.vue';
+import VnSelect from 'src/components/common/VnSelect.vue';
import FormModel from 'components/FormModel.vue';
import VnRow from 'components/ui/VnRow.vue';
import VnInput from 'src/components/common/VnInput.vue';
@@ -90,7 +90,7 @@ onBeforeMount(async () => {
v-model="data.provisionalName"
:label="t('item.create.name')"
/>
- {
option-label="name"
hide-selected
/>
- {
/>
- {
-
-
+ {
-
+
- [
align: 'left',
sortable: true,
columnFilter: {
- component: VnSelectFilter,
+ component: VnSelect,
filterParamKey: 'typeFk',
type: 'select',
filterValue: null,
@@ -222,7 +222,7 @@ const columns = computed(() => [
align: 'left',
sortable: true,
columnFilter: {
- component: VnSelectFilter,
+ component: VnSelect,
type: 'select',
filterValue: null,
event: getInputEvents,
@@ -242,7 +242,7 @@ const columns = computed(() => [
align: 'left',
sortable: true,
columnFilter: {
- component: VnSelectFilter,
+ component: VnSelect,
type: 'select',
filterValue: null,
event: getInputEvents,
@@ -261,7 +261,7 @@ const columns = computed(() => [
align: 'left',
sortable: true,
columnFilter: {
- component: VnSelectFilter,
+ component: VnSelect,
type: 'select',
filterValue: null,
event: getInputEvents,
@@ -280,7 +280,7 @@ const columns = computed(() => [
align: 'left',
sortable: true,
columnFilter: {
- component: VnSelectFilter,
+ component: VnSelect,
filterParamKey: 'buyerFk',
type: 'select',
filterValue: null,
diff --git a/src/pages/Parking/Card/ParkingBasicData.vue b/src/pages/Parking/Card/ParkingBasicData.vue
index 26a1ed8be..81598e0a7 100644
--- a/src/pages/Parking/Card/ParkingBasicData.vue
+++ b/src/pages/Parking/Card/ParkingBasicData.vue
@@ -7,7 +7,7 @@ import FetchData from 'src/components/FetchData.vue';
import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
import VnInput from 'src/components/common/VnInput.vue';
import FormModel from 'components/FormModel.vue';
-import VnSelectFilter from 'src/components/common/VnSelectFilter.vue';
+import VnSelect from 'src/components/common/VnSelect.vue';
const { t } = useI18n();
const route = useRoute();
@@ -40,7 +40,7 @@ const filter = {
-
- {
- {
-
+
- {
-
+
@@ -197,7 +197,7 @@ const redirectToTicketList = (_, { id }) => {
-
{
-
-
+
-
-
-
+
-
-
-
-
-
+
diff --git a/src/pages/Worker/Card/WorkerTimeForm.vue b/src/pages/Worker/Card/WorkerTimeForm.vue
index d6c893ad1..0a58a04ca 100644
--- a/src/pages/Worker/Card/WorkerTimeForm.vue
+++ b/src/pages/Worker/Card/WorkerTimeForm.vue
@@ -3,7 +3,7 @@ import { reactive, ref, computed, onBeforeMount } from 'vue';
import { useI18n } from 'vue-i18n';
import { useRoute } from 'vue-router';
-import VnSelectFilter from 'src/components/common/VnSelectFilter.vue';
+import VnSelect from 'src/components/common/VnSelect.vue';
import FormModelPopup from 'components/FormModelPopup.vue';
import VnInputTime from 'components/common/VnInputTime.vue';
@@ -84,7 +84,7 @@ onBeforeMount(() => {
:required="true"
:is-clearable="false"
/>
-