浏览代码

Update for the QR-Code of user and staff

master
LAPTOP-EU9T8H5F\User 1 天前
父节点
当前提交
c3daa004da
共有 3 个文件被更改,包括 14 次插入13 次删除
  1. +1
    -1
      src/app/api/user/index.ts
  2. +1
    -0
      src/components/Breadcrumb/Breadcrumb.tsx
  3. +12
    -12
      src/components/qrCodeHandles/qrCodeHandleSearch.tsx

+ 1
- 1
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 {


+ 1
- 0
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",


+ 12
- 12
src/components/qrCodeHandles/qrCodeHandleSearch.tsx 查看文件

@@ -83,7 +83,7 @@ const QrCodeHandleSearch: React.FC<Props> = ({ users, printerCombo }) => {
const searchCriteria: Criterion<SearchParamNames>[] = useMemo(
() => [
{
label: t("Username"),
label: t("User"),
paramName: "username",
type: "text",
},
@@ -223,6 +223,7 @@ const QrCodeHandleSearch: React.FC<Props> = ({ users, printerCombo }) => {
{
name: "id",
label: "",
sx: { width: "50px", minWidth: "50px" },
renderCell: (params) => (
<Checkbox
checked={checkboxIds.includes(params.id)}
@@ -233,28 +234,27 @@ const QrCodeHandleSearch: React.FC<Props> = ({ 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: <QrCodeIcon />,
label: t("staffNo"),
align: "left",
headerAlign: "left",
sx: { width: "150px", minWidth: "150px" },
},
],
[t, checkboxIds, handleSelectUser, showPdfPreview],
[t, checkboxIds, handleSelectUser],
);

const onReset = useCallback(() => {


正在加载...
取消
保存