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

#6321 - Negative ticket #158

Open
jsegarra wants to merge 156 commits from 6321_negative_tickets into dev
pull from: 6321_negative_tickets
merge into: verdnatura:dev
Conversation 0 Commits 156 Files Changed 55 +90 -86
5 changed files with 90 additions and 86 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 67eb21b707 - Show all commits

22
src/i18n/en/index.js
View File

@ -351,25 +351,25 @@ export default {
weight: 'Weight', weight: 'Weight',
goTo: 'Go to', goTo: 'Go to',
}, },
negative:{ negative: {
hour: 'Hora', hour: 'Hour',
id: 'Id_Articulo', id: 'Id Article',
longName:'Articulo', longName: 'Article',
supplier: 'Productor', supplier: 'Supplier',
colour:'Color', colour: 'Colour',
size:'Medida', size: 'Size',
origen:'Origen', origen: 'Origen',
value:'Negativo', value: 'Negative',
itemFk: 'itemFk', itemFk: 'itemFk',
warehouseFk: 'warehouseFk', warehouseFk: 'warehouseFk',
producer: 'producer', producer: 'producer',
category: 'category', category: 'category',
warehouse: 'warehouse', warehouse: 'warehouse',
lack: 'Negativo', lack: 'Negative',
inkFk: 'inkFk', inkFk: 'inkFk',
timed: 'timed', timed: 'timed',
minTimed: 'minTimed', minTimed: 'minTimed',
} },
}, },
claim: { claim: {
pageTitles: { pageTitles: {

21
src/pages/Ticket/Negative/TicketDescriptor.vue
View File

@ -1,13 +1,13 @@
<script setup> <script setup>
import { computed, } from 'vue'; import { computed } from 'vue';
import { toDate, toPercentage, } from 'filters/index'; import { toDate, toPercentage } from 'filters/index';
import CrudModel from 'src/components/CrudModel.vue'; import CrudModel from 'src/components/CrudModel.vue';
import FetchData from 'src/components/FetchData.vue'; import FetchData from 'src/components/FetchData.vue';
import { useDialogPluginComponent } from 'quasar'; import { useDialogPluginComponent } from 'quasar';
import { useI18n } from 'vue-i18n'; import { useI18n } from 'vue-i18n';
const { t } = useI18n(); const { t } = useI18n();
// const quasar = useQuasar(); const URL_KEY = 'Tickets/ItemLack';
const $props = defineProps({ const $props = defineProps({
id: { id: {
@ -16,6 +16,7 @@ const $props = defineProps({
}, },
}); });
const entityId = computed(() => $props.id);
const columns = computed(() => [ const columns = computed(() => [
{ {
@ -77,8 +78,6 @@ const columns = computed(() => [
}, },
]); ]);
defineEmits([...useDialogPluginComponent.emits]); defineEmits([...useDialogPluginComponent.emits]);
const { dialogRef, onDialogHide } = useDialogPluginComponent(); const { dialogRef, onDialogHide } = useDialogPluginComponent();
@ -87,12 +86,10 @@ const { dialogRef, onDialogHide } = useDialogPluginComponent();
<template> <template>
<CrudModel <CrudModel
v-if="$props.id" v-if="$props.id"
data-key="ClaimEnds" :data-key="URL_KEY"
url="ClaimEnds/filter" :url="`${URL_KEY}/${entityId}/detail`"
save-url="ClaimEnds/crud" ref="itemLackForm"
ref="claimActionsForm"
v-model:selected="selectedRows" v-model:selected="selectedRows"
:filter="{ where: { claimFk: claimId } }"
:default-remove="true" :default-remove="true"
:default-save="false" :default-save="false"
:default-reset="false" :default-reset="false"
@ -151,8 +148,6 @@ const { dialogRef, onDialogHide } = useDialogPluginComponent();
</template> </template>
<style lang="scss"> <style lang="scss">
.q-dialog { .q-dialog {
} }
</style> </style>

10
src/pages/Ticket/Negative/TicketDescriptorDialog.vue
View File

@ -1,7 +1,6 @@
<script setup> <script setup>
import TicketDescriptor from './TicketDescriptor.vue'; import TicketDescriptor from './TicketDescriptor.vue';
const $props = defineProps({ const $props = defineProps({
id: { id: {
type: Number, type: Number,
@ -10,12 +9,7 @@ const $props = defineProps({
}); });
</script> </script>
<template> <template>
<TicketDescriptor v-if="$props.id" :id="$props.id" /> <TicketDescriptor v-if="$props.id" :id="$props.id" />
</template> </template>
<style lang="scss"> <style lang="scss"></style>
.q-dialog {
.q-card{max-width: fit-content !important;}
}
</style>

79
src/pages/Ticket/Negative/TicketFilter.vue
View File

@ -45,7 +45,7 @@ const agencies = ref();
</div> </div>
</template> </template>
<template #body="{ params }"> <template #body="{ params }">
<!-- <template #body="{ params, searchFn }"> --> <!-- <template #body="{ params, searchFn }"> -->
<QList dense class="q-gutter-y-sm q-mt-sm"> <QList dense class="q-gutter-y-sm q-mt-sm">
<QItem> <QItem>
<QItemSection> <QItemSection>
@ -55,53 +55,56 @@ const agencies = ref();
is-outlined is-outlined
/> />
</QItemSection> </QItemSection>
</QItem> </QItem>
<QItem><QItemSection> <QItem>
<QItemSection>
<VnInput <VnInput
v-model="params.producer" v-model="params.producer"
:label="t('ticket.negative.producer')" :label="t('ticket.negative.producer')"
is-outlined is-outlined
/> />
</QItemSection> </QItemSection>
</QItem> </QItem>
<QItem> <QItem>
<QItemSection> <QItemSection>
<VnInput <VnInput
v-model="params.color" v-model="params.color"
:label="t('ticket.negative.colour')" :label="t('ticket.negative.colour')"
is-outlined is-outlined
/> />
</QItemSection> </QItemSection>
</QItem> </QItem>
<QItem> <QItemSection> <QItem>
<VnInput <QItemSection>
v-model="params.size" <VnInput
:label="t('ticket.negative.size')" v-model="params.size"
is-outlined :label="t('ticket.negative.size')"
/> is-outlined
</QItemSection> />
</QItem> </QItemSection>
<QItem> <QItemSection> </QItem>
<VnInput <QItem>
v-model="params.origen" <QItemSection>
:label="t('ticket.negative.origen')" <VnInput
is-outlined v-model="params.origen"
/> :label="t('ticket.negative.origen')"
</QItemSection> is-outlined
</QItem> />
</QItemSection>
<QItem> <QItemSection> </QItem>
<VnInput <QItem>
v-model="params.value" <QItemSection>
:label="t('ticket.negative.value')" <VnInput
is-outlined v-model="params.value"
/> :label="t('ticket.negative.value')"
</QItemSection> is-outlined
/>
</QItemSection>
<!-- <QItemSection> <!-- <QItemSection>
<VnInputDate v-model="params.to" :label="t('To')" is-outlined /> <VnInputDate v-model="params.to" :label="t('To')" is-outlined />
</QItemSection> --> </QItemSection> -->
</QItem> </QItem>
<!-- <QItem> <!-- <QItem>
<QItemSection v-if="!warehouses"> <QItemSection v-if="!warehouses">
<QSkeleton type="QInput" class="full-width" /> <QSkeleton type="QInput" class="full-width" />
</QItemSection> </QItemSection>

44
src/pages/Ticket/Negative/TicketList.vue
View File

@ -13,13 +13,13 @@ const stateStore = useStateStore();
const { t } = useI18n(); const { t } = useI18n();
const session = useSession(); const session = useSession();
const selected = ref([]); const selected = ref([]);
const showTicketDialog= ref(false); const showTicketDialog = ref(false);
const currentRow= ref(null); const currentRow = ref(null);
const quasar = useQuasar(); const quasar = useQuasar();
const viewSummary = (value) => { const viewSummary = (value) => {
showTicketDialog.value = true showTicketDialog.value = true;
currentRow.value = value currentRow.value = value;
// quasar.dialog({ // quasar.dialog({
// component: VnConfirm, // component: VnConfirm,
// componentProps: { // componentProps: {
@ -155,7 +155,6 @@ const columns = computed(() => [
</template> </template>
<template #body-cell-icons="{ value }"> <template #body-cell-icons="{ value }">
<QTd align="center"> <QTd align="center">
<QIcon <QIcon
@click.stop="viewSummary(value)" @click.stop="viewSummary(value)"
class="q-ml-md" class="q-ml-md"
@ -175,14 +174,27 @@ const columns = computed(() => [
</template> </template>
</VnPaginate> </VnPaginate>
</div> </div>
<VnConfirm <QDialog ref="dialogRef" v-model="showTicketDialog">
v-model="showTicketDialog" <QCard class="q-pa-sm">
:title="t('confirmGreuges')" <QCardSection class="row items-center q-pb-none">
> <QBtn
<template #customHTML> icon="close"
<TicketDescriptorDialog :id="currentRow"></TicketDescriptorDialog> :disable="isLoading"
</template> flat
</VnConfirm> round
dense
v-close-popup
/> </QCardSection
><QCardSection class="row items-center"
><TicketDescriptorDialog
:id="currentRow.itemFk"
></TicketDescriptorDialog></QCardSection></QCard
></QDialog>
<!-- <VnConfirm :title="t('confirmGreuges')">
<template #customHTML>
</template>
</VnConfirm> -->
<QDrawer v-model="stateStore.rightDrawer" side="right" :width="256" show-if-above> <QDrawer v-model="stateStore.rightDrawer" side="right" :width="256" show-if-above>
<QScrollArea class="fit text-grey-8"> <QScrollArea class="fit text-grey-8">
<TicketFilter data-key="NegativeList" /> <TicketFilter data-key="NegativeList" />
@ -205,8 +217,8 @@ const columns = computed(() => [
#false { #false {
background-color: $negative; background-color: $negative;
} }
div.q-dialog__inner > div{ div.q-dialog__inner > div {
max-width: fit-content !important; max-width: fit-content !important;
background-color: red !important; // background-color: red !important;
} }
</style> </style>