This commit is contained in:
parent
c2b52473a1
commit
18ea23adf1
|
@ -303,6 +303,7 @@ globals:
|
|||
email: Email
|
||||
SSN: SSN
|
||||
fi: FI
|
||||
deleteConfirmTitle: Delete selected elements
|
||||
errors:
|
||||
statusUnauthorized: Access denied
|
||||
statusInternalServerError: An internal server error has ocurred
|
||||
|
|
|
@ -307,6 +307,8 @@ globals:
|
|||
email: Correo
|
||||
SSN: NSS
|
||||
fi: NIF
|
||||
deleteConfirmTitle: Eliminar los elementos seleccionados
|
||||
|
||||
errors:
|
||||
statusUnauthorized: Acceso denegado
|
||||
statusInternalServerError: Ha ocurrido un error interno del servidor
|
||||
|
|
|
@ -159,7 +159,7 @@ const openTab = (id) =>
|
|||
color="primary"
|
||||
@click="
|
||||
openConfirmationModal(
|
||||
$t('salesOrdersTable.deleteConfirmTitle'),
|
||||
$t('globals.deleteConfirmTitle'),
|
||||
$t('salesOrdersTable.deleteConfirmMessage'),
|
||||
removeOrders
|
||||
)
|
||||
|
|
|
@ -15,7 +15,6 @@ salesOrdersTable:
|
|||
dateMake: Make date
|
||||
client: Client
|
||||
salesPerson: Salesperson
|
||||
deleteConfirmTitle: Delete selected elements
|
||||
deleteConfirmMessage: All the selected elements will be deleted. Are you sure you want to continue?
|
||||
agency: Agency
|
||||
import: Import
|
||||
|
|
|
@ -15,7 +15,6 @@ salesOrdersTable:
|
|||
dateMake: Fecha de realización
|
||||
client: Cliente
|
||||
salesPerson: Comercial
|
||||
deleteConfirmTitle: Eliminar los elementos seleccionados
|
||||
deleteConfirmMessage: Todos los elementos seleccionados serán eliminados. ¿Seguro que quieres continuar?
|
||||
agency: Agencia
|
||||
import: Importe
|
||||
|
|
|
@ -82,7 +82,7 @@ const columns = computed(() => [
|
|||
:create="{
|
||||
urlCreate: 'workerIncomes',
|
||||
title: t('Create balance'),
|
||||
onDataSaved: () => $refs.tableRef.reload(),
|
||||
onDataSaved: () => tableRef.reload(),
|
||||
formInitialData: {
|
||||
workerFk: entityId,
|
||||
},
|
||||
|
|
|
@ -329,16 +329,15 @@ const getMailStates = async (date) => {
|
|||
const url = `WorkerTimeControls/${route.params.id}/getMailStates`;
|
||||
const month = date.getMonth() + 1;
|
||||
const prevMonth = month == 1 ? 12 : month - 1;
|
||||
let prevMonthStates = [];
|
||||
|
||||
const params = {
|
||||
month,
|
||||
year: date.getFullYear(),
|
||||
};
|
||||
|
||||
const curMonthStates = (await axios.get(url, { params })).data;
|
||||
prevMonthStates = (await axios.get(url, { params: { ...params, month: prevMonth } }))
|
||||
.data;
|
||||
const prevMonthStates = (
|
||||
await axios.get(url, { params: { ...params, month: prevMonth } })
|
||||
).data;
|
||||
|
||||
workerTimeControlMails.value = curMonthStates.concat(prevMonthStates);
|
||||
};
|
||||
|
|
Loading…
Reference in New Issue