diff --git a/src/components/ItemsFilterPanel.vue b/src/components/ItemsFilterPanel.vue index 8449f9354..e89d32da4 100644 --- a/src/components/ItemsFilterPanel.vue +++ b/src/components/ItemsFilterPanel.vue @@ -297,11 +297,12 @@ const removeTag = (index, params, search) => { /> - diff --git a/src/components/VnTable/VnTable.vue b/src/components/VnTable/VnTable.vue index a3c439cc7..3e982919b 100644 --- a/src/components/VnTable/VnTable.vue +++ b/src/components/VnTable/VnTable.vue @@ -69,10 +69,7 @@ const $props = defineProps({ type: Boolean, default: false, }, - disableInfiniteScroll: { - type: Boolean, - default: false, - }, + hasSubToolbar: { type: Boolean, default: null, @@ -373,9 +370,7 @@ function handleOnDataSaved(_) { ref="CrudModelRef" @on-fetch="(...args) => emit('onFetch', ...args)" :search-url="searchUrl" - :disable-infinite-scroll=" - $attrs['disableInfiniteScroll'] ? isTableMode : !disableInfiniteScroll - " + :disable-infinite-scroll="isTableMode" @save-changes="reload" :has-sub-toolbar="$props.hasSubToolbar ?? isEditable" :auto-load="hasParams || $attrs['auto-load']" @@ -395,7 +390,7 @@ function handleOnDataSaved(_) { card-container-class="grid-three" flat :style="isTableMode && `max-height: ${tableHeight}`" - :virtual-scroll="!isTableMode" + :virtual-scroll="isTableMode" @virtual-scroll=" (event) => event.index > rows.length - 2 && diff --git a/src/components/common/VnDmsList.vue b/src/components/common/VnDmsList.vue index 16e3c641f..52dd6ef79 100644 --- a/src/components/common/VnDmsList.vue +++ b/src/components/common/VnDmsList.vue @@ -400,7 +400,14 @@ defineExpose({ /> - + {{ t('Upload file') }} diff --git a/src/css/app.scss b/src/css/app.scss index 3c51dc8af..905934d4c 100644 --- a/src/css/app.scss +++ b/src/css/app.scss @@ -268,6 +268,7 @@ input::-webkit-inner-spin-button { max-width: 400px; } } + .edit-photo-btn { position: absolute; right: 12px; @@ -280,3 +281,10 @@ input::-webkit-inner-spin-button { color: var(--vn-label-color); text-transform: uppercase; } + +.q-date { + &__today { + border: 2px solid $info; + color: $info; + } +} diff --git a/src/pages/Account/Role/Card/SubRoles.vue b/src/pages/Account/Role/Card/SubRoles.vue index 7a0088bac..d17f96dd8 100644 --- a/src/pages/Account/Role/Card/SubRoles.vue +++ b/src/pages/Account/Role/Card/SubRoles.vue @@ -142,7 +142,13 @@ const redirectToRoleSummary = (id) => - + {{ t('warehouses.add') }} diff --git a/src/pages/Claim/Card/ClaimLines.vue b/src/pages/Claim/Card/ClaimLines.vue index 77c7dacf1..60c470d22 100644 --- a/src/pages/Claim/Card/ClaimLines.vue +++ b/src/pages/Claim/Card/ClaimLines.vue @@ -317,7 +317,7 @@ async function saveWhenHasChanges() { - + diff --git a/src/pages/Claim/Card/ClaimPhoto.vue b/src/pages/Claim/Card/ClaimPhoto.vue index 21f1be6ed..ec619cc7d 100644 --- a/src/pages/Claim/Card/ClaimPhoto.vue +++ b/src/pages/Claim/Card/ClaimPhoto.vue @@ -246,7 +246,13 @@ function onDrag() {