diff --git a/src/pages/Entry/Card/EntryCard.vue b/src/pages/Entry/Card/EntryCard.vue
index fe4d73f99..5a2bef186 100644
--- a/src/pages/Entry/Card/EntryCard.vue
+++ b/src/pages/Entry/Card/EntryCard.vue
@@ -7,6 +7,7 @@ import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
import EntryDescriptor from './EntryDescriptor.vue';
import { useStateStore } from 'stores/useStateStore';
+import useCardSize from 'src/composables/useCardSize';
const { t } = useI18n();
const stateStore = useStateStore();
@@ -33,7 +34,9 @@ const stateStore = useStateStore();
-
+
+
+
diff --git a/src/pages/Entry/Card/EntryNotes.vue b/src/pages/Entry/Card/EntryNotes.vue
index 0d2e5e51a..02a0c020a 100644
--- a/src/pages/Entry/Card/EntryNotes.vue
+++ b/src/pages/Entry/Card/EntryNotes.vue
@@ -50,25 +50,23 @@ onMounted(() => {
:key="index"
class="row q-gutter-md q-mb-md"
>
-
-
-
-
-
-
-
+
+
+
+
+
{
-
-
-
- {{ t('Add note') }}
-
-
-
+
+
+ {{ t('Add note') }}
+
+
diff --git a/src/pages/Entry/Card/EntrySummary.vue b/src/pages/Entry/Card/EntrySummary.vue
index 3861e0321..b6863f8f7 100644
--- a/src/pages/Entry/Card/EntrySummary.vue
+++ b/src/pages/Entry/Card/EntrySummary.vue
@@ -39,30 +39,47 @@ onMounted(async () => {
const tableColumnComponents = {
quantity: {
component: () => 'span',
+ props: () => {},
},
stickers: {
component: () => 'span',
+ props: () => {},
+ event: () => {},
},
packagingFk: {
component: () => 'span',
+ props: () => {},
+ event: () => {},
},
weight: {
component: () => 'span',
+ props: () => {},
+ event: () => {},
},
packing: {
component: () => 'span',
+ props: () => {},
+ event: () => {},
},
grouping: {
component: () => 'span',
+ props: () => {},
+ event: () => {},
},
buyingValue: {
component: () => 'span',
+ props: () => {},
+ event: () => {},
},
amount: {
component: () => 'span',
+ props: () => {},
+ event: () => {},
},
pvp: {
component: () => 'span',
+ props: () => {},
+ event: () => {},
},
};
@@ -148,7 +165,7 @@ const fetchEntryBuys = async () => {
@on-fetch="(data) => setEntryData(data)"
>
-
@@ -158,133 +175,104 @@ const fetchEntryBuys = async () => {
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
- {{ entry.travel.ref }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+ {{ entry.travel.ref }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
{
+
+
+
diff --git a/src/pages/InvoiceIn/Card/InvoiceInDueDay.vue b/src/pages/InvoiceIn/Card/InvoiceInDueDay.vue
index e240e9a8c..edfd93a2e 100644
--- a/src/pages/InvoiceIn/Card/InvoiceInDueDay.vue
+++ b/src/pages/InvoiceIn/Card/InvoiceInDueDay.vue
@@ -8,6 +8,7 @@ import { useArrayData } from 'src/composables/useArrayData';
import CrudModel from 'src/components/CrudModel.vue';
import FetchData from 'src/components/FetchData.vue';
import VnSelectFilter from 'src/components/common/VnSelectFilter.vue';
+import VnCurrency from 'src/components/common/VnCurrency.vue';
const route = useRoute();
const { t } = useI18n();
@@ -158,7 +159,12 @@ async function insert() {
-
+
diff --git a/src/pages/InvoiceIn/Card/InvoiceInSummary.vue b/src/pages/InvoiceIn/Card/InvoiceInSummary.vue
index 850b67cc3..6d2d11509 100644
--- a/src/pages/InvoiceIn/Card/InvoiceInSummary.vue
+++ b/src/pages/InvoiceIn/Card/InvoiceInSummary.vue
@@ -209,9 +209,9 @@ function getLink(param) {
-
-
-
-
-
@@ -318,9 +319,9 @@ function getLink(param) {
-
-
-
-
-
-
-
-
+ />
@@ -328,7 +325,7 @@ async function addExpense() {
-
-
-
-
-
+ />
-
-
-
-
-
+
diff --git a/src/pages/InvoiceOut/Card/InvoiceOutCard.vue b/src/pages/InvoiceOut/Card/InvoiceOutCard.vue
index bfab4b9e1..6844df2dd 100644
--- a/src/pages/InvoiceOut/Card/InvoiceOutCard.vue
+++ b/src/pages/InvoiceOut/Card/InvoiceOutCard.vue
@@ -5,6 +5,7 @@ import InvoiceOutDescriptor from './InvoiceOutDescriptor.vue';
import LeftMenu from 'components/LeftMenu.vue';
import VnSearchbar from 'components/ui/VnSearchbar.vue';
import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
+import useCardSize from 'src/composables/useCardSize';
const stateStore = useStateStore();
const { t } = useI18n();
@@ -28,7 +29,9 @@ const { t } = useI18n();
-
+
+
+
diff --git a/src/pages/InvoiceOut/Card/InvoiceOutSummary.vue b/src/pages/InvoiceOut/Card/InvoiceOutSummary.vue
index 5a56a3957..73acc0ad1 100644
--- a/src/pages/InvoiceOut/Card/InvoiceOutSummary.vue
+++ b/src/pages/InvoiceOut/Card/InvoiceOutSummary.vue
@@ -101,9 +101,10 @@ const ticketsColumns = ref([
-
+
+
-
+
+
@@ -140,9 +142,10 @@ const ticketsColumns = ref([
-
+
+
diff --git a/src/pages/InvoiceOut/InvoiceOutFilter.vue b/src/pages/InvoiceOut/InvoiceOutFilter.vue
index f8a430b51..985bfb085 100644
--- a/src/pages/InvoiceOut/InvoiceOutFilter.vue
+++ b/src/pages/InvoiceOut/InvoiceOutFilter.vue
@@ -6,6 +6,7 @@ import FetchData from 'components/FetchData.vue';
import VnFilterPanel from 'src/components/ui/VnFilterPanel.vue';
import VnInput from 'src/components/common/VnInput.vue';
import VnInputDate from 'components/common/VnInputDate.vue';
+import VnCurrency from 'src/components/common/VnCurrency.vue';
const { t } = useI18n();
const props = defineProps({
@@ -57,7 +58,11 @@ function setWorkers(data) {
-
+
diff --git a/src/pages/InvoiceOut/InvoiceOutNegativeBasesFilter.vue b/src/pages/InvoiceOut/InvoiceOutNegativeBasesFilter.vue
index 3adfa1d13..66b9257a0 100644
--- a/src/pages/InvoiceOut/InvoiceOutNegativeBasesFilter.vue
+++ b/src/pages/InvoiceOut/InvoiceOutNegativeBasesFilter.vue
@@ -4,6 +4,7 @@ import { useI18n } from 'vue-i18n';
import VnFilterPanel from 'src/components/ui/VnFilterPanel.vue';
import VnInput from 'src/components/common/VnInput.vue';
import VnInputDate from 'components/common/VnInputDate.vue';
+import VnCurrency from 'src/components/common/VnCurrency.vue';
const { t } = useI18n();
const props = defineProps({
@@ -84,7 +85,7 @@ const props = defineProps({
-
@@ -19,7 +20,9 @@ const stateStore = useStateStore();
-
+
+
+
diff --git a/src/pages/Login/LoginMain.vue b/src/pages/Login/LoginMain.vue
index e2ccdac16..9c469e611 100644
--- a/src/pages/Login/LoginMain.vue
+++ b/src/pages/Login/LoginMain.vue
@@ -69,12 +69,12 @@ async function onSubmit() {
-
-
-
+
@@ -104,6 +104,9 @@ async function onSubmit() {
min-width: 300px;
}
+.q-input {
+ color: $primary;
+}
@media (max-width: $breakpoint-xs-max) {
.formCard {
min-width: 100%;
diff --git a/src/pages/Login/VerifyEmail.vue b/src/pages/Login/VerifyEmail.vue
index dae20e8b6..4c02e5869 100644
--- a/src/pages/Login/VerifyEmail.vue
+++ b/src/pages/Login/VerifyEmail.vue
@@ -99,6 +99,8 @@ onMounted(async () => {