From c3daa004da357b20aa628415ac4ce652e0bc855b Mon Sep 17 00:00:00 2001 From: "LAPTOP-EU9T8H5F\\User" Date: Tue, 30 Dec 2025 18:50:53 +0800 Subject: [PATCH] Update for the QR-Code of user and staff --- src/app/api/user/index.ts | 2 +- src/components/Breadcrumb/Breadcrumb.tsx | 1 + .../qrCodeHandles/qrCodeHandleSearch.tsx | 24 +++++++++---------- 3 files changed, 14 insertions(+), 13 deletions(-) diff --git a/src/app/api/user/index.ts b/src/app/api/user/index.ts index a55c6c2..5b40fc2 100644 --- a/src/app/api/user/index.ts +++ b/src/app/api/user/index.ts @@ -8,7 +8,7 @@ export interface UserResult { id: number; username: string; staffNo: number; - // name: string; + name: string; } // export interface DetailedUser extends UserResult { diff --git a/src/components/Breadcrumb/Breadcrumb.tsx b/src/components/Breadcrumb/Breadcrumb.tsx index be6f8c7..4043043 100644 --- a/src/components/Breadcrumb/Breadcrumb.tsx +++ b/src/components/Breadcrumb/Breadcrumb.tsx @@ -16,6 +16,7 @@ const pathToLabelMap: { [path: string]: string } = { "/settings/qcItem": "Qc Item", "/settings/qrCodeHandle": "QR Code Handle", "/settings/rss": "Demand Forecast Setting", + "/settings/equipment": "Equipment", "/scheduling/rough": "Demand Forecast", "/scheduling/rough/edit": "FG & Material Demand Forecast Detail", "/scheduling/detailed": "Detail Scheduling", diff --git a/src/components/qrCodeHandles/qrCodeHandleSearch.tsx b/src/components/qrCodeHandles/qrCodeHandleSearch.tsx index ce66925..977cabe 100644 --- a/src/components/qrCodeHandles/qrCodeHandleSearch.tsx +++ b/src/components/qrCodeHandles/qrCodeHandleSearch.tsx @@ -83,7 +83,7 @@ const QrCodeHandleSearch: React.FC = ({ users, printerCombo }) => { const searchCriteria: Criterion[] = useMemo( () => [ { - label: t("Username"), + label: t("User"), paramName: "username", type: "text", }, @@ -223,6 +223,7 @@ const QrCodeHandleSearch: React.FC = ({ users, printerCombo }) => { { name: "id", label: "", + sx: { width: "50px", minWidth: "50px" }, renderCell: (params) => ( = ({ users, printerCombo }) => { }, { name: "username", - label: t("Username"), + label: t("User"), align: "left", headerAlign: "left", + sx: { width: "150px", minWidth: "150px" }, }, { - name: "staffNo", - label: t("staffNo"), + name: "name", + label: t("name"), align: "left", headerAlign: "left", + sx: { width: "150px", minWidth: "150px" }, }, { name: "staffNo", - label: t("qrcode"), - align: "center", - headerAlign: "center", - onClick: async (user: UserResult) => { - await showPdfPreview([user.id]); - }, - buttonIcon: , + label: t("staffNo"), + align: "left", + headerAlign: "left", + sx: { width: "150px", minWidth: "150px" }, }, ], - [t, checkboxIds, handleSelectUser, showPdfPreview], + [t, checkboxIds, handleSelectUser], ); const onReset = useCallback(() => {