diff --git a/src/pages/Worker/Card/WorkerTimeControl.vue b/src/pages/Worker/Card/WorkerTimeControl.vue index 7def6e94c..9c0fa6758 100644 --- a/src/pages/Worker/Card/WorkerTimeControl.vue +++ b/src/pages/Worker/Card/WorkerTimeControl.vue @@ -343,19 +343,29 @@ const updateData = async () => { const getMailStates = async (date) => { const url = `WorkerTimeControls/${route.params.id}/getMailStates`; + const year = date.getFullYear(); const month = date.getMonth() + 1; - const prevMonth = month == 1 ? 12 : month - 1; - const params = { - month, - year: date.getFullYear(), + + const getMonthStates = async (month, year) => { + return (await axios.get(url, { params: { month, year } })).data; }; - const curMonthStates = (await axios.get(url, { params })).data; - const prevMonthStates = ( - await axios.get(url, { params: { ...params, month: prevMonth } }) - ).data; + const curMonthStates = await getMonthStates(month, year); - workerTimeControlMails.value = curMonthStates.concat(prevMonthStates); + const prevMonthStates = await getMonthStates( + month === 1 ? 12 : month - 1, + month === 1 ? year - 1 : year, + ); + + const postMonthStates = await getMonthStates( + month === 12 ? 1 : month + 1, + month === 12 ? year + 1 : year, + ); + workerTimeControlMails.value = [ + ...curMonthStates, + ...prevMonthStates, + ...postMonthStates, + ]; }; const showWorkerTimeForm = (propValue, formType) => {