Merge branch 'rcs_master' into jdxaj

zhang

18 小时以前 82416a8117dd69be757380e8a42ecbac6e861e11

 zy-acs-flow/src/page/code/CodeCreate.jsx

@@ -30,6 +30,10 @@
import DialogCloseButton from "../components/DialogCloseButton";
import StatusSelectInput from "../components/StatusSelectInput";
import MemoInput from "../components/MemoInput";
import ImportButton from '../components/ImportButton'
import { useCodeImport } from './useCodeImport';

const IMPORT_TEMP_URL = '/imports/code_import_template.xlsx';

const CodeCreate = (props) => {
    const { open, setOpen } = props;
@@ -101,6 +105,17 @@
                                    />
                                </Grid>
                                <Grid item xs={6} display="flex" gap={1}>
                                    <SelectInput
                                        label="table.field.code.corner"
                                        source="corner"
                                        choices={[
                                            { id: 0, name: 'common.enums.false' },
                                            { id: 1, name: 'common.enums.true' },
                                        ]}
                                        validate={required()}
                                    />
                                </Grid>
                                <Grid item xs={6} display="flex" gap={1}>
                                    <NumberInput
                                        label="table.field.code.x"
                                        source="x"
@@ -112,23 +127,25 @@
                                        source="y"
                                    />
                                </Grid>
                                <Grid item xs={6} display="flex" gap={1}>
                                    <SelectInput
                                        label="table.field.code.concer"
                                        source="concer"
                                        choices={[
                                            { id: 1, name: '是' },
                                            { id: 0, name: '否' },
                                        ]}
                                    />
                                </Grid>
                                <Grid item xs={6} display="flex" gap={1}>
                                {/* <Grid item xs={6} display="flex" gap={1}>
                                    <TextInput
                                        label="table.field.code.scale"
                                        source="scale"
                                        parse={v => v}
                                    />
                                </Grid>
                                </Grid> */}
                                {/* <Grid item xs={6} display="flex" gap={1}>
                                    <SelectInput
                                        label="table.field.code.spin"
                                        source="spin"
                                        choices={[
                                            { id: 0, name: 'page.code.enums.spin.na' },
                                            { id: 1, name: 'page.code.enums.spin.cw' },
                                            { id: 2, name: 'page.code.enums.spin.ccw' },
                                        ]}
                                        validate={required()}
                                    />
                                </Grid> */}

                                <Grid item xs={6} display="flex" gap={1}>
                                    <StatusSelectInput />
@@ -143,6 +160,7 @@
                        <DialogActions sx={{ position: 'sticky', bottom: 0, backgroundColor: 'background.paper', zIndex: 1000 }}>
                            <Toolbar sx={{ width: '100%', justifyContent: 'space-between' }}  >
                                <SaveButton />
                                <ImportButton type="xlsx" importTemp={IMPORT_TEMP_URL} useImport={useCodeImport} onceBatch={10} />
                            </Toolbar>
                        </DialogActions>
                    </Form>