diff --git a/src/components/ui/VnUserLink.vue b/src/components/ui/VnUserLink.vue
index b04ea7476..8fb571c80 100644
--- a/src/components/ui/VnUserLink.vue
+++ b/src/components/ui/VnUserLink.vue
@@ -1,20 +1,18 @@
-
- {{ $props.defaultName ? $props.name ?? t('globals.system') : $props.name }}
+
+ {{ defaultName ? name ?? $t('globals.system') : tag ?? name }}
-
+
diff --git a/src/pages/Customer/Card/CustomerBalance.vue b/src/pages/Customer/Card/CustomerBalance.vue
index 346e76681..52edecea5 100644
--- a/src/pages/Customer/Card/CustomerBalance.vue
+++ b/src/pages/Customer/Card/CustomerBalance.vue
@@ -95,12 +95,7 @@ const columns = computed(() => [
label: t('Employee'),
columnField: {
component: 'userLink',
- attrs: ({ row }) => {
- return {
- workerId: row.workerFk,
- name: row.userName,
- };
- },
+ attrs: ({ row }) => ({ workerId: row.workerFk, tag: row.userName }),
},
cardVisible: true,
},
diff --git a/src/pages/Customer/CustomerList.vue b/src/pages/Customer/CustomerList.vue
index 25cac5361..e0a786174 100644
--- a/src/pages/Customer/CustomerList.vue
+++ b/src/pages/Customer/CustomerList.vue
@@ -2,6 +2,7 @@
import { ref, computed, markRaw } from 'vue';
import { useI18n } from 'vue-i18n';
import { useRouter } from 'vue-router';
+import VnSelect from 'src/components/common/VnSelect.vue';
import VnTable from 'components/VnTable/VnTable.vue';
import VnLocation from 'src/components/common/VnLocation.vue';
import VnSearchbar from 'components/ui/VnSearchbar.vue';
@@ -69,7 +70,7 @@ const columns = computed(() => [
optionFilter: 'firstName',
useLike: false,
},
- create: true,
+ create: false,
columnField: {
component: null,
},
@@ -195,6 +196,8 @@ const columns = computed(() => [
component: 'select',
attrs: {
url: 'BusinessTypes',
+ fields: ['code', 'description'],
+ sortBy: 'description ASC ',
optionLabel: 'description',
optionValue: 'code',
},
@@ -357,7 +360,7 @@ const columns = computed(() => [
isPrimary: true,
},
{
- title: t('Client ticket list'),
+ title: t('Preview'),
icon: 'preview',
isPrimary: true,
action: (row) => viewSummary(row.id, CustomerSummary),
@@ -400,7 +403,7 @@ function handleLocation(data, location) {
url="Clients/filter"
:create="{
urlCreate: 'Clients/createWithUser',
- title: 'Create client',
+ title: t('globals.pageTitles.customerCreate'),
onDataSaved: ({ id }) => tableRef.redirect(id),
formInitialData: {
active: true,
@@ -413,6 +416,39 @@ function handleLocation(data, location) {
auto-load
>
+
+
+
+
+
+
+
+ {{ scope.opt?.name }}
+ {{ scope.opt?.nickname }},
+ {{ scope.opt?.code }}
+
+
+
+
+
[
{
title: t('Client ticket list'),
icon: 'vn:lines',
- action: ({ id }) =>
- router.push({ params: { id }, name: 'TicketSummary' }),
+ action: ({ id }) => router.push({ params: { id }, name: 'TicketSale' }),
isPrimary: true,
},
{