skyouc
2025-04-12 daf1dd052ec8afbc9a566694a824c79c77d9b96b
no message
5个文件已修改
44 ■■■■■ 已修改文件
rsf-admin/src/page/asnOrder/AsnOrderList.jsx 7 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
rsf-admin/src/page/system/serialRule/SerialRuleCreate.jsx 13 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
rsf-admin/src/page/system/serialRule/SerialRuleItemCreate.jsx 16 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
rsf-admin/src/page/system/serialRule/SerialRuleItemEdit.jsx 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
rsf-admin/src/page/system/serialRule/SerialRuleItemList.jsx 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
rsf-admin/src/page/asnOrder/AsnOrderList.jsx
@@ -79,13 +79,8 @@
  <NumberInput source="poId" label="table.field.asnOrder.poId" />,
  <TextInput source="type" label="table.field.asnOrder.type" />,
  <ReferenceInput source="wkType" reference="dictData" filter={{dictTypeCode: 'sys_business_type'}}  label="table.field.asnOrder.wkType">
    <AutocompleteInput
      label="table.field.asnOrder.wkType"
      optionValue="value"
      filterToQuery={(val) => ({ name: val })}
    />
    <AutocompleteInput label="table.field.asnOrder.wkType" optionValue="value" />
  </ReferenceInput>,
  // <AutocompleteInput source='wkType' label='table.field.asnOrder.wkType' optionText={ } choices={JSON.parse(localStorage.getItem('sys_dicts'))?.filter(dict => (dict.dictTypeCode == 'sys_business_type')) || []} />,
  <NumberInput source="anfme" label="table.field.asnOrder.anfme" />,
  <NumberInput source="qty" label="table.field.asnOrder.qty" />,
  <TextInput source="logisNo" label="table.field.asnOrder.logisNo" />,
rsf-admin/src/page/system/serialRule/SerialRuleCreate.jsx
@@ -47,6 +47,7 @@
    setOpen(false);
    notify("common.response.success");
  };
  const dicts = JSON.parse(localStorage.getItem('sys_dicts'))?.filter(dict => (dict.dictTypeCode == 'sys_task_reset_type')) || [];
  const handleError = async (error) => {
    notify(error.message || "common.response.fail", {
@@ -113,13 +114,23 @@
                    parse={(v) => v}
                  />
                </Grid>
                <Grid item xs={6} display="flex" gap={1}>
                {/* <Grid item xs={6} display="flex" gap={1}>
                  <TextInput
                    label="table.field.serialRule.reset"
                    source="reset"
                    parse={(v) => v}
                    validate={required()}
                  />
                </Grid> */}
                <Grid item xs={6} display="flex" gap={1}>
                  <AutocompleteInput
                    choices={dicts}
                    optionText="label"
                    label="table.field.serialRule.reset"
                    source="reset"
                    optionValue="value"
                    parse={v => v}
                    validate={[required()]} />
                </Grid>
                <Grid item xs={6} display="flex" gap={1}>
                  <TextInput
rsf-admin/src/page/system/serialRule/SerialRuleItemCreate.jsx
@@ -32,11 +32,11 @@
import MemoInput from "../../components/MemoInput";
const SerialRuleItemCreate = (props) => {
    const { open, setOpen } = props;
    const { open, setOpen, record } = props;
    const translate = useTranslate();
    const notify = useNotify();
    const dicts = JSON.parse(localStorage.getItem('sys_dicts'))?.filter(dict => (dict.dictTypeCode == 'sys_rule_item_type')) || [];
    const handleClose = (event, reason) => {
        if (reason !== "backdropClick") {
            setOpen(false);
@@ -88,15 +88,19 @@
                                    <NumberInput
                                        label="table.field.serialRuleItem.ruleId"
                                        source="ruleId"
                                        autoFocus
                                        defaultValue={record?.id}
                                        readOnly
                                    />
                                </Grid>
                                <Grid item xs={6} display="flex" gap={1}>
                                    <TextInput
                                    <AutocompleteInput
                                        choices={dicts}
                                        optionText="label"
                                        label="table.field.serialRuleItem.wkType"
                                        source="wkType"
                                        source="type"
                                        optionValue="value"
                                        parse={v => v}
                                    />
                                        validate={[required()]} />
                                </Grid>
                                <Grid item xs={6} display="flex" gap={1}>
                                    <TextInput
rsf-admin/src/page/system/serialRule/SerialRuleItemEdit.jsx
@@ -19,6 +19,7 @@
    NumberField,
    required,
    useRecordContext,
    useGetOne,
    DeleteButton,
} from 'react-admin';
import { useWatch, useFormContext } from "react-hook-form";
rsf-admin/src/page/system/serialRule/SerialRuleItemList.jsx
@@ -38,6 +38,7 @@
  AutocompleteInput,
  DeleteButton,
  useGetRecordId,
  useGetOne,
  Button,
} from "react-admin";
import { Box, Typography, Card, Stack } from "@mui/material";
@@ -99,7 +100,7 @@
  const [drawerVal, setDrawerVal] = useState(false);
  const [select, setSelect] = useState({});
  const ruleId = useGetRecordId();
  const { data: dicts, isPending, error } = useGetOne('serialRule', { id: ruleId });
  return (
    <>
      <Box display="flex">
@@ -195,7 +196,7 @@
            />
            <WrapperField cellClassName="opt" label="common.field.opt">
              <Button onClick={() => {
                setSelect(re)
                setSelect(record)
                setEditDialog(true)
              }} label={'ra.action.edit'}
              > </Button>
@@ -207,7 +208,7 @@
            </WrapperField>
          </StyledDatagrid>
        </List>
        <SerialRuleItemCreate open={createDialog} setOpen={setCreateDialog} />
        <SerialRuleItemCreate open={createDialog} setOpen={setCreateDialog} record={dicts} />
        <SerialRuleItemEdit open={editDialog} setOpen={setEditDialog} record={select} />
        <PageDrawer
          title="SerialRuleItem Detail"