From e02cf7bbc41ff49195ff945857337167faca5204 Mon Sep 17 00:00:00 2001 From: rei Date: Mon, 17 Jun 2024 18:04:53 +0900 Subject: [PATCH 01/24] =?UTF-8?q?=E2=9C=A8=20=E3=83=95=E3=82=A3=E3=83=AB?= =?UTF-8?q?=E3=82=BF=E3=83=BC=E3=82=92=E4=B8=80=E6=99=82=E7=9A=84=E3=81=AB?= =?UTF-8?q?=E5=89=8A=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/RequestsPage.vue | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/pages/RequestsPage.vue b/src/pages/RequestsPage.vue index ee2ca877..18557c6d 100644 --- a/src/pages/RequestsPage.vue +++ b/src/pages/RequestsPage.vue @@ -10,7 +10,6 @@ import { useUserStore } from '/@/stores/user' import { toPage } from '/@/lib/parseQueryParams' -import RequestFilters from '/@/components/requests/RequestFilters.vue' import RequestItem from '/@/components/requests/RequestItem.vue' import PaginationBar from '/@/components/shared/PaginationBar.vue' import SimpleButton from '/@/components/shared/SimpleButton.vue' @@ -72,7 +71,6 @@ watch( -
    From 1f924e899a74fc807edf6319907376c85dcf0cee Mon Sep 17 00:00:00 2001 From: rei Date: Mon, 17 Jun 2024 18:27:56 +0900 Subject: [PATCH 02/24] =?UTF-8?q?=F0=9F=8E=A8=20css=E3=81=AEmargin/padding?= =?UTF-8?q?=E5=91=A8=E3=82=8A=E3=81=AE=E6=95=B4=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/requests/RequestItem.vue | 6 +-- src/pages/RequestsPage.vue | 54 +++++++++++++------------ 2 files changed, 31 insertions(+), 29 deletions(-) diff --git a/src/components/requests/RequestItem.vue b/src/components/requests/RequestItem.vue index 06fbd73e..56fd7310 100644 --- a/src/components/requests/RequestItem.vue +++ b/src/components/requests/RequestItem.vue @@ -40,9 +40,9 @@ const totalAmount = computed(
- グループ:{{ request.group.name }} - 申請者:{{ userMap[request.created_by] }} - 申請日:{{ formattedDate }} + {{ userMap[request.created_by] }} + {{ request.group.name }} + {{ formattedDate }}
{{ totalAmount }}円
diff --git a/src/pages/RequestsPage.vue b/src/pages/RequestsPage.vue index 18557c6d..5ec18294 100644 --- a/src/pages/RequestsPage.vue +++ b/src/pages/RequestsPage.vue @@ -59,34 +59,36 @@ watch( From eb8ada8fb113fb2cc6fcd8d674fce8130c80c801 Mon Sep 17 00:00:00 2001 From: rei Date: Mon, 17 Jun 2024 18:51:39 +0900 Subject: [PATCH 03/24] =?UTF-8?q?=F0=9F=8E=A8=20PaginationBar=E3=81=AEmarg?= =?UTF-8?q?in=20top=E3=82=92=E5=89=8A=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/RequestsPage.vue | 1 - 1 file changed, 1 deletion(-) diff --git a/src/pages/RequestsPage.vue b/src/pages/RequestsPage.vue index 5ec18294..2b96b194 100644 --- a/src/pages/RequestsPage.vue +++ b/src/pages/RequestsPage.vue @@ -86,7 +86,6 @@ watch(
From c4553da79d88b7a467cba71e63a6b8c6ecbe89ba Mon Sep 17 00:00:00 2001 From: rei Date: Mon, 17 Jun 2024 19:02:55 +0900 Subject: [PATCH 04/24] =?UTF-8?q?=E2=9C=A8=20=E7=94=B3=E8=AB=8B=E4=B8=80?= =?UTF-8?q?=E8=A6=A7=E3=80=81=E7=94=B3=E8=AB=8B=E3=82=92=E4=BD=9C=E6=88=90?= =?UTF-8?q?=E3=81=AE=E4=BD=8D=E7=BD=AE=E3=82=92=E8=AA=BF=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/RequestsPage.vue | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/pages/RequestsPage.vue b/src/pages/RequestsPage.vue index 2b96b194..ed1e5677 100644 --- a/src/pages/RequestsPage.vue +++ b/src/pages/RequestsPage.vue @@ -60,13 +60,13 @@ watch(