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

skyouc

2025-04-03 7f26038db785f902097422bfeaccfd52767fc7e1

 rsf-admin/src/page/basicInfo/loc/LocEdit.jsx

@@ -31,6 +31,7 @@
import MemoInput from "../../components/MemoInput";
import StatusSelectInput from "../../components/StatusSelectInput";
import request from '@/utils/request';
import DictionarySelect from "../../components/DictionarySelect";

const FormToolbar = () => {
    const { getValues } = useFormContext();
@@ -58,6 +59,7 @@
            mutationMode={EDIT_MODE}
            actions={<CustomerTopToolBar />}
            aside={<EditBaseAside />}
            title={"menu.loc"}
        >
            <SimpleForm
                shouldUnregister
@@ -120,7 +122,7 @@
                                    validate={[required()]}
                                /> */}
                                <ReferenceArrayInput source="typeIds" reference="locType" >
                                    <SelectArrayInput label="table.field.loc.type" />
                                    <SelectArrayInput label="table.field.loc.type" validate={[required()]} />
                                </ReferenceArrayInput>
                            </Grid>
                            <Grid item xs={6} display="flex" gap={1}>
@@ -172,7 +174,15 @@
                                    validate={required()}
                                />
                            </Grid>

                            <Grid item xs={6} display="flex" gap={1}>
                                <DictionarySelect
                                    label={translate("table.field.loc.useStatus")}
                                    name="useStatus"
                                    validate={[required()]}
                                    size="small"
                                    dictTypeCode="sys_loc_use_stas"
                                />
                            </Grid>

                        </Grid>
                    </Grid>