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

skyouc

22 小时以前 92a30abbdc9f65cb1a45a65e39cbfd3f6b52461e

 rsf-admin/src/page/outWork/outBound/locItemInfoModal.jsx

@@ -44,15 +44,12 @@
    };

    const reset = () => {
        setFormData({
            name: '',
            code: '',
            groupId: 0
        setFormData({ 
        })
    }

    const handleSubmit = () => {
        const hasarr = data.map(el => +el.matnrId)
        const hasarr = data.map(el => +el.id)
        const selectedData = selectedRows.filter(item => !hasarr.includes(item)).map(id => (tableData.find(row => row.id === id)));
        const value = selectedData.map((el => {
            const dynamicFields = dyFields.reduce((acc, item) => {
@@ -60,15 +57,12 @@
                return acc;
            }, {});
            return {
                matnrId: el.id,
                maktx: el.name,
                matnrCode: el.code,
                stockUnit: el.stockUnit || '',
                purUnit: el.purchaseUnit || '',
                ...el,
                outQty: el.anfme, // 设置outQty默认值为anfme的值
                ...dynamicFields
            }
        }))
        setData([...data, ...value]);
        setData([...value]);
        setOpen(false);
        reset();
    };
@@ -120,18 +114,18 @@
                    <Grid container spacing={2}>
                        <Grid item md={4}>
                            <TextField
                                label={translate('table.field.matnr.name')}
                                name="name"
                                value={formData.name}
                                label={translate('table.field.locItem.maktx')}
                                name="maktx"
                                value={formData.maktx}
                                onChange={handleChange}
                                size="small"
                            />
                        </Grid>
                        <Grid item md={4}>
                            <TextField
                                label={translate('table.field.matnr.code')}
                                name="code"
                                value={formData.code}
                                label={translate('table.field.locItem.matnrCode')}
                                name="matnrCode"
                                value={formData.matnrCode}
                                onChange={handleChange}
                                size="small"
                            />