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

#6321 - Negative ticket #158

Open
jsegarra wants to merge 220 commits from 6321_negative_tickets into dev
pull from: 6321_negative_tickets
merge into: verdnatura:dev
Conversation 0 Commits 220 Files Changed 41 +280 -19
6 changed files with 280 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 0eab0a9a98 - Show all commits

98
src/pages/Ticket/Negative/ChangeQuantityDialog.vue Normal file
View File

@ -0,0 +1,98 @@
<script setup>
import { ref } from 'vue';
import { useI18n } from 'vue-i18n';
import axios from 'axios';
import { useDialogPluginComponent } from 'quasar';
import VnInput from 'src/components/common/VnInput.vue';
const { t } = useI18n();
const showChangeQuantityDialog = ref(false);
const newQuantity = ref(null);
const { dialogRef, onDialogHide } = useDialogPluginComponent();
const $props = defineProps({
selectedRows: {
type: Array,
default: () => [],
},
});
const updateQuantity = async () => {
showChangeQuantityDialog.value = true;
const rowsToUpdate = $props.selectedRows.map(({ ticketFk }) =>
axios.post(`Tickets/state`, {
ticketFk,
quantity: newQuantity.value,
})
);
try {
await Promise.all(rowsToUpdate);
dialogRef.value.hide();
} catch (err) {
return err;
}
};
</script>
<template>
<QDialog ref="dialogRef" @hide="onDialogHide" v-model="showChangeQuantityDialog">
<QCard class="q-pa-sm">
<QCardSection class="row items-center q-pb-none">
<QAvatar
:icon="icon"
color="primary"
text-color="white"
size="xl"
v-if="icon"
/>
<span class="text-h6 text-grey">{{
t('negative.detail.modal.changeQuantity.title')
}}</span>
<QSpace />
<QBtn icon="close" flat round dense v-close-popup />
</QCardSection>
<QCardSection class="row items-center justify-center column items-stretch">
<span>{{ t('negative.detail.modal.changeQuantity.title') }}</span>
<VnInput
type="number"
:min="0"
:label="t('negative.detail.modal.changeQuantity.placeholder')"
v-model="newQuantity"
/>
</QCardSection>
<QCardActions align="right">
<QBtn :label="t('globals.cancel')" color="primary" flat v-close-popup />
<QBtn
:label="t('globals.confirm')"
color="primary"
:disable="!newQuantity || newQuantity < 0"
@click="updateQuantity()"
unelevated
autofocus
/> </QCardActions
></QCard>
</QDialog>
</template>
<style lang="scss" scoped>
.list {
max-height: 100%;
padding: 15px;
width: 100%;
}
.grid-style-transition {
transition: transform 0.28s, background-color 0.28s;
}
#true {
background-color: $positive;
}
#false {
background-color: $negative;
}
div.q-dialog__inner > div {
max-width: fit-content !important;
}
</style>

106
src/pages/Ticket/Negative/ChangeStateDialog.vue Normal file
View File

@ -0,0 +1,106 @@
<script setup>
import { ref } from 'vue';
import { useI18n } from 'vue-i18n';
import axios from 'axios';
import { useDialogPluginComponent } from 'quasar';
import VnSelect from 'src/components/common/VnSelect.vue';
import FetchData from 'components/FetchData.vue';
const editableStates = ref([]);
const { t } = useI18n();
const showChangeStateDialog = ref(false);
const newState = ref(null);
const { dialogRef, onDialogHide } = useDialogPluginComponent();
const $props = defineProps({
selectedRows: {
type: Array,
default: () => [],
},
});
const updateState = async () => {
showChangeStateDialog.value = true;
const rowsToUpdate = $props.selectedRows.map(({ ticketFk }) =>
axios.post(`Tickets/state`, {
ticketFk,
code: newState.value,
})
);
try {
await Promise.all(rowsToUpdate);
dialogRef.value.hide();
} catch (err) {
return err;
}
};
</script>
<template>
<QDialog ref="dialogRef" @hide="onDialogHide" v-model="showChangeStateDialog">
<FetchData
url="States/editableStates"
@on-fetch="(data) => (editableStates = data)"
auto-load
/>
<QCard class="q-pa-sm">
<QCardSection class="row items-center q-pb-none">
<QAvatar
:icon="icon"
color="primary"
text-color="white"
size="xl"
v-if="icon"
/>
<span class="text-h6 text-grey">{{
t('negative.detail.modal.changeState.title')
}}</span>
<QSpace />
<QBtn icon="close" flat round dense v-close-popup />
</QCardSection>
<QCardSection class="row items-center justify-center column items-stretch">
<span>{{ t('negative.detail.modal.changeState.title') }}</span>
<VnSelect
:label="t('negative.detail.modal.changeState.placeholder')"
v-model="newState"
:options="editableStates"
option-label="name"
option-value="id"
/>
</QCardSection>
<QCardActions align="right">
<QBtn :label="t('globals.cancel')" color="primary" flat v-close-popup />
<QBtn
:label="t('globals.confirm')"
color="primary"
:disable="!newState"
@click="updateState()"
unelevated
autofocus
/> </QCardActions
></QCard>
</QDialog>
</template>
<style lang="scss" scoped>
.list {
max-height: 100%;
padding: 15px;
width: 100%;
}
.grid-style-transition {
transition: transform 0.28s, background-color 0.28s;
}
#true {
background-color: $positive;
}
#false {
background-color: $negative;
}
div.q-dialog__inner > div {
max-width: fit-content !important;
}
</style>

12
src/pages/Ticket/Negative/NegativeOriginDialog.vue
View File

@ -6,7 +6,7 @@ import { useDialogPluginComponent } from 'quasar';
const { t } = useI18n();
const showNegativeOriginDialog = ref(false);
const reasonegativeOriginDialog = ref(null);
const reason = ref(null);
const { dialogRef, onDialogHide } = useDialogPluginComponent();
const $props = defineProps({
selectedRows: {
@ -14,11 +14,11 @@ const $props = defineProps({
default: () => [],
},
});
const updateNegativeOrigin = async () => {
const update = async () => {
showNegativeOriginDialog.value = true;
const negativeOrigins = $props.selectedRows.map(({ itemFk, lack }) => ({
itemFk,
negativeType: reasonegativeOriginDialog.value,
negativeType: reason.value,
lack,
}));
@ -52,7 +52,7 @@ const updateNegativeOrigin = async () => {
<span>{{ t('negative.modalOrigin.question') }}</span>
<QSelect
:label="t('globals.reason')"
v-model="reasonegativeOriginDialog"
v-model="reason"
:options="['FALTAS', 'CONTENEDOR', 'ENTRADAS', 'OVERBOOKING']"
/>
</QCardSection>
@ -61,8 +61,8 @@ const updateNegativeOrigin = async () => {
<QBtn
:label="t('globals.confirm')"
color="primary"
:disable="!reasonegativeOriginDialog"
@click="updateNegativeOrigin()"
:disable="!reason"
@click="update()"
unelevated
autofocus
/> </QCardActions

4
src/pages/Ticket/Negative/TicketLackDetail.vue
View File

@ -106,6 +106,7 @@ const tableColumnComponents = computed(() => ({
event: () => ({}),
},
state: {
style: 'width: 160px',
component: VnSelect,
type: 'select',
filterValue: null,
@ -140,6 +141,7 @@ const tableColumnComponents = computed(() => ({
class: 'input-number',
},
event: getInputEvents,
style: 'width: 100px',
},
alertLevelCode: {
@ -205,6 +207,7 @@ const columns = computed(() => [
field: 'quantity',
align: 'left',
sortable: true,
style: 'width: 100px',
},
{
name: 'alertLevelCode',
@ -326,6 +329,7 @@ const handleRows = (rows) => {
props
)
"
:style="tableColumnComponents[col.name].style"
>
<template v-if="isComponentVn(col)">{{
col.value

72
src/pages/Ticket/Negative/TicketLackList.vue
View File

@ -5,6 +5,8 @@ import { useStateStore } from 'stores/useStateStore';
import VnPaginate from 'components/ui/VnPaginate.vue';
import TicketLackFilter from 'pages/Ticket/Negative/TicketLackFilter.vue';
import TicketLackDetail from 'pages/Ticket/Negative/TicketLackDetail.vue';
import ChangeQuantityDialog from 'pages/Ticket/Negative/ChangeQuantityDialog.vue';
import ChangeStateDialog from 'pages/Ticket/Negative/ChangeStateDialog.vue';
import ItemProposal from 'src/pages/Item/components/ItemProposal.vue';
import NegativeOriginDialog from 'pages/Ticket/Negative/NegativeOriginDialog.vue';
@ -15,9 +17,12 @@ import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
const stateStore = useStateStore();
const { t } = useI18n();
const selectedRows = ref([]);
const selectedRowsDetail = ref([]);
const showNegativeOriginDialog = ref(false);
jgallego marked this conversation as resolved Outdated
jgallego commented 2025-02-05 06:04:17 +00:00
Outdated
Review
Copy Link

estos numeros habria que replantearlo o simplificarlo a uno

estos numeros habria que replantearlo o simplificarlo a uno
jsegarra commented 2025-02-05 14:23:40 +00:00
Outdated
Review
Copy Link

Ok, en la version ^1.1

Ok, en la version ^1.1
const showTotalNegativeOriginDialog = ref(false);
const showProposalDialog = ref(false);
const showChangeQuantityDialog = ref(false);
jgallego commented 2025-02-07 12:02:18 +00:00
Review
Copy Link

anota esto para cambiarlo en la proxima verison

anota esto para cambiarlo en la proxima verison
jsegarra commented 2025-02-07 21:42:15 +00:00
Review
Copy Link

Lo mas simple para todos es que lo pongamos sin valor/ a 0 y que se lo pongan al gusto en marcadores, como hemos explicados a otros comerciales. que te parece?

Y sino, las userConfigs

Lo mas simple para todos es que lo pongamos sin valor/ a 0 y que se lo pongan al gusto en marcadores, como hemos explicados a otros comerciales. que te parece? Y sino, las userConfigs
const showChangeStateDialog = ref(false);
const showFree = ref(true);
const currentRow = ref(null);
@ -27,6 +32,8 @@ const viewSummary = (row) => {
const originDialogRef = ref();
const totalNegativeDialogRef = ref();
const proposalDialogRef = ref();
const changeStateDialogRef = ref();
const changeQuantityDialogRef = ref();
const columns = computed(() => [
{
name: 'minTimed',
@ -46,7 +53,7 @@ const columns = computed(() => [
field: ({ longName }) => longName,
align: 'center',
sortable: true,
headerStyle: 'padding-left: 35px',
headerStyle: 'width: 350px',
},
{
name: 'producer',
@ -141,18 +148,43 @@ const columns = computed(() => [
</QBtnGroup>
</template>
<template #st-data>
<QBtnGroup v-if="currentRow" push style="column-gap: 1px">
<QBtn
color="primary"
@click="showProposalDialog = true"
icon="vn:splitline"
>
<QTooltip bottom anchor="bottom right">
{{ t('Item proposal') }}
</QTooltip>
</QBtn></QBtnGroup
>
<QCheckbox v-model="showFree" :label="t('negative.detail.showFree')" />
<template v-if="currentRow">
<QBtnGroup push style="column-gap: 1px">
<QBtn
color="primary"
:label="t('Change state')"
:disable="selectedRowsDetail.length < 2"
@click="showChangeStateDialog = true"
>
<QTooltip bottom anchor="bottom right">
{{ t('Change state') }}
</QTooltip>
</QBtn>
<QBtn
color="primary"
:label="t('Change quantity')"
@click="showChangeQuantityDialog = true"
:disable="selectedRowsDetail.length < 2"
>
<QTooltip bottom anchor="bottom right">
{{ t('Change quantity') }}
</QTooltip>
</QBtn>
<QBtn
color="primary"
@click="showProposalDialog = true"
icon="vn:splitline"
>
<QTooltip bottom anchor="bottom right">
{{ t('Item proposal') }}
</QTooltip>
</QBtn>
</QBtnGroup>
<QCheckbox
v-model="showFree"
:label="t('negative.detail.showFree')"
/>
</template>
</template>
</VnSubToolbar>
<div v-show="!currentRow" class="list">
@ -233,8 +265,22 @@ const columns = computed(() => [
<TicketLackDetail
:id="currentRow?.itemFk"
:filter="{ showFree }"
@selection="(values) => (selectedRowsDetail = values)"
></TicketLackDetail>
</div>
<ChangeStateDialog
ref="changeStateDialogRef"
@hide="onDialogHide"
v-model="showChangeStateDialog"
:selected-rows="selectedRowsDetail"
></ChangeStateDialog>
<ChangeQuantityDialog
ref="changeQuantityDialogRef"
@hide="onDialogHide"
v-model="showChangeQuantityDialog"
:selected-rows="selectedRowsDetail"
>
</ChangeQuantityDialog>
<ItemProposal
ref="proposalDialogRef"
@hide="onDialogHide"

7
src/pages/Ticket/locale/es.yml
View File

@ -42,3 +42,10 @@ negative:
isRookie: 'Cliente nuevo'
turno: 'Linea turno'
showFree: Mostrar las lineas Free
modal:
changeState:
title: Actualizar estado de los tickets
placeholder: Nuevo estado
changeQuantity:
title: Actualizar cantidad de los tickets
placeholder: Nueva cantidad