verdnatura/salix-front
verdnatura
/
salix-front
2
3
Fork 1
Code Issues Pull Requests 90 Releases Wiki Activity

refs #6595 - PR2 - Resolve conflicts #144

Merged
alexm merged 250 commits from hyervoni-branch-PR-2 into dev 2024-01-11 12:22:28 +00:00
Conversation 0 Commits 250 Files Changed 138 +11 -11
9 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit bc6ef24cd8 - Show all commits

4
src/pages/Claim/ClaimList.vue
View File

@ -110,13 +110,13 @@ function viewSummary(id) {
<QBtn
:label="t('components.smartCard.openCard')"
@click.stop="navigate(row.id)"
class="vn-secondary-button"
class="bg-vn-dark"
outline
/>
<QBtn
:label="t('components.smartCard.viewDescription')"
@click.stop
class="vn-secondary-button"
class="bg-vn-dark"
outline
style="margin-top: 15px"
>

2
src/pages/Customer/CustomerList.vue
View File

@ -83,7 +83,7 @@ function viewSummary(id) {
<QBtn
:label="t('components.smartCard.openCard')"
@click.stop="navigate(row.id)"
class="vn-secondary-button"
class="bg-vn-dark"
outline
/>
<QBtn

2
src/pages/InvoiceOut/InvoiceOutList.vue
View File

@ -233,7 +233,7 @@ const downloadCsv = (rows) => {
<QBtn
:label="t('components.smartCard.openCard')"
@click.stop="navigate(row.id)"
class="vn-secondary-button"
class="bg-vn-dark"
outline
type="reset"
/>

2
src/pages/Shelving/ShelvingList.vue
View File

@ -105,7 +105,7 @@ function exprBuilder(param, value) {
<QBtn
:label="t('components.smartCard.openCard')"
@click.stop="navigate(row.id)"
class="vn-secondary-button"
class="bg-vn-dark"
outline
/>
<QBtn

4
src/pages/Travel/TravelList.vue
View File

@ -98,13 +98,13 @@ onMounted(async () => {
<QBtn
:label="t('components.smartCard.clone')"
@click.stop="cloneTravel(row)"
class="vn-secondary-button"
class="bg-vn-dark"
outline
/>
<QBtn
:label="t('addEntry')"
@click.stop="viewSummary(row.id)"
class="vn-secondary-button"
class="bg-vn-dark"
outline
style="margin-top: 15px"
/>

2
src/pages/Wagon/Type/WagonTypeList.vue
View File

@ -64,7 +64,7 @@ async function remove(row) {
<QBtn
:label="t('components.smartCard.openCard')"
@click.stop="navigate(row.id)"
class="vn-secondary-button"
class="bg-vn-dark"
outline
/>
<QBtn

2
src/pages/Wagon/WagonList.vue
View File

@ -81,7 +81,7 @@ async function remove(row) {
<QBtn
:label="t('components.smartCard.openCard')"
@click.stop="navigate(row.id)"
class="vn-secondary-button"
class="bg-vn-dark"
outline
/>
<QBtn

2
src/pages/Worker/WorkerList.vue
View File

@ -87,7 +87,7 @@ function viewSummary(id) {
<QBtn
:label="t('components.smartCard.openCard')"
@click.stop="navigate(row.id)"
class="vn-secondary-button"
class="bg-vn-dark"
outline
/>
<QBtn

2
src/router/modules/travel.js
View File

@ -5,7 +5,7 @@ export default {
name: 'Travel',
meta: {
title: 'travel',
icon: 'vn:package',
icon: 'local_airport',
},
component: RouterView,
redirect: { name: 'TravelMain' },