Skip to content

synchronize with release #207

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
seorang42 merged 1 commit into from
Feb 18, 2025
Merged

synchronize with release #207

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions src/components/request-approve/RequestApprove.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@ import { INITIAL_REQUEST_APPROVE_DATA } from '@/constants/manager'
import { useErrorStore } from '@/stores/error'
import type { Category, SubCategory } from '@/types/common'
import { convertToISO, isAfterNow } from '@/utils/date'
import getPossibleCategory from '@/utils/possibleCategory'
import { redirectToLogin } from '@/utils/redirectToLogin'
import { computed, onMounted, ref, watch } from 'vue'
import { onBeforeRouteLeave, useRouter } from 'vue-router'
Expand All @@ -75,7 +76,6 @@ import CategoryDropDown from '../request-task/CategoryDropDown.vue'
import DueDateInput from './DueDateInput.vue'
import LabelDropdown from './LabelDropdown.vue'
import ManagerDropdown from './ManagerDropdown.vue'
import getPossibleCategory from '@/utils/possibleCategory'

const isModalVisible = ref(false)
const category1 = ref<Category | null>(null)
Expand Down Expand Up @@ -176,9 +176,10 @@ const handleSubmit = async () => {
const requestData = {
categoryId: category2.value.subCategoryId,
processorId: approveData.value.processor.memberId,
dueDate: isTimeFilled.value
? convertToISO(approveData.value.dueDate, approveData.value.dueTime)
: null,
dueDate:
!isTimeFilled.value && approveData.value.dueDate && approveData.value.dueTime
? convertToISO(approveData.value.dueDate, approveData.value.dueTime)
: null,
labelId: approveData.value.label?.labelId || null
}

Expand Down
2 changes: 1 addition & 1 deletion src/components/task-detail/TaskDetailRight.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@
<p class="task-detail">마감기한</p>
<div v-if="data.dueDate">
<div class="w-full flex justify-between items-center">
<p class="text-sm">{{ formatDueDate(data.dueDate) || '-' }}</p>
<p class="text-sm">{{ formatDueDate(data.dueDate) }}</p>
</div>
<p class="text-red-1 text-xs font-semibold">{{ formatDaysBefore(data.dueDate) }}</p>
</div>
Expand Down