Merge branch 'devlop' into devlop_whxrwms

skyouc

8 天以前 da0fd7be060ab4a0225c70c6572b2947484a2cb1

 rsf-admin/src/page/locPreview/LocPreviewList.jsx

@@ -109,7 +109,7 @@
            source="useStatus"
            optionValue="value"
            parse={v => v}

            alwaysOn
        />,
        <TextInput source="code" label="table.field.loc.code" />,
        <AutocompleteInput
@@ -123,7 +123,7 @@
        <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="barcode" label="table.field.loc.barcode" alwaysOn/>,
        <TextInput source="unit" label="table.field.loc.unit" />,
        <TextInput source="size" label="table.field.loc.size" />,
        <NumberInput source="row" label="table.field.loc.row" />,