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

skyouc

2025-07-11 e7dcf3d8570b6a9b2967ba0b90e982322b9cfaf7

 rsf-admin/src/page/locItem/LocItemList.jsx

@@ -61,6 +61,11 @@
        display: 'block',
        width: 'auto',
    },
    '& .MuiTableCell-root': {
    whiteSpace: 'nowrap',
    overflow: 'visible',
    textOverflow: 'unset'
  }
}));


@@ -107,7 +112,7 @@
            source="useStatus"
            optionValue="value"
            parse={v => v}
            alwaysOn
            
        />,
        <TextInput source="code" label="table.field.loc.code" />,
        <AutocompleteInput
@@ -161,6 +166,7 @@
                title={"menu.locItem"}
                empty={false}
                filters={filters}
                filter={{ useStatus: 'F' }}                
                sort={{ field: "create_time", order: "desc" }}
                actions={(
                    <TopToolbar>
@@ -176,7 +182,7 @@
                    align="left"
                    bulkActionButtons={false}
                    rowClick={() => false}
                    omit={['id', 'createTime', 'createBy', 'memo', 'updateTime', 'updateBy']}
                    omit={['id', 'createTime', 'createBy$', 'memo', 'updateTime', 'updateBy','statusBool','length','width','height']}
                >
                    <NumberField source="id" />
                    <NumberField source="warehouseId$" label="table.field.loc.warehouseId" />