Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop

verou

2025-04-11 401e85bb3749bb9107f65ddaa15868a0a9ba852e

 rsf-admin/src/page/system/serialRule/SerialRuleItemList.jsx

@@ -38,6 +38,7 @@
  AutocompleteInput,
  DeleteButton,
  useGetRecordId,
  Button,
} from "react-admin";
import { Box, Typography, Card, Stack } from "@mui/material";
import { styled } from "@mui/material/styles";
@@ -54,6 +55,7 @@
} from "@/config/setting";
import * as Common from "@/utils/common";
import CustomerTopToolBar from "../../components/EditTopToolBar";
import SerialRuleItemEdit from "./SerialRuleItemEdit";

const StyledDatagrid = styled(DatagridConfigurable)(({ theme }) => ({
  "& .css-1vooibu-MuiSvgIcon-root": {
@@ -93,7 +95,9 @@
const SerialRuleItemList = () => {
  const translate = useTranslate();
  const [createDialog, setCreateDialog] = useState(false);
  const [editDialog, setEditDialog] = useState(false);
  const [drawerVal, setDrawerVal] = useState(false);
  const [select, setSelect] = useState({});
  const ruleId = useGetRecordId();

  return (
@@ -110,13 +114,7 @@
            marginRight: drawerVal ? `${PAGE_DRAWER_WIDTH}px` : 0,
          }}
          title={"menu.serialRuleItem"}
          empty={
            <EmptyData
              onClick={() => {
                setCreateDialog(true);
              }}
            />
          }
          empty={false}
          filters={filters}
          filter={{ ruleId: ruleId }}
          sort={{ field: "create_time", order: "desc" }}
@@ -139,7 +137,10 @@
            bulkActionButtons={() => (
              <BulkDeleteButton mutationMode={OPERATE_MODE} />
            )}
            rowClick={false}
            rowClick={(id, resource, record) => {
              setSelect(record)
              setEditDialog(true)
            }}
            omit={["id", "createTime", "createBy", "memo"]}
          >
            <NumberField source="id" />
@@ -164,29 +165,19 @@
              source="sort"
              label="table.field.serialRuleItem.sort"
            />
            <ReferenceField
              source="updateBy"
            <TextField
              source="updateBy$"
              label="common.field.updateBy"
              reference="user"
              link={false}
              sortable={false}
            >
              <TextField source="nickname" />
            </ReferenceField>
            />
            <DateField
              source="updateTime"
              label="common.field.updateTime"
              showTime
            />
            <ReferenceField
              source="createBy"
            <TextField
              source="createBy$"
              label="common.field.createBy"
              reference="user"
              link={false}
              sortable={false}
            >
              <TextField source="nickname" />
            </ReferenceField>
            />
            <DateField
              source="createTime"
              label="common.field.createTime"
@@ -203,15 +194,21 @@
              sortable={false}
            />
            <WrapperField cellClassName="opt" label="common.field.opt">
              <EditButton sx={{ padding: "1px", fontSize: ".75rem" }} />
              <Button onClick={() => {
                setSelect(re)
                setEditDialog(true)
              }} label={'ra.action.edit'}
              > </Button>
              <DeleteButton
                sx={{ padding: "1px", fontSize: ".75rem" }}
                mutationMode={OPERATE_MODE}
                redirect={'/serialRule/' + ruleId}
              />
            </WrapperField>
          </StyledDatagrid>
        </List>
        <SerialRuleItemCreate open={createDialog} setOpen={setCreateDialog} />
        <SerialRuleItemEdit open={editDialog} setOpen={setEditDialog} record={select} />
        <PageDrawer
          title="SerialRuleItem Detail"
          drawerVal={drawerVal}