diff --git a/view/next-project/src/components/purchaseorders/OpenAddModalButton.tsx b/view/next-project/src/components/purchaseorders/OpenAddModalButton.tsx index 3b072c8a1..95c1666c7 100644 --- a/view/next-project/src/components/purchaseorders/OpenAddModalButton.tsx +++ b/view/next-project/src/components/purchaseorders/OpenAddModalButton.tsx @@ -2,16 +2,17 @@ import React, { useState } from 'react'; import PurchaseItemNumModal from './PurchaseItemNumModal'; import { AddButton } from '@components/common'; -import { Expense } from '@type/common'; +import { Expense, YearPeriod } from '@type/common'; interface Props { children?: React.ReactNode; expenses: Expense[]; + yearPeriods: YearPeriod[]; + selectedyear: string; } export default function OpenModalButton(props: Props) { const [isOpen, setIsOpen] = useState(false); - return ( <> {props.children} - {isOpen && } + {isOpen && } ); } diff --git a/view/next-project/src/components/purchaseorders/PurchaseItemNumModal.tsx b/view/next-project/src/components/purchaseorders/PurchaseItemNumModal.tsx index 46cec8951..cad82efbd 100644 --- a/view/next-project/src/components/purchaseorders/PurchaseItemNumModal.tsx +++ b/view/next-project/src/components/purchaseorders/PurchaseItemNumModal.tsx @@ -5,11 +5,13 @@ import { userAtom } from '@/store/atoms'; import { post } from '@api/purchaseOrder'; import { CloseButton, Input, Modal, PrimaryButton, Select } from '@components/common'; import AddModal from '@components/purchaseorders/PurchaseOrderAddModal'; -import { PurchaseItem, PurchaseOrder, Expense } from '@type/common'; +import { PurchaseItem, PurchaseOrder, Expense, YearPeriod } from '@type/common'; export interface PurchaseItemNumModalProps { setIsOpen: React.Dispatch>; expenses: Expense[]; + yearPeriods: YearPeriod[]; + selectedYear: string; } export default function PurchaseItemNumModal(props: PurchaseItemNumModalProps) { @@ -95,6 +97,16 @@ export default function PurchaseItemNumModal(props: PurchaseItemNumModalProps) { setFormDataList(initialPurchaseItemList); }; + //yearPeriodsとselectedYearを紐づける + const selectedYear = props.yearPeriods.find((u) => { + return u.year === parseInt(props.selectedYear); + })?.id; + + console.log(selectedYear); + console.log(props.expenses); + console.log(parseInt(props.selectedYear)); + console.log(props.yearPeriods); + return ( <> @@ -121,11 +133,13 @@ export default function PurchaseItemNumModal(props: PurchaseItemNumModalProps) { onChange={formDataHandler('expenseID')} className='w-full' > - {props.expenses.map((data) => ( - - ))} + {props.expenses + .filter((expense) => selectedYear === expense.yearID) + .map((data) => ( + + ))}

購入物品数

diff --git a/view/next-project/src/pages/purchaseorders/index.tsx b/view/next-project/src/pages/purchaseorders/index.tsx index 8c8c54b59..9f176d824 100644 --- a/view/next-project/src/pages/purchaseorders/index.tsx +++ b/view/next-project/src/pages/purchaseorders/index.tsx @@ -215,7 +215,7 @@ export default function PurchaseOrders(props: Props) {
- 申請登録 + 申請登録
@@ -393,7 +393,7 @@ export default function PurchaseOrders(props: Props) { /> )}
- +
);