diff --git a/src/components/DetailedSchedule/DetailedScheduleSearchView.tsx b/src/components/DetailedSchedule/DetailedScheduleSearchView.tsx index 1b82034..8d3df21 100644 --- a/src/components/DetailedSchedule/DetailedScheduleSearchView.tsx +++ b/src/components/DetailedSchedule/DetailedScheduleSearchView.tsx @@ -16,7 +16,7 @@ import { import { defaultPagingController } from "../SearchResults/SearchResults"; import { arrayToDateString, arrayToDayjs, decimalFormatter } from "@/app/utils/formatUtil"; import dayjs from "dayjs"; -import { orderBy, uniqBy } from "lodash"; +import { orderBy, uniqBy, upperFirst } from "lodash"; import { Button, Stack } from "@mui/material"; import isToday from 'dayjs/plugin/isToday'; import useUploadContext from "../UploadProvider/useUploadContext"; @@ -145,7 +145,7 @@ const DSOverview: React.FC = ({ type, defaultInputs }) => { name: "type", label: t("Type"), renderCell: (params) => { - return t(params.type); + return upperFirst(t(params.type)); }, }, // { diff --git a/src/components/DetailedScheduleDetail/ViewByFGDetails.tsx b/src/components/DetailedScheduleDetail/ViewByFGDetails.tsx index ee70d68..77f5620 100644 --- a/src/components/DetailedScheduleDetail/ViewByFGDetails.tsx +++ b/src/components/DetailedScheduleDetail/ViewByFGDetails.tsx @@ -170,7 +170,7 @@ const ViewByFGDetails: React.FC = ({ apiRef, isEdit, type, onReleaseClick }, { field: "uomName", - label: t("UoM Name"), + label: t("UoM"), type: "read-only", style: { textAlign: "left", diff --git a/src/components/RoughScheduleDetail/ViewByBomDetails.tsx b/src/components/RoughScheduleDetail/ViewByBomDetails.tsx index 310647d..74ecc39 100644 --- a/src/components/RoughScheduleDetail/ViewByBomDetails.tsx +++ b/src/components/RoughScheduleDetail/ViewByBomDetails.tsx @@ -304,7 +304,7 @@ const ViewByBomDetails: React.FC = ({ }, { field: "uomName", - label: t("UoM Name"), + label: t("UoM"), type: "read-only", style: { textAlign: "left", @@ -369,7 +369,7 @@ const ViewByBomDetails: React.FC = ({ }, { field: "uomName", - label: t("UoM Name"), + label: t("UoM"), type: "read-only", style: { textAlign: "left", diff --git a/src/components/RoughScheduleDetail/ViewByFGDetails.tsx b/src/components/RoughScheduleDetail/ViewByFGDetails.tsx index f88b7f2..060e4b5 100644 --- a/src/components/RoughScheduleDetail/ViewByFGDetails.tsx +++ b/src/components/RoughScheduleDetail/ViewByFGDetails.tsx @@ -186,7 +186,7 @@ const ViewByFGDetails: React.FC = ({ }, { field: "uomName", - label: t("UoM Name"), + label: t("UoM"), type: "read-only", style: { textAlign: "left", @@ -283,7 +283,7 @@ const ViewByFGDetails: React.FC = ({ }, { field: "uomName", - label: t("UoM Name"), + label: t("UoM"), type: "read-only", style: { textAlign: "left", diff --git a/src/components/ScheduleTable/BomMaterialTable.tsx b/src/components/ScheduleTable/BomMaterialTable.tsx index 85f0e88..503480d 100644 --- a/src/components/ScheduleTable/BomMaterialTable.tsx +++ b/src/components/ScheduleTable/BomMaterialTable.tsx @@ -135,7 +135,7 @@ function BomMaterialTable({ bomMaterial }: Props) { }, { field: "uomName", - headerName: t("UoM Name"), + headerName: t("UoM"), flex: 0.5, align: "left", headerAlign: "left", diff --git a/src/i18n/zh/common.json b/src/i18n/zh/common.json index eeb5909..2955f14 100644 --- a/src/i18n/zh/common.json +++ b/src/i18n/zh/common.json @@ -71,7 +71,10 @@ "Exclude Date":"排除日期", "Finished Goods Name":"成品名稱", "create": "新增", - + "hr": "小時", + "hrs": "小時", + "min": "分鐘", + "mins": "分鐘", "Job Order": "工單", "Production": "生產流程" } diff --git a/src/i18n/zh/schedule.json b/src/i18n/zh/schedule.json index 415011d..4626dde 100644 --- a/src/i18n/zh/schedule.json +++ b/src/i18n/zh/schedule.json @@ -1,5 +1,6 @@ { "Demand Forecast": "需求預測", "Total Demand Qty": "總需求量", + "Total Job Orders": "總工單量", "Demand Qty (Day1)": "需求數量(第 1 天)", "Demand Qty (Day2)": "需求數量(第 2 天)", "Demand Qty (Day3)": "需求數量(第 3 天)", @@ -80,8 +81,13 @@ "Job Date": "工單日期", "Job Qty": "工單數量", "mat": "物料", + "UoM": "單位", + "Type": "類型", + "Test Detailed Schedule": "測試細排", + "Test Rough Schedule": "測試粗排", + "detailed": "細排", + "Detailed": "細排", "Product Count(s)": "產品數量", - "Schedule Period To": "排程期間至", "Overall": "總計", "Back": "返回" }