| @@ -504,7 +504,7 @@ const FInishedJobOrderRecord: React.FC<Props> = ({ filterArgs }) => { | |||||
| </Box> | </Box> | ||||
| <Box> | <Box> | ||||
| <Chip | <Chip | ||||
| label={jobOrderPickOrder.pickOrderStatus} | |||||
| label={t(jobOrderPickOrder.pickOrderStatus)} | |||||
| color={jobOrderPickOrder.pickOrderStatus === 'completed' ? 'success' : 'default'} | color={jobOrderPickOrder.pickOrderStatus === 'completed' ? 'success' : 'default'} | ||||
| size="small" | size="small" | ||||
| sx={{ mb: 1 }} | sx={{ mb: 1 }} | ||||
| @@ -30,7 +30,7 @@ import { | |||||
| } from "@/app/api/pickOrder/actions"; | } from "@/app/api/pickOrder/actions"; | ||||
| import { fetchNameList, NameList ,fetchNewNameList, NewNameList} from "@/app/api/user/actions"; | import { fetchNameList, NameList ,fetchNewNameList, NewNameList} from "@/app/api/user/actions"; | ||||
| import { FormProvider, useForm } from "react-hook-form"; | import { FormProvider, useForm } from "react-hook-form"; | ||||
| import { isEmpty, sortBy, uniqBy, upperFirst, groupBy } from "lodash"; | |||||
| import { isEmpty, sortBy, uniqBy, groupBy } from "lodash"; | |||||
| import { OUTPUT_DATE_FORMAT, arrayToDayjs } from "@/app/utils/formatUtil"; | import { OUTPUT_DATE_FORMAT, arrayToDayjs } from "@/app/utils/formatUtil"; | ||||
| import useUploadContext from "../UploadProvider/useUploadContext"; | import useUploadContext from "../UploadProvider/useUploadContext"; | ||||
| import dayjs from "dayjs"; | import dayjs from "dayjs"; | ||||
| @@ -236,7 +236,7 @@ const AssignAndRelease: React.FC<Props> = ({ filterArgs }) => { | |||||
| uniqBy( | uniqBy( | ||||
| originalItemData.map((item) => ({ | originalItemData.map((item) => ({ | ||||
| value: item.status, | value: item.status, | ||||
| label: t(upperFirst(item.status)), | |||||
| label: t(item.status), | |||||
| })), | })), | ||||
| "value", | "value", | ||||
| ), | ), | ||||
| @@ -507,7 +507,7 @@ const AssignAndRelease: React.FC<Props> = ({ filterArgs }) => { | |||||
| {/* Pick Order Status - 只在第一个项目显示 */} | {/* Pick Order Status - 只在第一个项目显示 */} | ||||
| <TableCell> | <TableCell> | ||||
| {index === 0 ? upperFirst(item.status) : null} | |||||
| {index === 0 ? t(item.status) : null} | |||||
| </TableCell> | </TableCell> | ||||
| </TableRow> | </TableRow> | ||||
| )) | )) | ||||
| @@ -3,7 +3,7 @@ import SearchResults, { Column } from "../SearchResults/SearchResults"; | |||||
| import { PickOrderResult } from "@/app/api/pickOrder"; | import { PickOrderResult } from "@/app/api/pickOrder"; | ||||
| import { useTranslation } from "react-i18next"; | import { useTranslation } from "react-i18next"; | ||||
| import { useCallback, useEffect, useMemo, useState } from "react"; | import { useCallback, useEffect, useMemo, useState } from "react"; | ||||
| import { isEmpty, upperCase, upperFirst } from "lodash"; | |||||
| import { isEmpty, upperCase } from "lodash"; | |||||
| import { arrayToDateString, OUTPUT_DATE_FORMAT } from "@/app/utils/formatUtil"; | import { arrayToDateString, OUTPUT_DATE_FORMAT } from "@/app/utils/formatUtil"; | ||||
| import { | import { | ||||
| consolidatePickOrder, | consolidatePickOrder, | ||||
| @@ -127,7 +127,7 @@ const PickOrders: React.FC<Props> = ({ filteredPickOrders, filterArgs }) => { | |||||
| name: "status", | name: "status", | ||||
| label: t("Status"), | label: t("Status"), | ||||
| renderCell: (params) => { | renderCell: (params) => { | ||||
| return upperFirst(params.status); | |||||
| return t(params.status); | |||||
| }, | }, | ||||
| }, | }, | ||||
| ], | ], | ||||
| @@ -562,7 +562,11 @@ | |||||
| "cancel": "cancel", | "cancel": "cancel", | ||||
| "cancelled": "cancelled", | "cancelled": "cancelled", | ||||
| "complete jo": "complete jo", | "complete jo": "complete jo", | ||||
| "completed": "completed", | |||||
| "completed": "Completed", | |||||
| "consolidated": "Consolidated", | |||||
| "assigned": "Assigned", | |||||
| "released": "Released", | |||||
| "picking": "Picking", | |||||
| "completed Job Order pick orders with Matching": "completed Job Order pick orders with Matching", | "completed Job Order pick orders with Matching": "completed Job Order pick orders with Matching", | ||||
| "completed Job Order pick orders with matching": "completed Job Order pick orders with matching", | "completed Job Order pick orders with matching": "completed Job Order pick orders with matching", | ||||
| "consumables": "consumables", | "consumables": "consumables", | ||||
| @@ -9,7 +9,10 @@ | |||||
| "Status": "Status", | "Status": "Status", | ||||
| "N/A": "N/A", | "N/A": "N/A", | ||||
| "Release Pick Orders": "Release Pick Orders", | "Release Pick Orders": "Release Pick Orders", | ||||
| "released": "released", | |||||
| "released": "Released", | |||||
| "consolidated": "Consolidated", | |||||
| "assigned": "Assigned", | |||||
| "picking": "Picking", | |||||
| "Loading...": "Loading...", | "Loading...": "Loading...", | ||||
| "Suggestion success": "Suggestion success", | "Suggestion success": "Suggestion success", | ||||
| "Scan pick success": "Scan pick success", | "Scan pick success": "Scan pick success", | ||||
| @@ -562,7 +562,11 @@ | |||||
| "cancel": "已取消", | "cancel": "已取消", | ||||
| "cancelled": "已取消", | "cancelled": "已取消", | ||||
| "complete jo": "完成工單", | "complete jo": "完成工單", | ||||
| "completed": "完成", | |||||
| "completed": "已完成", | |||||
| "consolidated": "已合併", | |||||
| "assigned": "已分派", | |||||
| "released": "已放單", | |||||
| "picking": "提料中", | |||||
| "completed Job Order pick orders with Matching": "工單已完成提料和對料", | "completed Job Order pick orders with Matching": "工單已完成提料和對料", | ||||
| "completed Job Order pick orders with matching": "工單已完成提料和對料", | "completed Job Order pick orders with matching": "工單已完成提料和對料", | ||||
| "consumables": "消耗品", | "consumables": "消耗品", | ||||
| @@ -10,6 +10,9 @@ | |||||
| "N/A": "不適用", | "N/A": "不適用", | ||||
| "Release Pick Orders": "放單", | "Release Pick Orders": "放單", | ||||
| "released": "已放單", | "released": "已放單", | ||||
| "consolidated": "已合併", | |||||
| "assigned": "已分派", | |||||
| "picking": "提料中", | |||||
| "Loading...": "加載中", | "Loading...": "加載中", | ||||
| "Suggestion success": "建議成功", | "Suggestion success": "建議成功", | ||||
| "Scan pick success": "掃描提料成功", | "Scan pick success": "掃描提料成功", | ||||