+
+
+
+
+
+ {{ userMap[log.createdBy] }}
+ が申請の状態を
+
+
+ にしました
+
+
+
{{ formattedDateAndTime }}
diff --git a/src/components/requestDetail/ToTransactionButtons.vue b/src/components/requestDetail/ToTransactionButtons.vue
deleted file mode 100644
index 4e3325e0..00000000
--- a/src/components/requestDetail/ToTransactionButtons.vue
+++ /dev/null
@@ -1,36 +0,0 @@
-
-
-
-
-
- この申請から入出金記録を作成する
-
-
-
- この申請の入出金記録へ移動
-
-
-
-
diff --git a/src/components/requestDetail/composables/useNewComment.ts b/src/components/requestDetail/composables/useNewComment.ts
index 4b7bde53..1597789d 100644
--- a/src/components/requestDetail/composables/useNewComment.ts
+++ b/src/components/requestDetail/composables/useNewComment.ts
@@ -20,9 +20,7 @@ export const useNewComment = (requestId: string) => {
comment.value = ''
toast.success('コメントを送信しました')
} catch (e) {
- if (e instanceof Error) {
- toast.error(e.message)
- }
+ toast.error('送信に失敗しました')
}
isSending.value = false
}
diff --git a/src/components/requests/RequestItem.vue b/src/components/requests/RequestItem.vue
index 06fbd73e..0b36b429 100644
--- a/src/components/requests/RequestItem.vue
+++ b/src/components/requests/RequestItem.vue
@@ -41,7 +41,7 @@ const totalAmount = computed(
グループ:{{ request.group.name }}
- 申請者:{{ userMap[request.created_by] }}
+ 申請者:{{ userMap[request.createdBy] }}
申請日:{{ formattedDate }}
{{ totalAmount }}円
diff --git a/src/components/shared/EditButton.vue b/src/components/shared/EditButton.vue
index 831c5fbd..15a70bd9 100644
--- a/src/components/shared/EditButton.vue
+++ b/src/components/shared/EditButton.vue
@@ -1,9 +1,23 @@
diff --git a/src/components/shared/FloatingMenu.vue b/src/components/shared/FloatingMenu.vue
new file mode 100644
index 00000000..bbc20b7c
--- /dev/null
+++ b/src/components/shared/FloatingMenu.vue
@@ -0,0 +1,48 @@
+
+
+
+
+
+
+
+
+
diff --git a/src/components/shared/InputSelectMultiple.vue b/src/components/shared/InputSelectMultiple.vue
index 3c3ae66c..66951ccf 100644
--- a/src/components/shared/InputSelectMultiple.vue
+++ b/src/components/shared/InputSelectMultiple.vue
@@ -114,7 +114,7 @@ const removeValue = (selectedOption: Value) => {
/* コンポーネント外がクリックされたときの処理 */
const handleClickOutside = (e: MouseEvent) => {
const target = e.target as HTMLElement
- if (inputSelectRef.value === null) return
+ if (inputSelectRef.value === null || !isDropdownOpen.value) return
if (!inputSelectRef.value.contains(target)) {
isDropdownOpen.value = false
emit('close')
diff --git a/src/components/shared/InputSelectSingle.vue b/src/components/shared/InputSelectSingle.vue
index 7e135674..474fd8c3 100644
--- a/src/components/shared/InputSelectSingle.vue
+++ b/src/components/shared/InputSelectSingle.vue
@@ -76,13 +76,13 @@ const selectValue = (selectedOption: Value) => {
}
const removeValue = () => {
setTimeout(() => {
- emit('update:modelValue', '')
+ emit('update:modelValue', null)
}, 10)
}
const handleClickOutside = (e: MouseEvent) => {
const target = e.target as HTMLElement
- if (inputSelectRef.value === null) return
+ if (inputSelectRef.value === null || !isDropdownOpen.value) return
if (!inputSelectRef.value.contains(target)) {
isDropdownOpen.value = false
emit('close')
diff --git a/src/components/shared/InputText.vue b/src/components/shared/InputText.vue
index e0fb3fa2..b8e7f94e 100644
--- a/src/components/shared/InputText.vue
+++ b/src/components/shared/InputText.vue
@@ -34,7 +34,7 @@ onMounted(() => {
{