From 1b660a15dec4d1948c189024b35fe7415fa2eca7 Mon Sep 17 00:00:00 2001 From: pablone Date: Fri, 25 Apr 2025 08:25:35 +0200 Subject: [PATCH] refactor: refs #8684 update table styling and enhance EntryFilter component structure --- src/components/VnTable/VnTable.vue | 6 ------ src/css/app.scss | 14 +++++++++++++- src/pages/Entry/Card/EntryFilter.js | 17 +++++++++++++++++ 3 files changed, 30 insertions(+), 7 deletions(-) diff --git a/src/components/VnTable/VnTable.vue b/src/components/VnTable/VnTable.vue index 64f8ba288..d4c010c5c 100644 --- a/src/components/VnTable/VnTable.vue +++ b/src/components/VnTable/VnTable.vue @@ -1267,12 +1267,6 @@ es: table tbody th { position: relative; } - th { - border-bottom: 2px solid var(--vn-page-color) !important; - } - td { - border-color: var(--vn-page-color); - } } .last-row-sticky { diff --git a/src/css/app.scss b/src/css/app.scss index 214873a6c..de04f0943 100644 --- a/src/css/app.scss +++ b/src/css/app.scss @@ -292,6 +292,18 @@ input::-webkit-inner-spin-button { .expand { max-width: 400px; } + th { + border-bottom: 1px solid var(--vn-page-color) !important; + } + td { + border-color: var(--vn-page-color); + } + div.q-field__append.q-field__marginal { + color: red !important; + } + .q-field__control:before { + border-color: #545353 !important; + } } .edit-photo-btn { @@ -361,4 +373,4 @@ input::-webkit-inner-spin-button { display: flex; flex-wrap: wrap; justify-content: space-evenly; -} \ No newline at end of file +} diff --git a/src/pages/Entry/Card/EntryFilter.js b/src/pages/Entry/Card/EntryFilter.js index d9fd1c2be..fe3ddac82 100644 --- a/src/pages/Entry/Card/EntryFilter.js +++ b/src/pages/Entry/Card/EntryFilter.js @@ -52,5 +52,22 @@ export default { fields: ['code', 'description'], }, }, + { + relation: 'dms', + scope: { + fields: [ + 'dmsTypeFk', + 'reference', + 'hardCopyNumber', + 'workerFk', + 'description', + 'hasFile', + 'file', + 'created', + 'companyFk', + 'warehouseFk', + ], + }, + }, ], };