diff --git a/src/api/admin.ts b/src/api/admin.ts
index e87b88af..65f6e852 100644
--- a/src/api/admin.ts
+++ b/src/api/admin.ts
@@ -1,4 +1,5 @@
-import type { LabelDataTypes, NewLabelTypes } from '@/types/admin'
+import type { NewLabelTypes } from '@/types/admin'
+import type { LabelDataTypes } from '@/types/common'
import { axiosInstance } from '@/utils/axios'
export const deleteLabelAdmin = async (id: number) => {
diff --git a/src/api/user.ts b/src/api/user.ts
index 28ca9ccf..00bcc2d9 100644
--- a/src/api/user.ts
+++ b/src/api/user.ts
@@ -1,4 +1,5 @@
-import { formDataAxiosInstance } from '@/utils/axios'
+import type { RequestApprovePostTypes } from '@/types/manager'
+import { axiosInstance, formDataAxiosInstance } from '@/utils/axios'
export const postTaskRequest = async (formdata: FormData) => {
const response = await formDataAxiosInstance.post('/api/tasks', formdata)
@@ -6,11 +7,26 @@ export const postTaskRequest = async (formdata: FormData) => {
}
export const getTaskDetailUser = async (id: number) => {
- const response = await formDataAxiosInstance.get(`/api/tasks/${id}/requests/details`)
+ const response = await axiosInstance.get(`/api/tasks/${id}/requests/details`)
return response.data
}
export const getTaskDetailManager = async (id: number) => {
- const response = await formDataAxiosInstance.get(`/api/tasks/${id}/details`)
+ const response = await axiosInstance.get(`/api/tasks/${id}/details`)
+ return response.data
+}
+
+export const getLabelsManager = async () => {
+ const response = await axiosInstance.get('/api/labels?page=0&size=5')
+ return response.data
+}
+
+export const postTaskApprove = async (id: number, data: RequestApprovePostTypes) => {
+ const response = await axiosInstance.post(`/api/tasks/${id}/approval`, data)
+ return response.data
+}
+
+export const getManager = async () => {
+ const response = await axiosInstance.get('/api/managers')
return response.data
}
diff --git a/src/components/request-approve/DueDateInput.vue b/src/components/request-approve/DueDateInput.vue
index 17043931..166a4ee2 100644
--- a/src/components/request-approve/DueDateInput.vue
+++ b/src/components/request-approve/DueDateInput.vue
@@ -1,14 +1,23 @@
(e.target as HTMLInputElement).showPicker()" />
+ @focus="e => (e.target as HTMLInputElement).showPicker()"
+ @input="updateValue(($event.target as HTMLInputElement).value)" />
diff --git a/src/components/request-approve/LabelDropdown.vue b/src/components/request-approve/LabelDropdown.vue
new file mode 100644
index 00000000..ea8c599b
--- /dev/null
+++ b/src/components/request-approve/LabelDropdown.vue
@@ -0,0 +1,56 @@
+
+
+ {{ modelValue?.labelName || placeholderText }}
+ 담당자 변경 *
+ 담당자를 선택해주세요
+
+ {{ modelValue?.nickname || placeholderText }}
+
+ {{ option.nickname }}
+ 잔여 작업 : {{ option.remainingTasks }} {{ labelName }} *
- {{ modelValue || placeholderText }}
-
- {{ option }}
- 잔여 작업 : {{ 3 }}
+
+
-
마감기한
부가설명