diff --git a/src/api/admin.ts b/src/api/admin.ts index 86c6c982..8cc92fcf 100644 --- a/src/api/admin.ts +++ b/src/api/admin.ts @@ -26,7 +26,6 @@ export const deleteCategoryAdmin = async (id: number) => { } export const addMemberAdmin = async (memberData: UserRegistrationProps) => { - console.log(memberData, '요청 데이터') const response = await axiosInstance.post('/api/managements/members', memberData) return response.data } diff --git a/src/api/user.ts b/src/api/user.ts index 2f981710..bfab0a85 100644 --- a/src/api/user.ts +++ b/src/api/user.ts @@ -1,5 +1,6 @@ import type { Status } from '@/types/common' import type { RequestApprovePostTypes } from '@/types/manager' +import type { userInfo } from '@/types/user' import { axiosInstance, formDataAxiosInstance } from '@/utils/axios' export const postTaskRequest = async (formdata: FormData) => { @@ -53,21 +54,26 @@ export const getHistory = async (taskID: number) => { } export const postComment = async (taskID: number, content: string) => { - const response = await axiosInstance.post(`/api/comment/${taskID}`, { content }) + const response = await axiosInstance.post(`/api/comments/${taskID}`, { content }) return response.data } export const postCommentAttachment = async (taskID: number, formdata: FormData) => { - const response = await formDataAxiosInstance.post(`/api/comment/attachment/${taskID}`, formdata) + const response = await formDataAxiosInstance.post(`/api/comments/attachment/${taskID}`, formdata) return response.data } export const patchComment = async (commentId: number, content: string) => { - const response = await axiosInstance.patch(`/api/comment/${commentId}`, { content }) + const response = await axiosInstance.patch(`/api/comments/${commentId}`, { content }) return response.data } export const deleteComment = async (commentId: number) => { - const response = await axiosInstance.delete(`/api/comment/${commentId}`) + const response = await axiosInstance.delete(`/api/comments/${commentId}`) + return response.data +} + +export const patchTaskRequest = async (taskId: string, formdata: FormData) => { + const response = await formDataAxiosInstance.patch(`/api/tasks/${taskId}`, formdata) return response.data } diff --git a/src/assets/styles.css b/src/assets/styles.css index ea127e9c..59fb688a 100644 --- a/src/assets/styles.css +++ b/src/assets/styles.css @@ -11,7 +11,7 @@ body { font-family: 'SUIT-Variable', sans-serif; - color: #18181B; + color: #18181b; } .shadow-custom { diff --git a/src/components/request-task/ReRequestTask.vue b/src/components/request-task/ReRequestTask.vue new file mode 100644 index 00000000..270a2ff9 --- /dev/null +++ b/src/components/request-task/ReRequestTask.vue @@ -0,0 +1,164 @@ + + + diff --git a/src/components/task-detail/TaskDetail.vue b/src/components/task-detail/TaskDetail.vue index 897fdac3..27b5fcf6 100644 --- a/src/components/task-detail/TaskDetail.vue +++ b/src/components/task-detail/TaskDetail.vue @@ -6,7 +6,7 @@ :is-approved="data?.taskStatus !== 'REQUESTED'" :close-task-detail="closeTaskDetail" :id="data?.taskId || 0" - :isProcessor="data?.processorNickName === info.nickname || info.memberRole === 'ROLE_'" + :isProcessor="data?.processorNickName === info.nickname || info.role === 'ROLE_MANAGER'" :isRequestor="data?.requesterNickName === info.nickname" />
() const memberStore = useMemberStore() const { info } = storeToRefs(memberStore) -console.log(info, '인포') const { data } = useQuery({ queryKey: ['taskDetailUser', selectedId], queryFn: - info.value.memberRole === 'ROLE_USER' + info.value.role === 'ROLE_USER' ? () => getTaskDetailUser(selectedId) : () => getTaskDetailManager(selectedId) }) @@ -57,6 +56,4 @@ const { data: historyData } = useQuery({ queryKey: ['historyData', selectedId], queryFn: () => getHistory(selectedId) }) - -console.log(historyData.value, '가져온 히스ㅇ토리', selectedId, '선택된 id') diff --git a/src/components/task-detail/TaskDetailHistoryChat.vue b/src/components/task-detail/TaskDetailHistoryChat.vue index 2763ab9f..4f6fbaed 100644 --- a/src/components/task-detail/TaskDetailHistoryChat.vue +++ b/src/components/task-detail/TaskDetailHistoryChat.vue @@ -33,10 +33,10 @@
+ ]"> 삭제
@@ -73,7 +73,9 @@ const clickMenuDot = async () => { const deleteCommentText = async () => { isClicked.value = !isClicked.value - await deleteComment(history.historyId) + if (history.details.commentDetails?.commentId !== undefined) { + await deleteComment(history.details.commentDetails.commentId) + } queryClient.invalidateQueries({ queryKey: ['historyData', taskId] }) } diff --git a/src/components/task-detail/TaskDetailLeft.vue b/src/components/task-detail/TaskDetailLeft.vue index 95fdade4..ca4e215d 100644 --- a/src/components/task-detail/TaskDetailLeft.vue +++ b/src/components/task-detail/TaskDetailLeft.vue @@ -14,7 +14,9 @@

부가 설명

-

{{ data.description }}

+

+ {{ data.description }} +

첨부 파일

diff --git a/src/components/task-detail/TaskDetailTopBar.vue b/src/components/task-detail/TaskDetailTopBar.vue index a8944afc..5da2987f 100644 --- a/src/components/task-detail/TaskDetailTopBar.vue +++ b/src/components/task-detail/TaskDetailTopBar.vue @@ -3,12 +3,14 @@

재요청

요청 수정

@@ -77,6 +79,4 @@ const ApproveTask = () => { toggleModal('approve') router.push(`/request-approve/${id}`) } - -console.log(isProcessor, '이즈 프로세서 값') diff --git a/src/components/task-detail/TaskStatusList.vue b/src/components/task-detail/TaskStatusList.vue index 3c071422..c6417a1f 100644 --- a/src/components/task-detail/TaskStatusList.vue +++ b/src/components/task-detail/TaskStatusList.vue @@ -114,8 +114,7 @@ const changeStatus = async (newStatus: Status) => { return } try { - const res = await patchChangeStatus(taskId || 0, newStatus) - console.log(res, '상태 바꾸기') + await patchChangeStatus(taskId || 0, newStatus) queryClient.invalidateQueries({ queryKey: ['historyData', taskId] }) } catch (error) { console.error('Failed to update status:', error) diff --git a/src/components/user-manage/UserRegistration.vue b/src/components/user-manage/UserRegistration.vue index 865aac49..ead5d1a8 100644 --- a/src/components/user-manage/UserRegistration.vue +++ b/src/components/user-manage/UserRegistration.vue @@ -69,9 +69,7 @@ const handleCancel = () => { } const handleSubmit = async () => { - console.log(userRegistrationForm.value) const formData = { ...userRegistrationForm.value, role: 'ROLE_USER', departmentId: 1 } - console.log(formData, '요청정보') await addMemberAdmin(formData) isModalVisible.value = true } diff --git a/src/layout/TheView.vue b/src/layout/TheView.vue index 99d0a959..bb11551a 100644 --- a/src/layout/TheView.vue +++ b/src/layout/TheView.vue @@ -10,27 +10,22 @@ diff --git a/src/types/user.ts b/src/types/user.ts index 2a131fbe..16a7a73e 100644 --- a/src/types/user.ts +++ b/src/types/user.ts @@ -99,6 +99,7 @@ export interface TaskDetails { } export interface CommentDetails { + commentId: number nickName: string profileImageUrl: string isModified: boolean @@ -106,6 +107,7 @@ export interface CommentDetails { } export interface CommentFileDetails { + commentId: number nickName: string profileImageUrl: string isModified: boolean diff --git a/src/views/TaskRequestView.vue b/src/views/TaskRequestView.vue index 172d6f8b..a7e152a5 100644 --- a/src/views/TaskRequestView.vue +++ b/src/views/TaskRequestView.vue @@ -1,11 +1,30 @@