Merge branch 'master' of https://git.2fi-solutions.com/derek/FPSMS-frontend

src/components/DoSave/DoSaveWrapper.tsx

@@ -0,0 +1,28 @@
+import React from "react";
+import GeneralLoading from "../General/GeneralLoading"
+import { fetchDoList } from "@/app/api/do";
+
+interface SubComponents {
+    Loading: typeof GeneralLoading;
+}
+
+interface Props {
+    id: string;
+}
+
+const DoSaveWrapper: React.FC<Props> & SubComponents = async ({
+    id
+}) => {
+
+    const [
+        dos
+    ] = await Promise.all([
+        fetchDoList()
+    ]);
+    // return <DoSearch dos={dos}/>
+    return <></>
+}
+
+DoSaveWrapper.Loading = GeneralLoading;
+
+export default DoSaveWrapper;

src/i18n/zh/dashboard.json

@@ -47,7 +47,7 @@
   "Po Code": "採購訂單編號",
   "My Escalation List": "我的上報列表",
   "Escalation List": "上報列表",
-  "Purchase UoM": "計量單位",
+  "Purchase UoM": "採購單位",
   "QC Completed Count": "品檢完成數量",
   "QC Fail-Total Count": "品檢不合格/總數",
   "escalationStatus": "上報狀態",

src/i18n/zh/purchaseOrder.json

@@ -35,9 +35,9 @@
   "Item Qty": "貨品數量",
   "Item": "貨品",
   "Item Accepted Qty": "貨品已收貨數量",
-  "Item Purchase UoM": "貨品計量單位",
+  "Item Purchase UoM": "貨品採購單位",
   "qty": "訂單數量",
-  "uom": "計量單位",
+  "uom": "採購單位",
   "Stock UoM": "庫存單位",
   "Stock In Qty": "換算庫存數量",
   "total weight": "總重量",