diff --git a/src/api/admin.ts b/src/api/admin.ts index 5a952967..e87b88af 100644 --- a/src/api/admin.ts +++ b/src/api/admin.ts @@ -1,11 +1,6 @@ import type { LabelDataTypes, NewLabelTypes } from '@/types/admin' import { axiosInstance } from '@/utils/axios' -export const getLabelsAdmin = async () => { - const response = await axiosInstance.get('/api/managements/labels') - return response.data -} - export const deleteLabelAdmin = async (id: number) => { const response = await axiosInstance.delete(`/api/management/labels/${id}`) return response.data diff --git a/src/api/common.ts b/src/api/common.ts index ade690e6..a55b64f0 100644 --- a/src/api/common.ts +++ b/src/api/common.ts @@ -14,3 +14,8 @@ export const getAllCategory = async () => { const response = await axiosInstance.get('/api/category') return response.data } + +export const getLabels = async () => { + const response = await axiosInstance.get('/api/labels') + return response.data +} diff --git a/src/components/request-task/RequestTaskDropdown.vue b/src/components/request-task/RequestTaskDropdown.vue index 0ede8277..6271a211 100644 --- a/src/components/request-task/RequestTaskDropdown.vue +++ b/src/components/request-task/RequestTaskDropdown.vue @@ -10,8 +10,9 @@
+ class="flex w-full h-11 items-center rounded p-4 border border-border-1" + :class="disabled ? 'bg-background-1 text-disabled' : 'bg-white text-black cursor-pointer'" + @click="!disabled && toggleDropdown()">

{{ modelValue || placeholderText }}

@@ -40,7 +41,7 @@ import type { RequestTaskDropdownProps } from '@/types/user' import { ref } from 'vue' import CommonIcons from '../common/CommonIcons.vue' -const { placeholderText, options, labelName, modelValue, isLabel } = +const { placeholderText, options, labelName, modelValue, isLabel, disabled } = defineProps() const emit = defineEmits(['update:modelValue']) const dropdownOpen = ref(false) diff --git a/src/components/task-management/CategoryAdd.vue b/src/components/task-management/CategoryAdd.vue index f96c4c2e..2de99043 100644 --- a/src/components/task-management/CategoryAdd.vue +++ b/src/components/task-management/CategoryAdd.vue @@ -4,14 +4,14 @@ :is-open="isModalVisible.add" type="successType" @close="handleAddModal"> - + - + + v-if="categoryStep == '2'" + :disabled="route.params.id !== undefined" /> + :submit-text="route.params.id ? '수정' : '등록'" />
- - diff --git a/src/views/CategorySecondAdd.vue b/src/views/CategorySecondAdd.vue index e2fc2bac..cdea7edf 100644 --- a/src/views/CategorySecondAdd.vue +++ b/src/views/CategorySecondAdd.vue @@ -1,6 +1,6 @@