diff --git a/src/components/common/VnTable.vue b/src/components/common/VnTable.vue index 56f3b1744..0216c0063 100644 --- a/src/components/common/VnTable.vue +++ b/src/components/common/VnTable.vue @@ -107,12 +107,17 @@ const rowClickFunction = computed(() => { if ($props.rowClick) return $props.rowClick; if ($props.redirect) return ({ id }) => router.push({ path: `/${$props.redirect}/${id}` }); - return null; + return () => {}; }); + +const stopEventPropagation = (event) => { + event.preventDefault(); + event.stopPropagation(); +}; diff --git a/src/css/app.scss b/src/css/app.scss index 2e524e693..819c27178 100644 --- a/src/css/app.scss +++ b/src/css/app.scss @@ -115,6 +115,13 @@ select:-webkit-autofill { background-color: var(--vn-accent-color); } +.text-primary-light { + color: $primary-light !important; +} +.bg-primary-light { + background: $primary-light !important; +} + .fill-icon { font-variation-settings: 'FILL' 1; } diff --git a/src/css/quasar.variables.scss b/src/css/quasar.variables.scss index 899ae4397..304c8b821 100644 --- a/src/css/quasar.variables.scss +++ b/src/css/quasar.variables.scss @@ -28,7 +28,7 @@ $color-link: #66bfff; $color-spacer-light: #a3a3a31f; $color-spacer: #7979794d; $border-thin-light: 1px solid $color-spacer-light; -$primary-light: lighten($primary, 35%); +$primary-light: #f5b351; $dark-shadow-color: black; $layout-shadow-dark: 0 0 10px 2px #00000033, 0 0px 10px #0000003d; $spacing-md: 16px; diff --git a/src/pages/Customer/ExtendedList/CustomerExtendedList.vue b/src/pages/Customer/ExtendedList/CustomerExtendedList.vue index 44e083db6..b96b19044 100644 --- a/src/pages/Customer/ExtendedList/CustomerExtendedList.vue +++ b/src/pages/Customer/ExtendedList/CustomerExtendedList.vue @@ -264,13 +264,6 @@ const redirectToCreateView = (row) => { }; const columns = computed(() => [ - { - align: 'left', - field: 'customerStatus', - label: 'customerStatus', - name: 'customerStatus', - columnFilter: false, - }, { align: 'left', field: 'id', @@ -590,6 +583,7 @@ function handleLocation(data, location) { order="id DESC" :columns="columns" default-mode="table" + redirect="customer" auto-load >