diff --git a/view/next-project/src/components/common/Card/Card.tsx b/view/next-project/src/components/common/Card/Card.tsx index a07259dd1..a488d886f 100644 --- a/view/next-project/src/components/common/Card/Card.tsx +++ b/view/next-project/src/components/common/Card/Card.tsx @@ -9,10 +9,10 @@ interface Props { function Card(props: Props): JSX.Element { return ( -
+
{props.children} diff --git a/view/next-project/src/components/purchaseorders/DetailModal.tsx b/view/next-project/src/components/purchaseorders/DetailModal.tsx index 8e62464bc..0ec6a35b3 100644 --- a/view/next-project/src/components/purchaseorders/DetailModal.tsx +++ b/view/next-project/src/components/purchaseorders/DetailModal.tsx @@ -79,27 +79,27 @@ const DetailModal: FC = (props) => {
{props.purchaseOrderViewItem && props.purchaseOrderViewItem.purchaseOrder.id}
-
+
-
申請した局
+
支出元
{expenseName}
-
+
@@ -108,7 +108,7 @@ const DetailModal: FC = (props) => {
{props.purchaseOrderViewItem && @@ -118,7 +118,7 @@ const DetailModal: FC = (props) => { : '', )}
-
+
@@ -127,12 +127,12 @@ const DetailModal: FC = (props) => {
{props.purchaseOrderViewItem && props.purchaseOrderViewItem.purchaseOrder.deadline}
-
+
diff --git a/view/next-project/src/pages/purchaseorders/index.tsx b/view/next-project/src/pages/purchaseorders/index.tsx index b8a4491b1..109954344 100644 --- a/view/next-project/src/pages/purchaseorders/index.tsx +++ b/view/next-project/src/pages/purchaseorders/index.tsx @@ -91,6 +91,12 @@ export default function PurchaseOrders(props: Props) { return datetime2; }; + const formatDateForDeadline = (date: string) => { + const spilitDate = date.split('-'); + const datetime = spilitDate[1] + '/' + spilitDate[2]; + return datetime; + }; + const yearPeriods = props.yearPeriods; const [selectedYear, setSelectedYear] = useState( yearPeriods ? String(yearPeriods[yearPeriods.length - 1].year) : String(date.getFullYear()), @@ -215,15 +221,15 @@ export default function PurchaseOrders(props: Props) {
-
+
-
-
購入したい局
+
+
支出元
申請日
@@ -293,7 +299,11 @@ export default function PurchaseOrders(props: Props) { }} >
- {purchaseOrderViewItem.purchaseOrder.deadline} + {formatDateForDeadline( + purchaseOrderViewItem.purchaseOrder.deadline + ? purchaseOrderViewItem.purchaseOrder.deadline + : '', + )}
報告登録 -
+
- - - + - - - @@ -271,18 +265,6 @@ export default function PurchaseReports(props: Props) { /> - -
-
ID
-
-
購入した局
+
+
支出元
報告日
-
期限日
-
購入物品 (個数)
+
合計金額
備考
+
購入者
{ - onOpen( - purchaseReportViewItem.purchaseOrder.id || 0, - purchaseReportViewItem, - ); - }} - > -
- {purchaseReportViewItem.purchaseReport.id} -
-
{ onOpen( @@ -318,18 +300,6 @@ export default function PurchaseReports(props: Props) { )} { - onOpen( - purchaseReportViewItem.purchaseOrder.id || 0, - purchaseReportViewItem, - ); - }} - > -
- {purchaseReportViewItem.purchaseOrder.deadline} -
-
{ onOpen( diff --git a/view/next-project/src/pages/sponsoractivities/index.tsx b/view/next-project/src/pages/sponsoractivities/index.tsx index 11a265038..f2db3bc14 100644 --- a/view/next-project/src/pages/sponsoractivities/index.tsx +++ b/view/next-project/src/pages/sponsoractivities/index.tsx @@ -249,7 +249,7 @@ export default function SponsorActivities(props: Props) { {isLoading && } - +
diff --git a/view/next-project/src/pages/teachers/index.tsx b/view/next-project/src/pages/teachers/index.tsx index f139d7d62..20a09830a 100644 --- a/view/next-project/src/pages/teachers/index.tsx +++ b/view/next-project/src/pages/teachers/index.tsx @@ -102,7 +102,7 @@ export default function TeachersList(props: Props) { 教員登録
-
+