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

skyouc

2025-04-10 d692259553b83ed00ada0ba2792ae91704a4def2

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

@@ -89,7 +89,8 @@
        type: '',
        wkType: '',
        poCode: '',
        logisNo: ''
        logisNo: '',
        arrTime: ''
    });

    const [tabelData, setTableData] = useState([]);
@@ -107,7 +108,8 @@
            type: '',
            wkType: '',
            poCode: '',
            logisNo: ''
            logisNo: '',
            arrTime: ''
        })
        setTableData([])
    }
@@ -119,10 +121,7 @@
            find.anfme = rows[key].anfme.value;
        }
        setTableData([...tabelData]);

    }



    const handleSubmit = async () => {
        setFinally()
@@ -263,6 +262,21 @@
                                        onChange={(e) => handleChange(e.target.value, 'logisNo')}
                                    />
                                </Grid>

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

                                </Grid>
                            </Grid>
                        </Form>
                    </Box>
@@ -357,10 +371,11 @@
        //     flex: 1,
        // },
        {
            field: 'platItemId',
            headerName: translate('table.field.asnOrderItem.platItemId'),
            field: 'poCode',
            headerName: translate('table.field.asnOrderItem.poDetlCode'),
            minWidth: 100,
            flex: 1,
            editable: true,
        },

        {