feat: refs #6321 style updates

This commit is contained in:
Javier Segarra 2025-01-27 19:54:12 +01:00
parent 805e56b9d3
commit 231f67df5c
6 changed files with 32 additions and 23 deletions

View File

@ -223,6 +223,7 @@ item:
search: 'Search item'
searchInfo: 'You can search by id'
regularizeStock: Regularize stock
itemProposal: Items proposal
proposal:
difference: Difference
title: Items proposal

View File

@ -6,6 +6,7 @@ import VnInput from 'src/components/common/VnInput.vue';
import TicketTransferForm from './TicketTransferForm.vue';
import { toDateFormat } from 'src/filters/date.js';
import VnInputDate from 'src/components/common/VnInputDate.vue';
const $props = defineProps({
mana: {
@ -24,6 +25,10 @@ const $props = defineProps({
type: Object,
default: () => {},
},
split: {
type: Boolean,
default: false,
},
});
onMounted(() => (_transfer.value = $props.transfer));
@ -31,7 +36,7 @@ const { t } = useI18n();
const QPopupProxyRef = ref(null);
const transferFormRef = ref(null);
const _transfer = ref();
const splitDate = ref(Date.vnNew());
const transferLinesColumns = computed(() => [
{
label: t('ticketList.id'),
@ -91,6 +96,11 @@ const handleRowClick = (row) => {
<template>
<QPopupProxy ref="popupProxyRef" data-cy="ticketTransferPopup">
<div class="flex row items-center q-ma-lg" v-if="$props.split">
<QBtn class="q-mr-sm" color="primary" label="Split"></QBtn>
<VnInputDate :label="$t('New date')" v-model="splitDate"></VnInputDate>
</div>
<QSeparator class="q-my-lg" color="primary" />
<QCard class="full-width q-px-md" style="display: flex; width: 80vw">
<QTable
:rows="transfer.sales"

View File

@ -182,15 +182,12 @@ const filterTable = { stateFk: 0, warehouseFk: useState().getUser().value.wareho
data-cy="transferLines"
color="primary"
icon="vn:splitline"
:disable="selectedRows.length < 1 || someBasket"
:disable="selectedRows.length < 1"
>
<QTooltip v-if="someBasket"
>{{ t('Some row selected is basket') }} {{ someBasket }}</QTooltip
>
<QTooltip v-else
>{{ t('ticketSale.transferLines') }} {{ someBasket }}</QTooltip
>
<QTooltip>{{ t('ticketSale.transferLines') }} </QTooltip>
<TicketTransfer
ref="transferFormRef"
split="true"
class="full-width"
:transfer="{
sales: selectedRows,

View File

@ -77,9 +77,10 @@ const saveChange = async (field, { rowIndex, row }) => {
};
const entityId = computed(() => route.params.id);
const item = ref({});
const hasToIgnore = (row) => row.hasToIgnore === 1;
const rowColor = (row) => {
if (row.hasToIgnore) return 'negative';
return 'transparent';
if (hasToIgnore(row)) return 'transparent';
return 'negative';
};
// const textRowColor = (row) => {
// if (row.hasToIgnore) return 'black';
@ -151,11 +152,11 @@ const columns = computed(() => [
},
},
{
name: 'theoreticalhour',
name: 'minTimed',
label: t('negative.detail.theoreticalhour'),
field: 'theoreticalhour',
field: 'minTimed',
align: 'left',
format: ({ theoreticalhour }) => toHour(theoreticalhour),
format: ({ minTimed }) => toHour(minTimed),
sortable: true,
component: 'time',
columnClass: 'shrink',
@ -214,10 +215,6 @@ function onBuysFetched(data) {
</script>
<template>
<pre>
{{ $props.filter }}
</pre
>
<FetchData
:url="`Items/${entityId}/getCard`"
:fields="['longName']"
@ -320,11 +317,15 @@ function onBuysFetched(data) {
</template>
<template #column-ticketFk="{ row }">
<QBadge class="q-pa-sm" :color="rowColor(row)">
{{ row.ticketFk }}
<QBadge
class="q-pa-sm"
:class="{ link: hasToIgnore(row) }"
:color="rowColor(row)"
>
{{ row.id }}
<TicketDescriptorProxy :id="row.id" />
</QBadge>
<TicketDescriptorProxy :id="row.ticketFk"
/></template>
</template>
<template #column-alertLevelCode="props">
<VnSelect
url="States/editableStates"

View File

@ -23,7 +23,7 @@ ticketSale:
hasComponentLack: Component lack
ok: Ok
more: More
transferLines: Transfer lines
transferLines: Transfer lines(no basket)/ Split
transferBasket: Some row selected is basket
advanceTickets:
preparation: Preparation

View File

@ -127,7 +127,7 @@ ticketSale:
ok: Ok
more: Más
address: Consignatario
transferLines: Transferir líneas
transferLines: Transferir líneas(no cesta)/ Separar
transferBasket: No disponible para una cesta
size: Medida
ticketComponents: