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

refs #6118 importSalixVariables #93

Merged
pablone merged 19 commits from 6118-responsiveFixes into dev 2023-10-30 10:32:15 +00:00
Conversation 0 Commits 19 Files Changed 4 +16 -37
6 changed files with 16 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 9dd69dbcb7 - Show all commits

11
src/components/RowWrapper.vue
View File

@ -1,11 +0,0 @@
<script setup></script>
<template>
<div class="q-pa-md example-row-equal-width"></div>
</template>
<style lang="scss" scoped>
.formModel {
max-width: 800px;
width: 100%;
}
</style>

2
src/components/ui/CardDescriptor.vue
View File

@ -41,9 +41,7 @@ async function fetch() {
if ($props.filter) params.filter = JSON.stringify($props.filter);
const { data } = await axios.get($props.url, { params });
console.log(data);
entity.value = data;
console.log('entity.value: ', entity.value);
emit('onFetch', data);
}

4
src/components/ui/VnRow.vue
View File

@ -1,14 +1,12 @@
<script></script>
<template>
<div id="row">
<slot></slot>
</div>
</template>
<style lang="scss">
<style lang="scss" scopped>
@media screen and (max-width: 800px) {
#row {
flex-direction: column;
background-color: blue;
}
}
</style>

15
src/pages/Claim/Card/ClaimBasicData.vue
View File

@ -45,7 +45,6 @@ function setWorkers(data) {
}
function setClaimStates(data) {
console.log(data);
claimStates.value = data;
claimStatesCopy.value = data;
}
@ -53,7 +52,6 @@ function setClaimStates(data) {
const workerFilter = {
options: workers,
filterFn: (options, value) => {
console.log('Filtering workers with value:', value);
const search = value.toLowerCase();
if (value === '') return workersCopy.value;
@ -73,7 +71,6 @@ const workerFilter = {
const statesFilter = {
options: claimStates,
filterFn: (options, value) => {
console.log('Filtering claim states with value:', value);
const search = value.toLowerCase();
if (value === '') return claimStatesCopy.value;
@ -141,7 +138,7 @@ const statesFilter = {
</QInput>
</div>
</VnRow>
<div class="row q-gutter-md q-mb-md">
<VnRow class="row q-gutter-md q-mb-md">
<div class="col">
<QSelect
v-model="data.workerFk"
@ -187,8 +184,8 @@ const statesFilter = {
>
</QSelect>
</div>
</div>
<div class="row q-gutter-md q-mb-md">
</VnRow>
<VnRow class="row q-gutter-md q-mb-md">
<div class="col">
<QInput
v-model.number="data.packages"
@ -204,15 +201,15 @@ const statesFilter = {
:rules="validate('claim.rma')"
/>
</div>
</div>
<div class="row q-gutter-md q-mb-md">
</VnRow>
<VnRow class="row q-gutter-md q-mb-md">
<div class="col">
<QCheckbox
v-model="data.hasToPickUp"
:label="t('claim.basicData.picked')"
/>
</div>
</div>
</VnRow>
</template>
</FormModel>
</div>

3
src/pages/Claim/Card/ClaimDescriptor.vue
View File

@ -17,8 +17,6 @@ const $props = defineProps({
default: null,
},
});
console.log('Component id:', $props.id);
if ($props.id === undefined) console.log('$props.id: ', $props.id);
const route = useRoute();
const { t } = useI18n();
@ -111,7 +109,6 @@ const setData = (entity) => {
<template #value>
<span class="link">
{{ entity.worker.user.name }}
{{ console.log('Worker userFk:', entity.worker.userFk) }}
<WorkerDescriptorProxy :id="entity.worker.userFk" />
</span>
</template>

18
src/pages/Customer/Card/CustomerBasicData.vue
View File

@ -6,7 +6,7 @@ import { useI18n } from 'vue-i18n';
import { useSession } from 'src/composables/useSession';
import FetchData from 'components/FetchData.vue';
import FormModel from 'components/FormModel.vue';
import RowWrapper from 'components/RowWrapper.vue';
import VnRow from 'components/ui/VnRow.vue';
const route = useRoute();
const { t } = useI18n();
@ -62,7 +62,7 @@ const filterOptions = {
<div class="column items-center">
<FormModel :url="`Clients/${route.params.id}`" model="customer">
<template #form="{ data, validate, filter }">
<RowWrapper class="row q-gutter-md q-mb-md">
<VnRow class="row q-gutter-md q-mb-md">
pablone marked this conversation as resolved Outdated
alexm commented 2023-10-26 10:56:22 +00:00
Outdated
Review
Copy Link

Aci

Aci
<div class="col">
<QInput
v-model="data.socialName"
@ -84,8 +84,8 @@ const filterOptions = {
:input-debounce="0"
/>
</div>
</RowWrapper>
<div class="row q-gutter-md q-mb-md">
</VnRow>
pablone marked this conversation as resolved Outdated
alexm commented 2023-10-26 10:56:25 +00:00
Outdated
Review
Copy Link

Aci

Aci
<VnRow class="row q-gutter-md q-mb-md">
<div class="col">
<QInput
v-model="data.contact"
@ -103,8 +103,8 @@ const filterOptions = {
clearable
/>
</div>
</div>
<div class="row q-gutter-md q-mb-md">
</VnRow>
<VnRow class="row q-gutter-md q-mb-md">
<div class="col">
<QInput
v-model="data.phone"
@ -121,8 +121,8 @@ const filterOptions = {
clearable
/>
</div>
</div>
<div class="row q-gutter-md q-mb-md">
</VnRow>
<VnRow class="row q-gutter-md q-mb-md">
<div class="col">
<QSelect
v-model="data.salesPersonFk"
@ -163,7 +163,7 @@ const filterOptions = {
:input-debounce="0"
/>
</div>
</div>
</VnRow>
</template>
</FormModel>
</div>