diff --git a/src/api/user.ts b/src/api/user.ts index 4b6d2eaf..72940f3b 100644 --- a/src/api/user.ts +++ b/src/api/user.ts @@ -57,3 +57,23 @@ export const getHistory = async (taskID: number) => { const response = await axiosInstance.get(`/api/tasks/${taskID}/histories`) return response.data } + +export const postComment = async (taskID: number, content: string) => { + const response = await axiosInstance.post(`/api/comment/${taskID}`, { content }) + return response.data +} + +export const postCommentAttachment = async (taskID: number, formdata: FormData) => { + const response = await formDataAxiosInstance.post(`/api/comment/attachment/${taskID}`, formdata) + return response.data +} + +export const patchComment = async (commentId: number, content: string) => { + const response = await axiosInstance.patch(`/api/comment/${commentId}`, { content }) + return response.data +} + +export const deleteComment = async (commentId: number) => { + const response = await axiosInstance.delete(`/api/comment/${commentId}`) + return response.data +} diff --git a/src/assets/styles.css b/src/assets/styles.css index 4627248b..ea127e9c 100644 --- a/src/assets/styles.css +++ b/src/assets/styles.css @@ -11,6 +11,7 @@ body { font-family: 'SUIT-Variable', sans-serif; + color: #18181B; } .shadow-custom { diff --git a/src/components/my-request/MyRequestList.vue b/src/components/my-request/MyRequestList.vue index a53cfe21..8409cfd3 100644 --- a/src/components/my-request/MyRequestList.vue +++ b/src/components/my-request/MyRequestList.vue @@ -26,13 +26,13 @@ import { useRequestParamsStore } from '@/stores/params' import type { MyRequestResponse } from '@/types/user' import { axiosInstance } from '@/utils/axios' import { useQuery } from '@tanstack/vue-query' +import { computed } from 'vue' import { useParseParams } from '../hooks/useParseParams' import ListContainer from '../lists/ListContainer.vue' import ListPagination from '../lists/ListPagination.vue' import NoContent from '../lists/NoContent.vue' import MyRequestListBar from './MyRequestListBar.vue' import MyRequestListCard from './MyRequestListCard.vue' -import { computed } from 'vue' const { params } = useRequestParamsStore() const onPageChange = (value: number) => { diff --git a/src/components/request-task/RequestTask.vue b/src/components/request-task/RequestTask.vue index 985e3d3f..34d716ed 100644 --- a/src/components/request-task/RequestTask.vue +++ b/src/components/request-task/RequestTask.vue @@ -96,7 +96,6 @@ const handleSubmit = async () => { const formData = new FormData() const taskInfo = { categoryId: category2.value.id, - title: title.value, description: description.value } diff --git a/src/components/requested/RequestedListCard.vue b/src/components/requested/RequestedListCard.vue index ccfb088d..d792a4c8 100644 --- a/src/components/requested/RequestedListCard.vue +++ b/src/components/requested/RequestedListCard.vue @@ -2,6 +2,7 @@
{{ history.details.commentDetails?.nickName }}
++ {{ history.details.commentDetails?.comment }} +
+{{ history.details.commentFileDetails?.nickName }}
+{{ history.details.commentFileDetails?.fileName }}
++ 용량 : {{ history.details.commentFileDetails?.size }} +
+부가 설명
-{{ data.description }}
+{{ data.description }}
첨부 파일
diff --git a/src/components/task-detail/TaskDetailRight.vue b/src/components/task-detail/TaskDetailRight.vue index bf992b9f..7332f94e 100644 --- a/src/components/task-detail/TaskDetailRight.vue +++ b/src/components/task-detail/TaskDetailRight.vue @@ -1,8 +1,8 @@ID
-{{ data.taskId || '-' }}
+고유코드
+{{ data.taskCode || '-' }}
요청일
@@ -56,25 +56,31 @@{{ data.processorNickName || '-' }}
마감기한
-{{ formatDueDate(data.dueDate) || '-' }}
+{{ formatDueDate(data.dueDate) || '-' }}
+{{ formatDaysBefore(data.dueDate) }}
{{ formatDaysBefore(data.dueDate) }}
+구분
-재요청
요청 수정
@@ -22,7 +22,7 @@요청취소
@@ -57,7 +57,8 @@ import CommonIcons from '../common/CommonIcons.vue' import ModalView from '../ModalView.vue' const router = useRouter() -const { isApproved, closeTaskDetail, id, isProcessor } = defineProps