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

skyouc

2025-04-10 b5e8045d5f5b5401b696db12f62fdbcc86dc5c5d

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

@@ -88,6 +88,8 @@
    const [formData, setFormData] = useState({
        type: '',
        wkType: '',
        poCode: '',
        logisNo: ''
    });

    const [tabelData, setTableData] = useState([]);
@@ -104,6 +106,8 @@
        setFormData({
            type: '',
            wkType: '',
            poCode: '',
            logisNo: ''
        })
        setTableData([])
    }
@@ -222,7 +226,7 @@
                    <Box sx={{ display: 'flex', flexDirection: 'column', gap: 3 }}>
                        <Form>
                            <Grid container spacing={2}>
                                <Grid item md={4}>
                                <Grid item md={3}>
                                    <DictSelect
                                        label={translate("table.field.asnOrder.type")}
                                        value={formData.type}
@@ -234,13 +238,29 @@

                                </Grid>

                                <Grid item md={4}>
                                <Grid item md={3}>
                                    <DictSelect
                                        label={translate("table.field.asnOrder.wkType")}
                                        value={formData.wkType}
                                        onChange={(e) => handleChange(e.target.value, 'wkType')}
                                        dictTypeCode="sys_business_type"
                                        required
                                    />
                                </Grid>

                                <Grid item md={3}>
                                    <TextField
                                        label={translate("table.field.asnOrder.poCode")}
                                        value={formData.poCode}
                                        onChange={(e) => handleChange(e.target.value, 'poCode')}
                                    />
                                </Grid>

                                <Grid item md={3}>
                                    <TextField
                                        label={translate("table.field.asnOrder.logisNo")}
                                        value={formData.logisNo}
                                        onChange={(e) => handleChange(e.target.value, 'logisNo')}
                                    />
                                </Grid>
                            </Grid>
@@ -307,10 +327,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 +480,14 @@
                disableColumnSorting
                disableMultipleColumnsSorting
                processRowUpdate={processRowUpdate}
                autoPageSize
                initialState={{
                    pagination: {
                        paginationModel: {
                            pageSize: 25,
                        },
                    },
                }}
                pageSizeOptions={[10, 25, 50, 100]}
                editMode="row"
                checkboxSelection
                onRowSelectionModelChange={handleSelectionChange}