From 993df5dcb8636bed0da4f1fe0b71882e6cc182e3 Mon Sep 17 00:00:00 2001 From: Kubosaka Date: Thu, 7 Mar 2024 11:48:52 +0900 Subject: [PATCH 1/4] =?UTF-8?q?[fix]=E8=B3=BC=E5=85=A5=E7=94=B3=E8=AB=8B?= =?UTF-8?q?=E3=81=AE=E7=89=A9=E5=93=81=E3=81=AE=E3=82=B9=E3=82=BF=E3=82=A4?= =?UTF-8?q?=E3=83=AB=E3=81=AE=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../purchaseorders/PurchaseOrderAddModal.tsx | 30 ++++++++++++------- 1 file changed, 20 insertions(+), 10 deletions(-) diff --git a/view/next-project/src/components/purchaseorders/PurchaseOrderAddModal.tsx b/view/next-project/src/components/purchaseorders/PurchaseOrderAddModal.tsx index 3752c209b..2fe52c6b0 100644 --- a/view/next-project/src/components/purchaseorders/PurchaseOrderAddModal.tsx +++ b/view/next-project/src/components/purchaseorders/PurchaseOrderAddModal.tsx @@ -81,44 +81,54 @@ export default function AddModal(props: ModalProps) { <>
-
+
物品名
- +
-
+
単価
- +
-
+
個数
- +
-
+
詳細
- +
-
+
URL
- +
From 6476b987e55aa7904dc7201fba8710c82e9bd839 Mon Sep 17 00:00:00 2001 From: Kubosaka Date: Thu, 7 Mar 2024 12:16:27 +0900 Subject: [PATCH 2/4] =?UTF-8?q?[fix]post=E3=82=92=E6=9C=80=E5=BE=8C?= =?UTF-8?q?=E3=81=AB=E3=81=BE=E3=81=A8=E3=82=81=E3=81=A6=E8=A1=8C=E3=81=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../purchaseorders/PurchaseItemNumModal.tsx | 6 ++--- .../purchaseorders/PurchaseOrderAddModal.tsx | 23 ++++++++++++++----- 2 files changed, 19 insertions(+), 10 deletions(-) diff --git a/view/next-project/src/components/purchaseorders/PurchaseItemNumModal.tsx b/view/next-project/src/components/purchaseorders/PurchaseItemNumModal.tsx index 46cec8951..81aa2e12c 100644 --- a/view/next-project/src/components/purchaseorders/PurchaseItemNumModal.tsx +++ b/view/next-project/src/components/purchaseorders/PurchaseItemNumModal.tsx @@ -73,9 +73,6 @@ export default function PurchaseItemNumModal(props: PurchaseItemNumModalProps) { // 購入申請の登録と登録した購入申請のIDを使って購入物品を更新 const submit = async (data: PurchaseOrder) => { - const addPurchaseOrderUrl = process.env.CSR_API_URI + '/purchaseorders'; - const postRes: PurchaseOrder = await post(addPurchaseOrderUrl, data); - const purchaseOrderId = postRes.id; const initialPurchaseItemList = []; for (let i = 0; i < Number(purchaseItemNum.value); i++) { const initialPurchaseItem: PurchaseItem = { @@ -85,7 +82,7 @@ export default function PurchaseItemNumModal(props: PurchaseItemNumModalProps) { quantity: 0, detail: '', url: '', - purchaseOrderID: purchaseOrderId ? purchaseOrderId : 0, + purchaseOrderID: 0, financeCheck: false, createdAt: '', updatedAt: '', @@ -162,6 +159,7 @@ export default function PurchaseItemNumModal(props: PurchaseItemNumModalProps) { onClose={onClose} setFormDataList={setFormDataList} formDataList={formDataList} + purchaseOrder={formData} /> )} diff --git a/view/next-project/src/components/purchaseorders/PurchaseOrderAddModal.tsx b/view/next-project/src/components/purchaseorders/PurchaseOrderAddModal.tsx index 2fe52c6b0..fd3e8782b 100644 --- a/view/next-project/src/components/purchaseorders/PurchaseOrderAddModal.tsx +++ b/view/next-project/src/components/purchaseorders/PurchaseOrderAddModal.tsx @@ -5,6 +5,7 @@ import { RiExternalLinkLine, RiFileCopyLine } from 'react-icons/ri'; import { RiArrowDropRightLine } from 'react-icons/ri'; import { del } from '@api/api_methods'; +import { post as postOrder } from '@api/purchaseOrder'; import { post } from '@api/purchaseItem'; import { PrimaryButton, @@ -15,7 +16,7 @@ import { Stepper, Tooltip, } from '@components/common'; -import { PurchaseItem } from '@type/common'; +import { PurchaseItem, PurchaseOrder } from '@type/common'; interface ModalProps { purchaseItemNum: PurchaseItemNum; @@ -24,6 +25,7 @@ interface ModalProps { onClose: () => void; setFormDataList: (formDataList: PurchaseItem[]) => void; formDataList: PurchaseItem[]; + purchaseOrder: PurchaseOrder; } interface PurchaseItemNum { @@ -62,15 +64,24 @@ export default function AddModal(props: ModalProps) { ); }; - const addPurchaseItem = async (data: PurchaseItem[]) => { + const submitOrderAndItems = async ( + purchaseOrder: PurchaseOrder, + purchaseItems: PurchaseItem[], + ) => { + const addPurchaseOrderUrl = process.env.CSR_API_URI + '/purchaseorders'; + const postRes: PurchaseOrder = await postOrder(addPurchaseOrderUrl, purchaseOrder); + const purchaseOrderId = postRes.id || 0; + const purchaseItemsAddOrderInfo = purchaseItems.map((item) => { + return { ...item, purchaseOrderID: purchaseOrderId }; + }); const addPurchaseItemUrl = process.env.CSR_API_URI + '/purchaseitems'; - data.map(async (item) => { + purchaseItemsAddOrderInfo.map(async (item) => { await post(addPurchaseItemUrl, item); }); }; - const submit = async (formDataList: PurchaseItem[]) => { - addPurchaseItem(formDataList); + const submit = async (purchaseOrder: PurchaseOrder, formDataList: PurchaseItem[]) => { + submitOrderAndItems(purchaseOrder, formDataList); props.onClose(); props.numModalOnClose(); router.reload(); @@ -286,7 +297,7 @@ export default function AddModal(props: ModalProps) { { - submit(props.formDataList); + submit(props.purchaseOrder, props.formDataList); }} > 登録 From 19cffbb755afb76f1cf9718f4edb0be626385d3e Mon Sep 17 00:00:00 2001 From: Kubosaka Date: Thu, 7 Mar 2024 12:17:31 +0900 Subject: [PATCH 3/4] =?UTF-8?q?[fix]=E4=B8=8D=E8=A6=81=E3=81=AA=E5=89=8A?= =?UTF-8?q?=E9=99=A4=E9=96=A2=E6=95=B0=E3=81=AE=E5=89=8A=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/purchaseorders/PurchaseOrderAddModal.tsx | 7 ------- 1 file changed, 7 deletions(-) diff --git a/view/next-project/src/components/purchaseorders/PurchaseOrderAddModal.tsx b/view/next-project/src/components/purchaseorders/PurchaseOrderAddModal.tsx index fd3e8782b..f15422cf4 100644 --- a/view/next-project/src/components/purchaseorders/PurchaseOrderAddModal.tsx +++ b/view/next-project/src/components/purchaseorders/PurchaseOrderAddModal.tsx @@ -48,12 +48,6 @@ export default function AddModal(props: ModalProps) { const [isDone, setIsDone] = useState(false); const router = useRouter(); - const deletePurchaseOrder = async () => { - const deletePurchaseOrderUrl = - process.env.CSR_API_URI + '/purchaseorders/' + props.formDataList[0].purchaseOrderID; - await del(deletePurchaseOrderUrl); - }; - const handler = (stepNumber: number, input: string) => (e: React.ChangeEvent | React.ChangeEvent) => { @@ -257,7 +251,6 @@ export default function AddModal(props: ModalProps) {
{ - deletePurchaseOrder(); props.onClose(); props.numModalOnClose(); }} From a38dfce77cd164e190c6bc7e7f6e459757e5a4b0 Mon Sep 17 00:00:00 2001 From: Kubosaka Date: Thu, 7 Mar 2024 03:22:36 +0000 Subject: [PATCH 4/4] formatted by workflow --- .../src/components/purchaseorders/PurchaseItemNumModal.tsx | 1 - .../src/components/purchaseorders/PurchaseOrderAddModal.tsx | 3 +-- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/view/next-project/src/components/purchaseorders/PurchaseItemNumModal.tsx b/view/next-project/src/components/purchaseorders/PurchaseItemNumModal.tsx index 81aa2e12c..35eada2bd 100644 --- a/view/next-project/src/components/purchaseorders/PurchaseItemNumModal.tsx +++ b/view/next-project/src/components/purchaseorders/PurchaseItemNumModal.tsx @@ -2,7 +2,6 @@ import React, { useState } from 'react'; import { useRecoilState } from 'recoil'; 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'; diff --git a/view/next-project/src/components/purchaseorders/PurchaseOrderAddModal.tsx b/view/next-project/src/components/purchaseorders/PurchaseOrderAddModal.tsx index f15422cf4..fcda8252b 100644 --- a/view/next-project/src/components/purchaseorders/PurchaseOrderAddModal.tsx +++ b/view/next-project/src/components/purchaseorders/PurchaseOrderAddModal.tsx @@ -4,9 +4,8 @@ import React, { useState } from 'react'; import { RiExternalLinkLine, RiFileCopyLine } from 'react-icons/ri'; import { RiArrowDropRightLine } from 'react-icons/ri'; -import { del } from '@api/api_methods'; -import { post as postOrder } from '@api/purchaseOrder'; import { post } from '@api/purchaseItem'; +import { post as postOrder } from '@api/purchaseOrder'; import { PrimaryButton, OutlinePrimaryButton,