skyouc
6 天以前 d825d61f81175402da22c0bcb257bd58da62ea21
基础库查询优化
2个文件已修改
117 ■■■■■ 已修改文件
rsf-admin/src/page/basicInfo/loc/LocList.jsx 115 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
rsf-admin/src/page/task/TaskList.jsx 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
rsf-admin/src/page/basicInfo/loc/LocList.jsx
@@ -83,58 +83,7 @@
    },
}));
const filters = [
    <SearchInput source="condition" alwaysOn />,
    <ReferenceInput
        source="warehouseId"
        label="table.field.loc.warehouseId"
        reference="warehouse"
    >
        <AutocompleteInput
            label="table.field.loc.warehouseId"
            optionText="name"
            filterToQuery={(val) => ({ name: val })}
        />
    </ReferenceInput>,
    <ReferenceInput
        source="areaId"
        label="table.field.loc.areaId"
        reference="warehouseAreas"
    >
        <AutocompleteInput
            label="table.field.loc.areaId"
            optionText="name"
            filterToQuery={(val) => ({ name: val })}
        />
    </ReferenceInput>,
    <TextInput source="code" label="table.field.loc.code" />,
    <TextInput source="type" label="table.field.loc.type" />,
    <TextInput source="name" label="table.field.loc.name" />,
    <NumberInput source="flagLogic" label="table.field.loc.flagLogic" />,
    <TextInput source="fucAtrrs" label="table.field.loc.fucAtrrs" />,
    <TextInput source="barcode" label="table.field.loc.barcode" />,
    <TextInput source="unit" label="table.field.loc.unit" />,
    <TextInput source="size" label="table.field.loc.size" />,
    <NumberInput source="row" label="table.field.loc.row" />,
    <NumberInput source="col" label="table.field.loc.col" />,
    <NumberInput source="lev" label="table.field.loc.lev" />,
    <NumberInput source="channel" label="table.field.loc.channel" />,
    <NumberInput source="maxParts" label="table.field.loc.maxParts" />,
    <NumberInput source="maxPack" label="table.field.loc.maxPack" />,
    <NumberInput source="flagLabelMange" label="table.field.loc.flagLabelMange" />,
    <TextInput source="locAttrs" label="table.field.loc.locAttrs" />,
    <TextInput label="common.field.memo" source="memo" />,
    <SelectInput
        label="common.field.status"
        source="status"
        choices={[
            { id: '1', name: 'common.enums.statusTrue' },
            { id: '0', name: 'common.enums.statusFalse' },
        ]}
        resettable
    />,
]
const LocList = () => {
    const translate = useTranslate();
@@ -143,6 +92,70 @@
    const [createDialog, setCreateDialog] = useState(false);
    const [drawerVal, setDrawerVal] = useState(false);
    const [initDialog, setInitDialog] = useState(false);
    const dicts = JSON.parse(localStorage.getItem('sys_dicts'))?.filter(dict => (dict.dictTypeCode == 'sys_loc_use_stas')) || [];
    const filters = [
        <SearchInput source="condition" alwaysOn />,
        <ReferenceInput
            source="warehouseId"
            label="table.field.loc.warehouseId"
            reference="warehouse"
        >
            <AutocompleteInput
                label="table.field.loc.warehouseId"
                optionText="name"
                filterToQuery={(val) => ({ name: val })}
            />
        </ReferenceInput>,
        <ReferenceInput
            source="areaId"
            label="table.field.loc.areaId"
            reference="warehouseAreas"
        >
            <AutocompleteInput
                label="table.field.loc.areaId"
                optionText="name"
                filterToQuery={(val) => ({ name: val })}
            />
        </ReferenceInput>,
        <AutocompleteInput
            choices={dicts}
            optionText="label"
            label="table.field.loc.useStatus"
            source="useStatus"
            optionValue="value"
            parse={v => v}
            alwaysOn
        />,
        <TextInput source="code" label="table.field.loc.code" />,
        <TextInput source="type" label="table.field.loc.type" />,
        <TextInput source="name" label="table.field.loc.name" />,
        <NumberInput source="flagLogic" label="table.field.loc.flagLogic" />,
        <TextInput source="fucAtrrs" label="table.field.loc.fucAtrrs" />,
        <TextInput source="barcode" label="table.field.loc.barcode" />,
        <TextInput source="unit" label="table.field.loc.unit" />,
        <TextInput source="size" label="table.field.loc.size" />,
        <NumberInput source="row" label="table.field.loc.row" />,
        <NumberInput source="col" label="table.field.loc.col" />,
        <NumberInput source="lev" label="table.field.loc.lev" />,
        <NumberInput source="channel" label="table.field.loc.channel" />,
        <NumberInput source="maxParts" label="table.field.loc.maxParts" />,
        <NumberInput source="maxPack" label="table.field.loc.maxPack" />,
        <NumberInput source="flagLabelMange" label="table.field.loc.flagLabelMange" />,
        <TextInput source="locAttrs" label="table.field.loc.locAttrs" />,
        <TextInput label="common.field.memo" source="memo" />,
        <SelectInput
            label="common.field.status"
            source="status"
            choices={[
                { id: '1', name: 'common.enums.statusTrue' },
                { id: '0', name: 'common.enums.statusFalse' },
            ]}
            resettable
        />,
    ]
    return (
        <Box display="flex">
rsf-admin/src/page/task/TaskList.jsx
@@ -255,7 +255,7 @@
        }
    }
    return (
        ((record?.taskStatus < 98) || (record?.taskType >= 101 && record?.taskStatus < 198)) ? (<ConfirmButton label={"toolbar.complete"} color="secondary" startIcon={<TaskAltIcon />} onConfirm={clickComplete} />) : (<></>)
        ((record?.taskStatus < 98) || (record?.taskType >= 101 && record?.taskStatus < 198)) || (record?.taskType == 11 && record?.taskStatus == 101) ? (<ConfirmButton label={"toolbar.complete"} color="secondary" startIcon={<TaskAltIcon />} onConfirm={clickComplete} />) : (<></>)
    )
}