diff --git a/src/components/common/__tests__/VnDmsList.spec.js b/src/components/common/__tests__/VnDmsList.spec.js index ee62f6971..7c469b7db 100644 --- a/src/components/common/__tests__/VnDmsList.spec.js +++ b/src/components/common/__tests__/VnDmsList.spec.js @@ -25,6 +25,9 @@ describe('VnDmsList', () => { deleteModel: 'WorkerDms', downloadModel: 'WorkerDms', }, + global: { + stubs: ['VnUserLink'], + }, }).vm; }); diff --git a/src/components/common/__tests__/VnLog.spec.js b/src/components/common/__tests__/VnLog.spec.js index 399b78a1d..53836cbcd 100644 --- a/src/components/common/__tests__/VnLog.spec.js +++ b/src/components/common/__tests__/VnLog.spec.js @@ -90,7 +90,7 @@ describe('VnLog', () => { vm = createWrapper(VnLog, { global: { - stubs: ['FetchData', 'vue-i18n'], + stubs: ['FetchData', 'vue-i18n', 'VnUserLink'], mocks: { fetch: vi.fn(), }, diff --git a/src/components/ui/VnUserLink.vue b/src/components/ui/VnUserLink.vue index ac3e22385..9a25852b3 100644 --- a/src/components/ui/VnUserLink.vue +++ b/src/components/ui/VnUserLink.vue @@ -1,12 +1,27 @@ diff --git a/src/pages/Customer/Card/CustomerConsumption.vue b/src/pages/Customer/Card/CustomerConsumption.vue index db7236a3d..8ae76acec 100644 --- a/src/pages/Customer/Card/CustomerConsumption.vue +++ b/src/pages/Customer/Card/CustomerConsumption.vue @@ -17,6 +17,7 @@ import TicketDescriptorProxy from 'src/pages/Ticket/Card/TicketDescriptorProxy.v import ItemDescriptorProxy from 'src/pages/Item/Card/ItemDescriptorProxy.vue'; import VnSelect from 'components/common/VnSelect.vue'; import VnInputDate from 'components/common/VnInputDate.vue'; +import VnCheckbox from 'src/components/common/VnCheckbox.vue'; const arrayData = useArrayData('Customer'); const { t } = useI18n(); @@ -50,7 +51,7 @@ const columns = computed(() => [ label: t('globals.ticket'), cardVisible: true, columnFilter: { - inWhere: true, + name: 'ticketId', }, }, { @@ -84,25 +85,19 @@ const columns = computed(() => [ label: t('globals.description'), columnClass: 'expand', columnFilter: { - inWhere: true, + name: 'description', + }, }, { - name: 'quantity', + name: 'quantity', label: t('globals.quantity'), cardVisible: true, visible: true, - columnFilter: { - inWhere: true, - }, - }, - { - name: 'grouped', - label: t('Group by items'), - component: 'checkbox', - visible: false, - orderBy: false, + columnFilter: false + }, + ]); onBeforeMount(async () => { @@ -218,9 +213,9 @@ const updateDateParams = (value, params) => {
{{ row.subName }}
- + -