diff --git a/.env.production b/.env.production index 9fd4c12..fa578f2 100644 --- a/.env.production +++ b/.env.production @@ -1,4 +1,4 @@ -API_URL=http://localhost:8090/api +API_URL=http://10.100.0.81:8090/api NEXTAUTH_SECRET=secret -NEXTAUTH_URL=https://fpsms-uat.2fi-solutions.com -NEXT_PUBLIC_API_URL=http://localhost:8090/api \ No newline at end of file +NEXTAUTH_URL=http://10.100.0.81:3000 +NEXT_PUBLIC_API_URL=http://10.100.0.81:8090/api \ No newline at end of file diff --git a/src/app/(main)/pickOrder/page.tsx b/src/app/(main)/pickOrder/page.tsx index 9d9e9ac..88f6790 100644 --- a/src/app/(main)/pickOrder/page.tsx +++ b/src/app/(main)/pickOrder/page.tsx @@ -17,16 +17,6 @@ const PickOrder: React.FC = async () => { return ( <> - - - {t("Pick Order")} - - }> diff --git a/src/app/api/pickOrder/actions.ts b/src/app/api/pickOrder/actions.ts index 45c5473..9e5ca11 100644 --- a/src/app/api/pickOrder/actions.ts +++ b/src/app/api/pickOrder/actions.ts @@ -15,6 +15,27 @@ import { } from "."; import { PurchaseQcResult } from "../po/actions"; // import { BASE_API_URL } from "@/config/api"; + +export interface SavePickOrderLineRequest { + itemId: number + qty: number + uomId: number +} + +export interface SavePickOrderRequest { + type: string + targetDate: string + pickOrderLine: SavePickOrderLineRequest[] +} +export interface PostPickOrderResponse { + id: number | null; + name: string; + code: string; + type?: string; + message: string | null; + errorPosition: string + entity?: T | T[]; +} export interface PostStockOutLiineResponse { id: number | null; name: string; @@ -22,7 +43,7 @@ export interface PostStockOutLiineResponse { type?: string; message: string | null; errorPosition: string | keyof T; - entity: T | T[]; + entity: T | T[] | null; } export interface ReleasePickOrderInputs { @@ -60,6 +81,19 @@ export interface PickOrderApprovalInput { rejectQty: number; status: string; } +export const createPickOrder = async (data: SavePickOrderRequest) => { + console.log(data); + const po = await serverFetchJson( + `${BASE_API_URL}/pickOrder/create`, + { + method: "POST", + body: JSON.stringify(data), + headers: { "Content-Type": "application/json" }, + }, + ); + revalidateTag("pickorder"); + return po; +} export const consolidatePickOrder = async (ids: number[]) => { const pickOrder = await serverFetchJson( diff --git a/src/app/api/pickOrder/index.ts b/src/app/api/pickOrder/index.ts index b868ec3..18c109f 100644 --- a/src/app/api/pickOrder/index.ts +++ b/src/app/api/pickOrder/index.ts @@ -13,7 +13,7 @@ export interface PickOrderResult { id: number; code: string; consoCode?: string; - targetDate: number[]; + targetDate: string; completeDate?: number[]; type: string; status: string; diff --git a/src/app/api/settings/item/actions.ts b/src/app/api/settings/item/actions.ts index c09abeb..aa8aba8 100644 --- a/src/app/api/settings/item/actions.ts +++ b/src/app/api/settings/item/actions.ts @@ -7,8 +7,9 @@ import { import { revalidateTag } from "next/cache"; import { BASE_API_URL } from "@/config/api"; import { CreateItemResponse } from "../../utils"; -import { ItemQc } from "."; +import { ItemQc, ItemsResult } from "."; import { QcChecksInputs } from "../qcCheck/actions"; +import { cache } from "react"; // export type TypeInputs = { // id: number; @@ -48,3 +49,16 @@ export const saveItem = async (data: CreateItemInputs) => { revalidateTag("items"); return item; }; + +export interface ItemCombo { + id: number, + label: string, + uomId: number, + uom: string, +} + +export const fetchAllItemsInClient = cache(async () => { + return serverFetchJson(`${BASE_API_URL}/items/consumables`, { + next: { tags: ["items"] }, + }); +}); \ No newline at end of file diff --git a/src/app/utils/commonUtil.ts b/src/app/utils/commonUtil.ts index 807659b..925ba83 100644 --- a/src/app/utils/commonUtil.ts +++ b/src/app/utils/commonUtil.ts @@ -10,7 +10,7 @@ export const downloadFile = (blobData: Uint8Array, filename: string) => { link.click(); }; -export const convertObjToURLSearchParams = ( +export const convertObjToURLSearchParams = ( data?: T | null, ): string => { if (isEmpty(data)) { diff --git a/src/app/utils/formatUtil.ts b/src/app/utils/formatUtil.ts index b665297..4c797f0 100644 --- a/src/app/utils/formatUtil.ts +++ b/src/app/utils/formatUtil.ts @@ -92,7 +92,7 @@ export const minutesToHoursMinutes = (minutes: number): string => { finalMinStr = `1 ${defaultMinStr}` } - let colon = finalHrStr.length > 0 && finalMinStr.length > 0 ? ":" : "" + const colon = finalHrStr.length > 0 && finalMinStr.length > 0 ? ":" : "" return `${finalHrStr} ${colon} ${finalMinStr}`.trim() } diff --git a/src/components/PickOrderSearch/CreateForm.tsx b/src/components/PickOrderSearch/CreateForm.tsx new file mode 100644 index 0000000..da0de03 --- /dev/null +++ b/src/components/PickOrderSearch/CreateForm.tsx @@ -0,0 +1,318 @@ +"use client"; + +import { PurchaseQcResult, PurchaseQCInput } from "@/app/api/po/actions"; +import { + Autocomplete, + Box, + Card, + CardContent, + FormControl, + Grid, + Stack, + TextField, + Tooltip, + Typography, +} from "@mui/material"; +import { Controller, useFormContext } from "react-hook-form"; +import { useTranslation } from "react-i18next"; +import StyledDataGrid from "../StyledDataGrid"; +import { useCallback, useEffect, useMemo, useState } from "react"; +import { + GridColDef, + GridRowIdGetter, + GridRowModel, + useGridApiContext, + GridRenderCellParams, + GridRenderEditCellParams, + useGridApiRef, +} from "@mui/x-data-grid"; +import InputDataGrid from "../InputDataGrid"; +import { TableRow } from "../InputDataGrid/InputDataGrid"; +import { GridEditInputCell } from "@mui/x-data-grid"; +import { StockInLine } from "@/app/api/po"; +import { INPUT_DATE_FORMAT, stockInLineStatusMap } from "@/app/utils/formatUtil"; +import { fetchQcItemCheck, fetchQcResult } from "@/app/api/qc/actions"; +import { QcItemWithChecks } from "@/app/api/qc"; +import axios from "@/app/(main)/axios/axiosInstance"; +import { NEXT_PUBLIC_API_URL } from "@/config/api"; +import axiosInstance from "@/app/(main)/axios/axiosInstance"; +import { SavePickOrderLineRequest, SavePickOrderRequest } from "@/app/api/pickOrder/actions"; +import TwoLineCell from "../PoDetail/TwoLineCell"; +import ItemSelect from "./ItemSelect"; +import { ItemCombo } from "@/app/api/settings/item/actions"; +import { DatePicker, LocalizationProvider } from "@mui/x-date-pickers"; +import { AdapterDayjs } from "@mui/x-date-pickers/AdapterDayjs"; +import dayjs from "dayjs"; + +interface Props { + items: ItemCombo[]; +// disabled: boolean; +} +type EntryError = + | { + [field in keyof SavePickOrderLineRequest]?: string; + } + | undefined; + +type PolRow = TableRow, EntryError>; +// fetchQcItemCheck +const CreateForm: React.FC = ({ items }) => { + const { + t, + i18n: { language }, + } = useTranslation("purchaseOrder"); + const apiRef = useGridApiRef(); + const { + formState: { errors, defaultValues, touchedFields }, + watch, + control, + setValue, + } = useFormContext(); + console.log(defaultValues); + const targetDate = watch("targetDate"); + +//// validate form +// const accQty = watch("acceptedQty"); +// const validateForm = useCallback(() => { +// console.log(accQty); +// if (accQty > itemDetail.acceptedQty) { +// setError("acceptedQty", { +// message: `${t("acceptedQty must not greater than")} ${ +// itemDetail.acceptedQty +// }`, +// type: "required", +// }); +// } +// if (accQty < 1) { +// setError("acceptedQty", { +// message: t("minimal value is 1"), +// type: "required", +// }); +// } +// if (isNaN(accQty)) { +// setError("acceptedQty", { +// message: t("value must be a number"), +// type: "required", +// }); +// } +// }, [accQty]); + +// useEffect(() => { +// clearErrors(); +// validateForm(); +// }, [clearErrors, validateForm]); + + const columns = useMemo( + () => [ + { + field: "itemId", + headerName: t("Item"), + flex: 1, + editable: true, + valueFormatter(params) { + const row = params.id ? params.api.getRow(params.id) : null; + if (!row) { + return null; + } + const Item = items.find((q) => q.id === row.itemId); + return Item ? Item.label : t("Please select item"); + }, + renderCell(params: GridRenderCellParams) { + console.log(params.value); + return {params.formattedValue}; + }, + renderEditCell(params: GridRenderEditCellParams) { + const errorMessage = + params.row._error?.[params.field as keyof SavePickOrderLineRequest]; + console.log(errorMessage); + const content = ( + // <> + { + console.log(uom) + await params.api.setEditCellValue({ + id: params.id, + field: "itemId", + value: itemId, + }); + await params.api.setEditCellValue({ + id: params.id, + field: "uom", + value: uom + }) + await params.api.setEditCellValue({ + id: params.id, + field: "uomId", + value: uomId + }) + }} + /> + ); + return errorMessage ? ( + + {content} + + ) : ( + content + ); + }, + }, + { + field: "qty", + headerName: t("qty"), + flex: 1, + type: "number", + editable: true, + renderEditCell(params: GridRenderEditCellParams) { + const errorMessage = + params.row._error?.[params.field as keyof SavePickOrderLineRequest]; + const content = ; + return errorMessage ? ( + + {content} + + ) : ( + content + ); + }, + }, + { + field: "uom", + headerName: t("uom"), + flex: 1, + editable: true, + // renderEditCell(params: GridRenderEditCellParams) { + // console.log(params.row) + // const errorMessage = + // params.row._error?.[params.field as keyof SavePickOrderLineRequest]; + // const content = ; + // return errorMessage ? ( + // + // {content} + // + // ) : ( + // content + // ); + // } + } + ], + [items, t], + ); + /// validate datagrid + const validation = useCallback( + (newRow: GridRowModel): EntryError => { + const error: EntryError = {}; + const { itemId, qty } = newRow; + if (!itemId || itemId <= 0) { + error["itemId"] = t("select qc"); + } + if (!qty || qty <= 0) { + error["qty"] = t("enter a qty"); + } + return Object.keys(error).length > 0 ? error : undefined; + }, + [], + ); + + const typeList = [ + { + type: "Consumable" + } + ] + + const onChange = useCallback( + (event: React.SyntheticEvent, newValue: {type: string}) => { + console.log(newValue); + setValue("type", newValue.type); + }, + [setValue], + ); + + return ( + + + + {t("Pick Order Detail")} + + + + + + option.type} + options={typeList} + onChange={onChange} + renderInput={(params) => } + /> + + + + { + return ( + + { + console.log(date); + if (!date) return; + console.log(date.format(INPUT_DATE_FORMAT)); + setValue("targetDate", date.format(INPUT_DATE_FORMAT)); + // field.onChange(date); + }} + inputRef={field.ref} + slotProps={{ + textField: { + // required: true, + error: Boolean(errors.targetDate?.message), + helperText: errors.targetDate?.message, + }, + }} + /> + + ); + }} + /> + + + + + + apiRef={apiRef} + checkboxSelection={false} + _formKey={"pickOrderLine"} + columns={columns} + validateRow={validation} + needAdd={true} + /> + + + + ); +}; +export default CreateForm; diff --git a/src/components/PickOrderSearch/CreatePickOrderModal.tsx b/src/components/PickOrderSearch/CreatePickOrderModal.tsx new file mode 100644 index 0000000..227cfaf --- /dev/null +++ b/src/components/PickOrderSearch/CreatePickOrderModal.tsx @@ -0,0 +1,98 @@ +import { createPickOrder, SavePickOrderRequest } from "@/app/api/pickOrder/actions"; +import { Box, Button, Modal, ModalProps, Stack } from "@mui/material"; +import dayjs from "dayjs"; +import arraySupport from "dayjs/plugin/arraySupport"; +import { useCallback } from "react"; +import { FormProvider, SubmitHandler, useForm } from "react-hook-form"; +import { useTranslation } from "react-i18next"; +import CreateForm from "./CreateForm"; +import { ItemCombo } from "@/app/api/settings/item/actions"; +import { Check } from "@mui/icons-material"; +dayjs.extend(arraySupport); + +const style = { + position: "absolute", + top: "50%", + left: "50%", + transform: "translate(-50%, -50%)", + overflow: "scroll", + bgcolor: "background.paper", + pt: 5, + px: 5, + pb: 10, + display: "block", + width: { xs: "60%", sm: "60%", md: "60%" }, +}; + +interface Props extends Omit { + items: ItemCombo[] +} + +const CreatePickOrderModal: React.FC = ({ + open, + onClose, + items + }) => { + const { t } = useTranslation("pickOrder"); + const formProps = useForm(); + const errors = formProps.formState.errors; + const closeHandler = useCallback>( + (...args) => { + onClose?.(...args); + // reset(); + }, + [onClose] + ); + const onSubmit = useCallback>( + async (data, event) => { + console.log(data) + try { + const res = await createPickOrder(data) + if (res.id) { + closeHandler({}, "backdropClick"); + } + } catch (error) { + console.log(error) + throw error + } + // formProps.reset() + }, + [closeHandler] + ); + return ( + <> + + + + + + + + + + + + + ); +}; +export default CreatePickOrderModal; diff --git a/src/components/PickOrderSearch/ItemSelect.tsx b/src/components/PickOrderSearch/ItemSelect.tsx new file mode 100644 index 0000000..f611e0e --- /dev/null +++ b/src/components/PickOrderSearch/ItemSelect.tsx @@ -0,0 +1,79 @@ + +import { ItemCombo } from "@/app/api/settings/item/actions"; +import { Autocomplete, TextField } from "@mui/material"; +import { useCallback, useMemo } from "react"; +import { useTranslation } from "react-i18next"; + +interface CommonProps { + allItems: ItemCombo[]; + error?: boolean; +} + +interface SingleAutocompleteProps extends CommonProps { + value: number | string | undefined; + onItemSelect: (itemId: number, uom: string, uomId: number) => void | Promise; + // multiple: false; +} + +type Props = SingleAutocompleteProps; + +const ItemSelect: React.FC = ({ + allItems, + value, + error, + onItemSelect +}) => { + const { t } = useTranslation("item"); + const filteredItems = useMemo(() => { + return allItems + }, [allItems]) + + const options = useMemo(() => { + return [ + { + value: -1, // think think sin + label: t("None"), + uom: "", + uomId: -1, + group: "default", + }, + ...filteredItems.map((i) => ({ + value: i.id as number, + label: i.label, + uom: i.uom, + uomId: i.uomId, + group: "existing", + })), + ]; + }, [t, filteredItems]); + + const currentValue = options.find((o) => o.value === value) || options[0]; + + const onChange = useCallback( + ( + event: React.SyntheticEvent, + newValue: { value: number; uom: string; uomId: number; group: string } | { uom: string; uomId: number; value: number }[], + ) => { + const singleNewVal = newValue as { + value: number; + uom: string; + uomId: number; + group: string; + }; + onItemSelect(singleNewVal.value, singleNewVal.uom, singleNewVal.uomId) + } + , [onItemSelect]) + return ( + option.label} + options={options} + renderInput={(params) => } + /> + ); +} +export default ItemSelect \ No newline at end of file diff --git a/src/components/PickOrderSearch/PickOrderSearch.tsx b/src/components/PickOrderSearch/PickOrderSearch.tsx index 86aa5ff..8dc3bb5 100644 --- a/src/components/PickOrderSearch/PickOrderSearch.tsx +++ b/src/components/PickOrderSearch/PickOrderSearch.tsx @@ -1,33 +1,27 @@ "use client"; import { PickOrderResult } from "@/app/api/pickOrder"; -import { SearchParams } from "@/app/utils/fetchUtil"; -import { useCallback, useMemo, useState } from "react"; +import { useCallback, useEffect, useMemo, useState } from "react"; import { useTranslation } from "react-i18next"; import SearchBox, { Criterion } from "../SearchBox"; -import SearchResults, { Column } from "../SearchResults"; import { flatten, - groupBy, intersectionWith, isEmpty, - map, sortBy, - sortedUniq, uniqBy, upperCase, upperFirst, } from "lodash"; import { - arrayToDateString, arrayToDayjs, - dateStringToDayjs, } from "@/app/utils/formatUtil"; -import dayjs from "dayjs"; -import { Button, Grid, Stack, Tab, Tabs, TabsProps } from "@mui/material"; +import { Button, Grid, Stack, Tab, Tabs, TabsProps, Typography } from "@mui/material"; import PickOrders from "./PickOrders"; import ConsolidatedPickOrders from "./ConsolidatedPickOrders"; +import CreatePickOrderModal from "./CreatePickOrderModal"; +import { fetchAllItemsInClient, ItemCombo } from "@/app/api/settings/item/actions"; +import { fetchPickOrderClient } from "@/app/api/pickOrder/actions"; -import { getServerI18n } from "@/i18n"; interface Props { pickOrders: PickOrderResult[]; } @@ -41,15 +35,30 @@ type SearchParamNames = keyof SearchQuery; const PickOrderSearch: React.FC = ({ pickOrders }) => { const { t } = useTranslation("pickOrder"); + const [isOpenCreateModal, setIsOpenCreateModal] = useState(false) + const [items, setItems] = useState([]) const [filteredPickOrders, setFilteredPickOrders] = useState(pickOrders); const [filterArgs, setFilterArgs] = useState>({}); const [tabIndex, setTabIndex] = useState(0); + const [totalCount, setTotalCount] = useState(); + const handleTabChange = useCallback>( (_e, newValue) => { setTabIndex(newValue); }, [], ); + const openCreateModal = useCallback(async () => { + console.log("testing") + const res = await fetchAllItemsInClient() + console.log(res) + setItems(res) + setIsOpenCreateModal(true) + }, []) + + const closeCreateModal = useCallback(() => { + setIsOpenCreateModal(false) + }, []) const searchCriteria: Criterion[] = useMemo( () => [ @@ -113,15 +122,67 @@ const PickOrderSearch: React.FC = ({ pickOrders }) => { ), }, ], - [t], + [pickOrders, t], ); + const fetchNewPagePickOrder = useCallback( + async ( + pagingController: Record, + filterArgs: Record, + ) => { + const params = { + ...pagingController, + ...filterArgs, + }; + const res = await fetchPickOrderClient(params); + if (res) { + console.log(res); + setFilteredPickOrders(res.records); + setTotalCount(res.total); + } + }, + [], + ); + const onReset = useCallback(() => { setFilteredPickOrders(pickOrders); }, [pickOrders]); + useEffect(() => { + if (!isOpenCreateModal) { + setTabIndex(1) + setTimeout(async () => { + setTabIndex(0) + }, 200) + } + }, [isOpenCreateModal]) + return ( <> + + + + + {t("Pick Order")} + + + + + {isOpenCreateModal && + } + + + { diff --git a/src/components/PickOrderSearch/PickOrders.tsx b/src/components/PickOrderSearch/PickOrders.tsx index 91ab192..5fb16f9 100644 --- a/src/components/PickOrderSearch/PickOrders.tsx +++ b/src/components/PickOrderSearch/PickOrders.tsx @@ -4,13 +4,15 @@ import { PickOrderResult } from "@/app/api/pickOrder"; import { useTranslation } from "react-i18next"; import { useCallback, useEffect, useMemo, useState } from "react"; import { isEmpty, upperCase, upperFirst } from "lodash"; -import { arrayToDateString } from "@/app/utils/formatUtil"; +import { arrayToDateString, OUTPUT_DATE_FORMAT } from "@/app/utils/formatUtil"; import { consolidatePickOrder, fetchPickOrderClient, } from "@/app/api/pickOrder/actions"; import useUploadContext from "../UploadProvider/useUploadContext"; - +import dayjs from "dayjs"; +import arraySupport from "dayjs/plugin/arraySupport"; +dayjs.extend(arraySupport); interface Props { filteredPickOrders: PickOrderResult[]; filterArgs: Record; @@ -30,21 +32,6 @@ const PickOrders: React.FC = ({ filteredPickOrders, filterArgs }) => { }); const [totalCount, setTotalCount] = useState(); - const handleConsolidatedRows = useCallback(async () => { - console.log(selectedRows); - setIsUploading(true); - try { - const res = await consolidatePickOrder(selectedRows as number[]); - if (res) { - console.log(res); - } - } catch { - setIsUploading(false); - } - fetchNewPagePickOrder(pagingController, filterArgs); - setIsUploading(false); - }, [selectedRows, pagingController]); - const fetchNewPagePickOrder = useCallback( async ( pagingController: Record, @@ -66,6 +53,22 @@ const PickOrders: React.FC = ({ filteredPickOrders, filterArgs }) => { [], ); + const handleConsolidatedRows = useCallback(async () => { + console.log(selectedRows); + setIsUploading(true); + try { + const res = await consolidatePickOrder(selectedRows as number[]); + if (res) { + console.log(res); + } + } catch { + setIsUploading(false); + } + fetchNewPagePickOrder(pagingController, filterArgs); + setIsUploading(false); + }, [selectedRows, setIsUploading, fetchNewPagePickOrder, pagingController, filterArgs]); + + useEffect(() => { fetchNewPagePickOrder(pagingController, filterArgs); }, [fetchNewPagePickOrder, pagingController, filterArgs]); @@ -109,7 +112,11 @@ const PickOrders: React.FC = ({ filteredPickOrders, filterArgs }) => { name: "targetDate", label: t("Target Date"), renderCell: (params) => { - return arrayToDateString(params.targetDate); + return ( + dayjs(params.targetDate) + .add(-1, "month") + .format(OUTPUT_DATE_FORMAT) + ); }, }, { diff --git a/src/components/PickOrderSearch/UomSelect.tsx b/src/components/PickOrderSearch/UomSelect.tsx new file mode 100644 index 0000000..1fec4ab --- /dev/null +++ b/src/components/PickOrderSearch/UomSelect.tsx @@ -0,0 +1,73 @@ + +import { ItemCombo } from "@/app/api/settings/item/actions"; +import { Autocomplete, TextField } from "@mui/material"; +import { useCallback, useMemo } from "react"; +import { useTranslation } from "react-i18next"; + +interface CommonProps { + allUom: ItemCombo[]; + error?: boolean; +} + +interface SingleAutocompleteProps extends CommonProps { + value: number | string | undefined; + onUomSelect: (itemId: number) => void | Promise; + // multiple: false; +} + +type Props = SingleAutocompleteProps; + +const UomSelect: React.FC = ({ + allUom, + value, + error, + onUomSelect +}) => { + const { t } = useTranslation("item"); + const filteredUom = useMemo(() => { + return allUom + }, [allUom]) + + const options = useMemo(() => { + return [ + { + value: -1, // think think sin + label: t("None"), + group: "default", + }, + ...filteredUom.map((i) => ({ + value: i.id as number, + label: i.label, + group: "existing", + })), + ]; + }, [t, filteredUom]); + + const currentValue = options.find((o) => o.value === value) || options[0]; + + const onChange = useCallback( + ( + event: React.SyntheticEvent, + newValue: { value: number; group: string } | { value: number }[], + ) => { + const singleNewVal = newValue as { + value: number; + group: string; + }; + onUomSelect(singleNewVal.value) + } + , [onUomSelect]) + return ( + option.label} + options={options} + renderInput={(params) => } + /> + ); +} +export default UomSelect \ No newline at end of file diff --git a/src/components/PoSearch/PoSearch.tsx b/src/components/PoSearch/PoSearch.tsx index e7fdc67..0db878d 100644 --- a/src/components/PoSearch/PoSearch.tsx +++ b/src/components/PoSearch/PoSearch.tsx @@ -15,7 +15,7 @@ import { useSession } from "next-auth/react"; import { defaultPagingController } from "../SearchResults/SearchResults"; import { fetchPoListClient, testing } from "@/app/api/po/actions"; import dayjs from "dayjs"; -import { arrayToDateString } from "@/app/utils/formatUtil"; +import { arrayToDateString, OUTPUT_DATE_FORMAT } from "@/app/utils/formatUtil"; import arraySupport from "dayjs/plugin/arraySupport"; dayjs.extend(arraySupport); @@ -72,7 +72,7 @@ const PoSearch: React.FC = ({ [router], ); - const onDeleteClick = useCallback((po: PoResult) => {}, [router]); + const onDeleteClick = useCallback((po: PoResult) => {}, []); const columns = useMemo[]>( () => [ @@ -91,10 +91,9 @@ const PoSearch: React.FC = ({ label: t("OrderDate"), renderCell: (params) => { return ( - // dayjs(params.orderDate) - arrayToDateString(params.orderDate) - // .add(-1, "month") - // .format(OUTPUT_DATE_FORMAT) + dayjs(params.orderDate) + .add(-1, "month") + .format(OUTPUT_DATE_FORMAT) ); }, },