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