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

skyouc

2025-04-09 2da12c3d55a709241d245d0ca6a22b56e4c048a0

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

 rsf-admin/src/i18n/zh.js

@@ -609,7 +609,7 @@
            fields: {
                fields: "字段",
                fieldsAlise: "字段别名",
                unique: "索引字段",
                unique: "是否必填",
                flagEnable: "启用",
            },
            fieldsItem: {

 rsf-admin/src/page/asnOrder/AsnOrderModal.jsx

@@ -307,10 +307,7 @@
            minWidth: 100,
            flex: 1,
            editable: true,
            // preProcessEditCellProps: (params) => {
            //     const hasError = params.props.value.length !== '';
            //     return { ...params.props, error: hasError };
            // },
            valueFormatter: (val) => val < 0 ? 0 : val
        },
        {
            field: 'splrCode',
@@ -463,7 +460,8 @@
                disableColumnSorting
                disableMultipleColumnsSorting
                processRowUpdate={processRowUpdate}
                autoPageSize
                pageSizeOptions={[25, 50, 100]}
                paginationModel={{ pageSize: 50, page: 0 }}
                editMode="row"
                checkboxSelection
                onRowSelectionModelChange={handleSelectionChange}

 rsf-admin/src/page/asnOrder/AsnOrderPanel.jsx

@@ -140,15 +140,13 @@
    }



    return (
        <Box sx={{
            position: 'relative',
            padding: '5px 10px'
        }}>

            <div style={{ display: 'flex', justifyContent: 'space-between', marginBottom: '4px', alignItems: 'center' }}>
                <TextField value={maktx} onChange={(e) => maktxChange(e.target.value)} label="搜索物料" variant="outlined" sx={{ width: '300px' }} size="small" />
                <TextField value={maktx} onChange={(e) => maktxChange(e.target.value)} label="搜索物料" sx={{ width: '300px' }} size="small" />

                <div style={{ display: 'flex', gap: '10px' }}>
                    <PrintsButton rows={selectedRows} />
@@ -168,6 +166,10 @@
                disableColumnMenu={true}
                disableColumnSorting
                disableMultipleColumnsSorting
                columnHeaderHeight={40}
                rowHeight={42}
                paginationModel={{ pageSize: 10, page: 1 }}
                pageSizeOptions={[10, 25, 50, 100]}
            />
        </Box >


 rsf-admin/src/page/fields/FieldsCreate.jsx

@@ -89,6 +89,7 @@
                                        label="table.field.fields.fields"
                                        source="fields"
                                        parse={v => v}
                                        validate={required()}
                                        autoFocus
                                    />
                                </Grid>
@@ -96,6 +97,7 @@
                                    <TextInput
                                        label="table.field.fields.fieldsAlise"
                                        source="fieldsAlise"
                                        validate={required()}
                                        parse={v => v}
                                    />
                                </Grid>
@@ -104,9 +106,10 @@
                                        label="table.field.fields.unique"
                                        source="unique"
                                        choices={[
                                            { id: 0, name: ' 非唯一' },
                                            { id:   1, name: '  唯一' },
                                            { id: 0, name: ' 非必填' },
                                            { id: 1, name: '  必填' },
                                        ]}
                                        validate={required()}
                                    />
                                </Grid>
                                <Grid item xs={6} display="flex" gap={1}>
@@ -115,8 +118,9 @@
                                        source="flagEnable"
                                        choices={[
                                            { id: 0, name: ' 不启用' },
                                            { id:  1, name: ' 启用' },
                                            { id: 1, name: ' 启用' },
                                        ]}
                                        validate={required()}
                                    />
                                </Grid>


 rsf-admin/src/page/fields/FieldsEdit.jsx

@@ -69,6 +69,7 @@
                                source="fields"
                                parse={v => v}
                                autoFocus
                                validate={required()}
                            />
                        </Stack>
                        <Stack direction='row' gap={2}>
@@ -76,6 +77,7 @@
                                label="table.field.fields.fieldsAlise"
                                source="fieldsAlise"
                                parse={v => v}
                                validate={required()}
                            />
                        </Stack>
                        <Stack direction='row' gap={2}>
@@ -83,8 +85,8 @@
                                label="table.field.fields.unique"
                                source="unique"
                                choices={[
                                    { id: 0, name: ' 非唯一' },
                                    { id:   1, name: '  唯一' },
                                    { id: 0, name: ' 非必填' },
                                    { id: 1, name: '  必填' },
                                ]}
                                validate={required()}
                            />
@@ -95,7 +97,7 @@
                                source="flagEnable"
                                choices={[
                                    { id: 0, name: ' 不启用' },
                                    { id:  1, name: ' 启用' },
                                    { id: 1, name: ' 启用' },
                                ]}
                                validate={required()}
                            />

 rsf-admin/src/page/fields/FieldsList.jsx

@@ -60,15 +60,13 @@

const filters = [
    <SearchInput source="condition" alwaysOn />,
    <DateInput label='common.time.after' source="timeStart" alwaysOn />,
    <DateInput label='common.time.before' source="timeEnd" alwaysOn />,

    <TextInput source="fields" label="table.field.fields.fields" />,
    <TextInput source="fieldsAlise" label="table.field.fields.fieldsAlise" />,
    <SelectInput source="unique" label="table.field.fields.unique"
        choices={[
            { id: 0, name: ' 非唯一' },
            { id: 1, name: '  唯一' },
            { id: 0, name: ' 非必填' },
            { id: 1, name: '  必填' },
        ]}
    />,
    <SelectInput source="flagEnable" label="table.field.fields.flagEnable"