Merge remote-tracking branch 'origin/dev' into dev

whycq

2025-02-24 37e8e06c8d13146e62ef08d018d86443b9f42f00

 rsf-admin/src/page/basicInfo/companys/CompanysCreate.jsx

copy from rsf-admin/src/page/stock/StockCreate.jsx
copy to rsf-admin/src/page/basicInfo/companys/CompanysCreate.jsx
File was copied from rsf-admin/src/page/stock/StockCreate.jsx
@@ -27,11 +27,11 @@
    Grid,
    Box,
} from '@mui/material';
import DialogCloseButton from "../components/DialogCloseButton";
import StatusSelectInput from "../components/StatusSelectInput";
import MemoInput from "../components/MemoInput";
import DialogCloseButton from "../../components/DialogCloseButton";
import StatusSelectInput from "../../components/StatusSelectInput";
import MemoInput from "../../components/MemoInput";

const StockCreate = (props) => {
const CompanysCreate = (props) => {
    const { open, setOpen } = props;

    const translate = useTranslate();
@@ -86,66 +86,88 @@
                            <Grid container rowSpacing={2} columnSpacing={2}>
                                <Grid item xs={6} display="flex" gap={1}>
                                    <TextInput
                                        label="table.field.stock.asnOrder"
                                        source="asnOrder"
                                        label="table.field.companys.code"
                                        source="code"
                                        parse={v => v}
                                        autoFocus
                                    />
                                </Grid>
                                <Grid item xs={6} display="flex" gap={1}>
                                    <TextInput
                                        label="table.field.companys.name"
                                        source="name"
                                        parse={v => v}
                                    />
                                </Grid>
                                <Grid item xs={6} display="flex" gap={1}>
                                    <TextInput
                                        label="table.field.companys.nameEn"
                                        source="nameEn"
                                        parse={v => v}
                                    />
                                </Grid>
                                <Grid item xs={6} display="flex" gap={1}>
                                    <TextInput
                                        label="table.field.companys.breifCode"
                                        source="breifCode"
                                        parse={v => v}
                                    />
                                </Grid>
                                <Grid item xs={6} display="flex" gap={1}>
                                    <TextInput
                                        label="table.field.companys.type"
                                        source="type"
                                        parse={v => v}
                                        validate={required()}
                                    />
                                </Grid>
                                <Grid item xs={6} display="flex" gap={1}>
                                    <TextInput
                                        label="table.field.stock.erpToken"
                                        source="erpToken"
                                        label="table.field.companys.contact"
                                        source="contact"
                                        parse={v => v}
                                    />
                                </Grid>
                                <Grid item xs={6} display="flex" gap={1}>
                                    <TextInput
                                        label="table.field.stock.erpOrder"
                                        source="erpOrder"
                                        label="table.field.companys.tel"
                                        source="tel"
                                        parse={v => v}
                                    />
                                </Grid>
                                <Grid item xs={6} display="flex" gap={1}>
                                    <TextInput
                                        label="table.field.stock.erpStkAdr"
                                        source="erpStkAdr"
                                        label="table.field.companys.email"
                                        source="email"
                                        parse={v => v}
                                    />
                                </Grid>
                                <Grid item xs={6} display="flex" gap={1}>
                                    <TextInput
                                        label="table.field.stock.contractId"
                                        source="contractId"
                                        label="table.field.companys.pcode"
                                        source="pcode"
                                        parse={v => v}
                                    />
                                </Grid>
                                <Grid item xs={6} display="flex" gap={1}>
                                    <TextInput
                                        label="table.field.stock.lockReason"
                                        source="lockReason"
                                        label="table.field.companys.province"
                                        source="province"
                                        parse={v => v}
                                    />
                                </Grid>
                                <Grid item xs={6} display="flex" gap={1}>
                                    <NumberInput
                                        label="table.field.stock.lockStatus"
                                        source="lockStatus"
                                        validate={required()}
                                    />
                                </Grid>
                                <Grid item xs={6} display="flex" gap={1}>
                                    <TextInput
                                        label="table.field.stock.locker"
                                        source="locker"
                                        label="table.field.companys.city"
                                        source="city"
                                        parse={v => v}
                                    />
                                </Grid>
                                <Grid item xs={6} display="flex" gap={1}>
                                    <DateInput
                                        label="table.field.stock.lockedTime"
                                        source="lockedTime"
                                    <TextInput
                                        label="table.field.companys.address"
                                        source="address"
                                        parse={v => v}
                                    />
                                </Grid>

@@ -171,4 +193,4 @@
    )
}

export default StockCreate;
export default CompanysCreate;