diff --git a/src/components/requestDetail/NewComment.vue b/src/components/requestDetail/NewComment.vue index a96794f7..6938bca2 100644 --- a/src/components/requestDetail/NewComment.vue +++ b/src/components/requestDetail/NewComment.vue @@ -13,17 +13,16 @@ const { comment, isSending, submit } = useNewComment(request.value?.id ?? '') - - - + + + type="success" + @click="submit"> コメントする - - + + diff --git a/src/components/requestDetail/RequestContent.vue b/src/components/requestDetail/RequestContent.vue deleted file mode 100644 index aa1fbdfc..00000000 --- a/src/components/requestDetail/RequestContent.vue +++ /dev/null @@ -1,60 +0,0 @@ - - - - - 詳細: - - - - 編集 - - - - - - 完了 - - - - diff --git a/src/components/requestDetail/RequestLogs.vue b/src/components/requestDetail/RequestLogs.vue index 3a0c8fd2..b2718a17 100644 --- a/src/components/requestDetail/RequestLogs.vue +++ b/src/components/requestDetail/RequestLogs.vue @@ -9,6 +9,7 @@ import type { RequestStatusDetail } from '/@/features/requestStatus/model' import CommentLog from './CommentLog.vue' import StatusChangeLog from './StatusChangeLog.vue' +import NewComment from './NewComment.vue' type CommentWithType = RequestComment & { type: 'comment' } type StatusWithType = RequestStatusDetail & { type: 'statusChange' } diff --git a/src/components/shared/InputTextarea.vue b/src/components/shared/InputTextarea.vue index b583b824..20e550a7 100644 --- a/src/components/shared/InputTextarea.vue +++ b/src/components/shared/InputTextarea.vue @@ -34,7 +34,7 @@ onMounted(() => { () const currentTab = ref('input') const selectedTemplate = ref('') -const templateOptions = computed(() => { - return ( +const templateOptions = computed( + () => props.templates?.map(template => { return { key: template.name, value: template.name } }) ?? [] - ) -}) +) function setTemplate(template: string) { const foundTemplate = props.templates?.find(t => t.name === template) @@ -48,43 +47,53 @@ function changeCurrentTab(tab: TabType) { - - - - 入力 - - - プレビュー - + + + + + 入力 + + + プレビュー + + - + + + +