Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 2 additions & 1 deletion src/components/common/ModalView.vue
Original file line number Diff line number Diff line change
Expand Up @@ -81,9 +81,9 @@

<script setup lang="ts">
import { failIcon, successIcon, warningIcon } from '@/constants/iconPath'
import { preventEnter } from '@/utils/preventEnter'
import { onUnmounted, ref, watch } from 'vue'
import CommonIcons from './CommonIcons.vue'
import { preventEnter } from '@/utils/preventEnter'

const { isOpen, type, modelValue } = defineProps<{
isOpen: boolean
Expand Down Expand Up @@ -116,6 +116,7 @@ watch(
() => isOpen,
() => {
if (isOpen) {
textValue.value = ''
document.body.style.overflow = 'hidden'
window.addEventListener('keydown', preventEnter)
} else {
Expand Down
4 changes: 3 additions & 1 deletion src/components/task-detail/TaskDetailHistory.vue
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,9 @@
</div>
<div class="flex w-full flex-col items-center">
<TaskDetailHistoryChat
v-if="item.taskHistoryType === 'COMMENT'"
v-if="
item.taskHistoryType === 'COMMENT' || item.taskHistoryType === 'TASK_TERMINATED'
"
:history="item"
:requestor-name="requestorName"
:task-id="taskId" />
Expand Down
2 changes: 1 addition & 1 deletion src/components/task-detail/TaskDetailHistoryChat.vue
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
'flex max-w-[400px] flex-wrap px-4 py-3 text-base rounded-lg font-normal',
isRequestor ? 'bg-background-2' : 'bg-primary2'
]">
{{ history.details.commentDetails?.comment }}
{{ history.details.commentDetails?.comment || history.details.taskDetails?.value }}
</p>
<div
:class="[
Expand Down
2 changes: 1 addition & 1 deletion src/components/task-detail/TaskDetailRight.vue
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<template>
<div class="sticky top-0 w-[280px] shrink-0 flex flex-col gap-y-6 overflow-y-auto p-6">
<div class="sticky top-0 w-[280px] shrink-0 flex flex-col gap-y-6 overflow-y-auto p-6 scrollbar-hide">
<div>
<p class="task-detail">작업코드</p>
<p class="text-sm">{{ data.taskCode || '-' }}</p>
Expand Down
2 changes: 1 addition & 1 deletion src/components/task-detail/TaskStatusList.vue
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ const rejectRequest = async () => {
return
}
try {
await axiosInstance.patch(`/api/tasks/${taskId}/terminate`, rejectReason)
await axiosInstance.patch(`/api/tasks/${taskId}/terminate`, { reason: rejectReason.value })
toggleModal('success')
emit('update:status', 'TERMINATED')
currentStatus.value = 'TERMINATED'
Expand Down
2 changes: 1 addition & 1 deletion src/components/user-manage/UserRegistration.vue
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
:labelName="'이메일'" />
<RequestTaskInput
v-model="userRegistrationForm.email"
:placeholderText="'@kakao.com'"
:placeholderText="'@kakaocorp.com'"
:label-name="'도메인'"
:is-not-required="false" />
</div>
Expand Down
2 changes: 1 addition & 1 deletion src/views/LoginView.vue
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ const handleLogin = async () => {
'로그인 시도 5회 초과로 계정이 정지되었습니다\n30분 후 다시 시도해주세요'
} else {
messageHeader.value = '일치하는 정보가 없습니다'
messageBody.value = '닉네임과 비밀번호를 다시 확인해주세요'
messageBody.value = '아이디과 비밀번호를 다시 확인해주세요'
}
isModalVisible.value = !isModalVisible.value
break
Expand Down