feat: refs #6321 style updates
This commit is contained in:
parent
805e56b9d3
commit
231f67df5c
|
@ -223,6 +223,7 @@ item:
|
||||||
search: 'Search item'
|
search: 'Search item'
|
||||||
searchInfo: 'You can search by id'
|
searchInfo: 'You can search by id'
|
||||||
regularizeStock: Regularize stock
|
regularizeStock: Regularize stock
|
||||||
|
itemProposal: Items proposal
|
||||||
proposal:
|
proposal:
|
||||||
difference: Difference
|
difference: Difference
|
||||||
title: Items proposal
|
title: Items proposal
|
||||||
|
|
|
@ -6,6 +6,7 @@ import VnInput from 'src/components/common/VnInput.vue';
|
||||||
import TicketTransferForm from './TicketTransferForm.vue';
|
import TicketTransferForm from './TicketTransferForm.vue';
|
||||||
|
|
||||||
import { toDateFormat } from 'src/filters/date.js';
|
import { toDateFormat } from 'src/filters/date.js';
|
||||||
|
import VnInputDate from 'src/components/common/VnInputDate.vue';
|
||||||
|
|
||||||
const $props = defineProps({
|
const $props = defineProps({
|
||||||
mana: {
|
mana: {
|
||||||
|
@ -24,6 +25,10 @@ const $props = defineProps({
|
||||||
type: Object,
|
type: Object,
|
||||||
default: () => {},
|
default: () => {},
|
||||||
},
|
},
|
||||||
|
split: {
|
||||||
|
type: Boolean,
|
||||||
|
default: false,
|
||||||
|
},
|
||||||
});
|
});
|
||||||
|
|
||||||
onMounted(() => (_transfer.value = $props.transfer));
|
onMounted(() => (_transfer.value = $props.transfer));
|
||||||
|
@ -31,7 +36,7 @@ const { t } = useI18n();
|
||||||
const QPopupProxyRef = ref(null);
|
const QPopupProxyRef = ref(null);
|
||||||
const transferFormRef = ref(null);
|
const transferFormRef = ref(null);
|
||||||
const _transfer = ref();
|
const _transfer = ref();
|
||||||
|
const splitDate = ref(Date.vnNew());
|
||||||
const transferLinesColumns = computed(() => [
|
const transferLinesColumns = computed(() => [
|
||||||
{
|
{
|
||||||
label: t('ticketList.id'),
|
label: t('ticketList.id'),
|
||||||
|
@ -91,6 +96,11 @@ const handleRowClick = (row) => {
|
||||||
|
|
||||||
<template>
|
<template>
|
||||||
<QPopupProxy ref="popupProxyRef" data-cy="ticketTransferPopup">
|
<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">
|
<QCard class="full-width q-px-md" style="display: flex; width: 80vw">
|
||||||
<QTable
|
<QTable
|
||||||
:rows="transfer.sales"
|
:rows="transfer.sales"
|
||||||
|
|
|
@ -182,15 +182,12 @@ const filterTable = { stateFk: 0, warehouseFk: useState().getUser().value.wareho
|
||||||
data-cy="transferLines"
|
data-cy="transferLines"
|
||||||
color="primary"
|
color="primary"
|
||||||
icon="vn:splitline"
|
icon="vn:splitline"
|
||||||
:disable="selectedRows.length < 1 || someBasket"
|
:disable="selectedRows.length < 1"
|
||||||
>
|
>
|
||||||
<QTooltip v-if="someBasket"
|
<QTooltip>{{ t('ticketSale.transferLines') }} </QTooltip>
|
||||||
>{{ t('Some row selected is basket') }} {{ someBasket }}</QTooltip
|
|
||||||
>
|
|
||||||
<QTooltip v-else
|
|
||||||
>{{ t('ticketSale.transferLines') }} {{ someBasket }}</QTooltip
|
|
||||||
>
|
|
||||||
<TicketTransfer
|
<TicketTransfer
|
||||||
|
ref="transferFormRef"
|
||||||
|
split="true"
|
||||||
class="full-width"
|
class="full-width"
|
||||||
:transfer="{
|
:transfer="{
|
||||||
sales: selectedRows,
|
sales: selectedRows,
|
||||||
|
|
|
@ -77,9 +77,10 @@ const saveChange = async (field, { rowIndex, row }) => {
|
||||||
};
|
};
|
||||||
const entityId = computed(() => route.params.id);
|
const entityId = computed(() => route.params.id);
|
||||||
const item = ref({});
|
const item = ref({});
|
||||||
|
const hasToIgnore = (row) => row.hasToIgnore === 1;
|
||||||
const rowColor = (row) => {
|
const rowColor = (row) => {
|
||||||
if (row.hasToIgnore) return 'negative';
|
if (hasToIgnore(row)) return 'transparent';
|
||||||
return 'transparent';
|
return 'negative';
|
||||||
};
|
};
|
||||||
// const textRowColor = (row) => {
|
// const textRowColor = (row) => {
|
||||||
// if (row.hasToIgnore) return 'black';
|
// if (row.hasToIgnore) return 'black';
|
||||||
|
@ -151,11 +152,11 @@ const columns = computed(() => [
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
name: 'theoreticalhour',
|
name: 'minTimed',
|
||||||
label: t('negative.detail.theoreticalhour'),
|
label: t('negative.detail.theoreticalhour'),
|
||||||
field: 'theoreticalhour',
|
field: 'minTimed',
|
||||||
align: 'left',
|
align: 'left',
|
||||||
format: ({ theoreticalhour }) => toHour(theoreticalhour),
|
format: ({ minTimed }) => toHour(minTimed),
|
||||||
sortable: true,
|
sortable: true,
|
||||||
component: 'time',
|
component: 'time',
|
||||||
columnClass: 'shrink',
|
columnClass: 'shrink',
|
||||||
|
@ -214,10 +215,6 @@ function onBuysFetched(data) {
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<template>
|
<template>
|
||||||
<pre>
|
|
||||||
{{ $props.filter }}
|
|
||||||
</pre
|
|
||||||
>
|
|
||||||
<FetchData
|
<FetchData
|
||||||
:url="`Items/${entityId}/getCard`"
|
:url="`Items/${entityId}/getCard`"
|
||||||
:fields="['longName']"
|
:fields="['longName']"
|
||||||
|
@ -320,11 +317,15 @@ function onBuysFetched(data) {
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<template #column-ticketFk="{ row }">
|
<template #column-ticketFk="{ row }">
|
||||||
<QBadge class="q-pa-sm" :color="rowColor(row)">
|
<QBadge
|
||||||
{{ row.ticketFk }}
|
class="q-pa-sm"
|
||||||
|
:class="{ link: hasToIgnore(row) }"
|
||||||
|
:color="rowColor(row)"
|
||||||
|
>
|
||||||
|
{{ row.id }}
|
||||||
|
<TicketDescriptorProxy :id="row.id" />
|
||||||
</QBadge>
|
</QBadge>
|
||||||
<TicketDescriptorProxy :id="row.ticketFk"
|
</template>
|
||||||
/></template>
|
|
||||||
<template #column-alertLevelCode="props">
|
<template #column-alertLevelCode="props">
|
||||||
<VnSelect
|
<VnSelect
|
||||||
url="States/editableStates"
|
url="States/editableStates"
|
||||||
|
|
|
@ -23,7 +23,7 @@ ticketSale:
|
||||||
hasComponentLack: Component lack
|
hasComponentLack: Component lack
|
||||||
ok: Ok
|
ok: Ok
|
||||||
more: More
|
more: More
|
||||||
transferLines: Transfer lines
|
transferLines: Transfer lines(no basket)/ Split
|
||||||
transferBasket: Some row selected is basket
|
transferBasket: Some row selected is basket
|
||||||
advanceTickets:
|
advanceTickets:
|
||||||
preparation: Preparation
|
preparation: Preparation
|
||||||
|
|
|
@ -127,7 +127,7 @@ ticketSale:
|
||||||
ok: Ok
|
ok: Ok
|
||||||
more: Más
|
more: Más
|
||||||
address: Consignatario
|
address: Consignatario
|
||||||
transferLines: Transferir líneas
|
transferLines: Transferir líneas(no cesta)/ Separar
|
||||||
transferBasket: No disponible para una cesta
|
transferBasket: No disponible para una cesta
|
||||||
size: Medida
|
size: Medida
|
||||||
ticketComponents:
|
ticketComponents:
|
||||||
|
|
Loading…
Reference in New Issue